| Message ID | 20240213-verse-clinic-e6de06e1f18d@spud |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dt-bindings: leds: pwm-multicolour: re-allow active-low | expand |
On Tue, 13 Feb 2024 20:13:41 +0000, 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(+) > Acked-by: Rob Herring <robh@kernel.org>
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".
On Fri, Feb 23, 2024 at 03:43:04PM +0000, Lee Jones wrote: > 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: 18:15:26 conor /stuff/linux$ shazam 20240213-verse-clinic-e6de06e1f18d@spud Grabbing thread from lore.kernel.org/all/20240213-verse-clinic-e6de06e1f18d@spud/t.mbox.gz Checking for newer revisions Grabbing search results from lore.kernel.org Analyzing 3 messages in the thread Looking for additional code-review trailers on lore.kernel.org Checking attestation on all messages, may take a moment... Retrieving CI status, may take a moment... --- ✓ [PATCH] dt-bindings: leds: pwm-multicolour: re-allow active-low + Acked-by: Rob Herring <robh@kernel.org> (✓ DKIM/kernel.org) --- ✓ Signed: openpgp/conor.dooley@microchip.com (From: conor@kernel.org) ✓ Signed: DKIM/kernel.org --- Total patches: 1 --- Applying: dt-bindings: leds: pwm-multicolour: re-allow active-low 18:15:39 conor /stuff/linux$ git show HEAD~1 commit 2d5c7b7eb345249cb34d42cbc2b97b4c57ea944e (tag: next-20240220, korg-next/master) What do you use to apply patches? b4 seems to have no trouble. Cheers, Conor.
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: