From: Lee Jones <lee@kernel.org>
To: Conor Dooley <conor@kernel.org>
Cc: Conor Dooley <conor.dooley@microchip.com>,
Pavel Machek <pavel@ucw.cz>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Sven Schwermer <sven.schwermer@disruptive-technologies.com>,
Christian Marangi <ansuelsmth@gmail.com>,
linux-leds@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] dt-bindings: leds: pwm-multicolour: re-allow active-low
Date: Fri, 23 Feb 2024 15:43:04 +0000 [thread overview]
Message-ID: <20240223154304.GE1666215@google.com> (raw)
In-Reply-To: <20240213-verse-clinic-e6de06e1f18d@spud>
On Tue, 13 Feb 2024, Conor Dooley wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
>
> active-low was lifted to the common schema for leds, but it went
> unnoticed that the leds-multicolour binding had "additionalProperties:
> false" where the other users had "unevaluatedProperties: false", thereby
> disallowing active-low for multicolour leds. Explicitly permit it again.
>
> Fixes: c94d1783136e ("dt-bindings: net: phy: Make LED active-low property common")
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
>
> I'm just assuming this is intentionally restrictive, if its not, we
> could easily just change this to uneval: false.
>
> CC: Pavel Machek <pavel@ucw.cz>
> CC: Lee Jones <lee@kernel.org>
> CC: Rob Herring <robh@kernel.org>
> CC: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
> CC: Conor Dooley <conor+dt@kernel.org>
> CC: Sven Schwermer <sven.schwermer@disruptive-technologies.com>
> CC: Christian Marangi <ansuelsmth@gmail.com>
> CC: linux-leds@vger.kernel.org
> CC: devicetree@vger.kernel.org
> CC: linux-kernel@vger.kernel.org
> ---
> Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml b/Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml
> index 5edfbe347341..a31a202afe5c 100644
> --- a/Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml
> +++ b/Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml
> @@ -41,6 +41,8 @@ properties:
>
> pwm-names: true
>
> + active-low: true
> +
> color: true
>
> required:
> --
> 2.43.0
Neither checkpatch.pl or Git appear to be happy with this:
ERROR: Does not appear to be a unified-diff format patch
total: 1 errors, 0 warnings, 0 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
"[PATCH] dt-bindings: leds: pwm-multicolour: re-allow active-low" has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
WARNING: Missing commit description - Add an appropriate one
ERROR: Missing Signed-off-by: line(s)
total: 1 errors, 1 warnings, 8 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
Your patch has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
Check the results (hit return to continue or Ctrl+c to exit)
Applying patch(es)
Applying: dt-bindings: leds: pwm-multicolour: re-allow active-low
Using index info to reconstruct a base tree...
M Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml
/home/joneslee/projects/linux/kernel/.git/worktrees/for-led-next/rebase-apply/patch:28: indent with spaces.
active-low: true
Checking patch Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml...
Applied patch Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml cleanly.
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
Documentation/devicetree/bindings/leds/leds-pwm-multicolor.yaml
Please commit your changes or stash them before you merge.
Aborting
error: Failed to merge in the changes.
Patch failed at 0001 dt-bindings: leds: pwm-multicolour: re-allow active-low
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--
Lee Jones [李琼斯]
next prev parent reply other threads:[~2024-02-23 15:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 20:13 [PATCH] dt-bindings: leds: pwm-multicolour: re-allow active-low Conor Dooley
2024-02-15 14:56 ` Rob Herring
2024-02-23 15:43 ` Lee Jones [this message]
2024-02-23 18:17 ` Conor Dooley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240223154304.GE1666215@google.com \
--to=lee@kernel.org \
--cc=ansuelsmth@gmail.com \
--cc=conor+dt@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=conor@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=robh@kernel.org \
--cc=sven.schwermer@disruptive-technologies.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.