diff mbox series

[v9,1/4] dt-bindings: mfd: Fix schema warnings for pwm-leds

Message ID 20201228163217.32520-2-post@lespocky.de (mailing list archive)
State New, archived
Headers show
Series leds: pwm: Make automatic labels work | expand

Commit Message

Alexander Dahl Dec. 28, 2020, 4:32 p.m. UTC
The node names for devices using the pwm-leds driver follow a certain
naming scheme (now).  Parent node name is not enforced, but recommended
by DT project.

  DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
  CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
/home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-[0-9a-f]+)?$', 'pinctrl-[0-9]+'
        From schema: /home/alex/src/linux/leds/Documentation/devicetree/bindings/leds/leds-pwm.yaml

Signed-off-by: Alexander Dahl <post@lespocky.de>
Acked-by: Jeff LaBundy <jeff@labundy.com>
Acked-by: Rob Herring <robh@kernel.org>
---

Notes:
    v8 -> v9:
      * added forgotten Acked-by (Jeff LaBundy)
      * rebased on v5.11-rc1
    
    v7 -> v8:
      * rebased on recent pavel/for-next (post v5.10-rc1)
      * added Acked-by (Rob Herring)
    
    v6 -> v7:
      * added warning message to commit message (Krzysztof Kozlowski)
    
    v6:
      * added this patch to series

 Documentation/devicetree/bindings/mfd/iqs62x.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Pavel Machek Dec. 30, 2020, 6:54 p.m. UTC | #1
Hi!

> The node names for devices using the pwm-leds driver follow a certain
> naming scheme (now).  Parent node name is not enforced, but recommended
> by DT project.
> 
>   DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
>   CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> /home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-[0-9a-f]+)?$', 'pinctrl-[0-9]+'
>         From schema: /home/alex/src/linux/leds/Documentation/devicetree/bindings/leds/leds-pwm.yaml
> 
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> Acked-by: Jeff LaBundy <jeff@labundy.com>
> Acked-by: Rob Herring <robh@kernel.org>

Thanks, applied.
								Pavel
Lee Jones Dec. 31, 2020, 8:33 a.m. UTC | #2
On Wed, 30 Dec 2020, Pavel Machek wrote:

> Hi!
> 
> > The node names for devices using the pwm-leds driver follow a certain
> > naming scheme (now).  Parent node name is not enforced, but recommended
> > by DT project.
> > 
> >   DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> >   CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > /home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-[0-9a-f]+)?$', 'pinctrl-[0-9]+'
> >         From schema: /home/alex/src/linux/leds/Documentation/devicetree/bindings/leds/leds-pwm.yaml
> > 
> > Signed-off-by: Alexander Dahl <post@lespocky.de>
> > Acked-by: Jeff LaBundy <jeff@labundy.com>
> > Acked-by: Rob Herring <robh@kernel.org>
> 
> Thanks, applied.

Sorry, what?

Applied to what tree?
Pavel Machek Dec. 31, 2020, 9:39 a.m. UTC | #3
Hi!

> > > The node names for devices using the pwm-leds driver follow a certain
> > > naming scheme (now).  Parent node name is not enforced, but recommended
> > > by DT project.
> > > 
> > >   DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > >   CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > > /home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-[0-9a-f]+)?$', 'pinctrl-[0-9]+'
> > >         From schema: /home/alex/src/linux/leds/Documentation/devicetree/bindings/leds/leds-pwm.yaml
> > > 
> > > Signed-off-by: Alexander Dahl <post@lespocky.de>
> > > Acked-by: Jeff LaBundy <jeff@labundy.com>
> > > Acked-by: Rob Herring <robh@kernel.org>
> > 
> > Thanks, applied.
> 
> Sorry, what?
> 
> Applied to what tree?

I took it to (local copy) of leds-next tree on. But now I realised it
is mfd, not a LED patch, so I undone that. Sorry for the confusion.

Anyway, patch still looks good to me:

Acked-by: Pavel Machek <pavel@ucw.cz>
								Pavel
Lee Jones Dec. 31, 2020, 12:18 p.m. UTC | #4
On Thu, 31 Dec 2020, Pavel Machek wrote:

> Hi!
> 
> > > > The node names for devices using the pwm-leds driver follow a certain
> > > > naming scheme (now).  Parent node name is not enforced, but recommended
> > > > by DT project.
> > > > 
> > > >   DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > > >   CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > > > /home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-[0-9a-f]+)?$', 'pinctrl-[0-9]+'
> > > >         From schema: /home/alex/src/linux/leds/Documentation/devicetree/bindings/leds/leds-pwm.yaml
> > > > 
> > > > Signed-off-by: Alexander Dahl <post@lespocky.de>
> > > > Acked-by: Jeff LaBundy <jeff@labundy.com>
> > > > Acked-by: Rob Herring <robh@kernel.org>
> > > 
> > > Thanks, applied.
> > 
> > Sorry, what?
> > 
> > Applied to what tree?
> 
> I took it to (local copy) of leds-next tree on. But now I realised it
> is mfd, not a LED patch, so I undone that. Sorry for the confusion.
> 
> Anyway, patch still looks good to me:
> 
> Acked-by: Pavel Machek <pavel@ucw.cz>

Thanks Pavel.

I plan on taking this next week.
Lee Jones Jan. 14, 2021, 10:03 a.m. UTC | #5
On Mon, 28 Dec 2020, Alexander Dahl wrote:

> The node names for devices using the pwm-leds driver follow a certain
> naming scheme (now).  Parent node name is not enforced, but recommended
> by DT project.
> 
>   DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
>   CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> /home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-[0-9a-f]+)?$', 'pinctrl-[0-9]+'
>         From schema: /home/alex/src/linux/leds/Documentation/devicetree/bindings/leds/leds-pwm.yaml
> 
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> Acked-by: Jeff LaBundy <jeff@labundy.com>
> Acked-by: Rob Herring <robh@kernel.org>
> ---
> 
> Notes:
>     v8 -> v9:
>       * added forgotten Acked-by (Jeff LaBundy)
>       * rebased on v5.11-rc1
>     
>     v7 -> v8:
>       * rebased on recent pavel/for-next (post v5.10-rc1)
>       * added Acked-by (Rob Herring)
>     
>     v6 -> v7:
>       * added warning message to commit message (Krzysztof Kozlowski)
>     
>     v6:
>       * added this patch to series
> 
>  Documentation/devicetree/bindings/mfd/iqs62x.yaml | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Failed to apply:

Applying: dt-bindings: mfd: Fix schema warnings for pwm-leds
Using index info to reconstruct a base tree...
M	Documentation/devicetree/bindings/mfd/iqs62x.yaml
/home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:34: indent with spaces.
            led-1 {
/home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:35: indent with spaces.
                    label = "panel";
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging Documentation/devicetree/bindings/mfd/iqs62x.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/iqs62x.yaml
Recorded preimage for 'Documentation/devicetree/bindings/mfd/iqs62x.yaml'
Jeff LaBundy Jan. 15, 2021, 3:50 a.m. UTC | #6
Hi Alexander,

On Thu, Jan 14, 2021 at 10:03:12AM +0000, Lee Jones wrote:
> On Mon, 28 Dec 2020, Alexander Dahl wrote:
> 
> > The node names for devices using the pwm-leds driver follow a certain
> > naming scheme (now).  Parent node name is not enforced, but recommended
> > by DT project.
> > 
> >   DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> >   CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > /home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-[0-9a-f]+)?$', 'pinctrl-[0-9]+'
> >         From schema: /home/alex/src/linux/leds/Documentation/devicetree/bindings/leds/leds-pwm.yaml
> > 
> > Signed-off-by: Alexander Dahl <post@lespocky.de>
> > Acked-by: Jeff LaBundy <jeff@labundy.com>
> > Acked-by: Rob Herring <robh@kernel.org>
> > ---
> > 
> > Notes:
> >     v8 -> v9:
> >       * added forgotten Acked-by (Jeff LaBundy)
> >       * rebased on v5.11-rc1
> >     
> >     v7 -> v8:
> >       * rebased on recent pavel/for-next (post v5.10-rc1)
> >       * added Acked-by (Rob Herring)
> >     
> >     v6 -> v7:
> >       * added warning message to commit message (Krzysztof Kozlowski)
> >     
> >     v6:
> >       * added this patch to series
> > 
> >  Documentation/devicetree/bindings/mfd/iqs62x.yaml | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> Failed to apply:
> 
> Applying: dt-bindings: mfd: Fix schema warnings for pwm-leds
> Using index info to reconstruct a base tree...
> M	Documentation/devicetree/bindings/mfd/iqs62x.yaml
> /home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:34: indent with spaces.
>             led-1 {
> /home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:35: indent with spaces.
>                     label = "panel";
> warning: 2 lines add whitespace errors.
> Falling back to patching base and 3-way merge...
> Auto-merging Documentation/devicetree/bindings/mfd/iqs62x.yaml
> CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/iqs62x.yaml
> Recorded preimage for 'Documentation/devicetree/bindings/mfd/iqs62x.yaml'

It looks like the following patch already beat this to the punch:

8237e8382498 ("dt-bindings: mfd: Correct the node name of the panel LED")

That patch does not retain the LED's label or rename the parent node to
led-controller, however. The label hardly matters for this example, but
perhaps we still want the parent node change to follow leds-pwm.yaml.

> 
> -- 
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog

Kind regards,
Jeff LaBundy
Alexander Dahl Jan. 15, 2021, 9:42 a.m. UTC | #7
Hello Jeff,

On Thu, Jan 14, 2021 at 09:50:50PM -0600, Jeff LaBundy wrote:
> On Thu, Jan 14, 2021 at 10:03:12AM +0000, Lee Jones wrote:
> > On Mon, 28 Dec 2020, Alexander Dahl wrote:
> > 
> > > The node names for devices using the pwm-leds driver follow a certain
> > > naming scheme (now).  Parent node name is not enforced, but recommended
> > > by DT project.
> > > 
> > >   DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > >   CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > > /home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-[0-9a-f]+)?$', 'pinctrl-[0-9]+'
> > >         From schema: /home/alex/src/linux/leds/Documentation/devicetree/bindings/leds/leds-pwm.yaml
> > > 
> > > Signed-off-by: Alexander Dahl <post@lespocky.de>
> > > Acked-by: Jeff LaBundy <jeff@labundy.com>
> > > Acked-by: Rob Herring <robh@kernel.org>
> > > ---
> > > 
> > > Notes:
> > >     v8 -> v9:
> > >       * added forgotten Acked-by (Jeff LaBundy)
> > >       * rebased on v5.11-rc1
> > >     
> > >     v7 -> v8:
> > >       * rebased on recent pavel/for-next (post v5.10-rc1)
> > >       * added Acked-by (Rob Herring)
> > >     
> > >     v6 -> v7:
> > >       * added warning message to commit message (Krzysztof Kozlowski)
> > >     
> > >     v6:
> > >       * added this patch to series
> > > 
> > >  Documentation/devicetree/bindings/mfd/iqs62x.yaml | 5 +++--
> > >  1 file changed, 3 insertions(+), 2 deletions(-)
> > 
> > Failed to apply:
> > 
> > Applying: dt-bindings: mfd: Fix schema warnings for pwm-leds
> > Using index info to reconstruct a base tree...
> > M	Documentation/devicetree/bindings/mfd/iqs62x.yaml
> > /home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:34: indent with spaces.
> >             led-1 {
> > /home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:35: indent with spaces.
> >                     label = "panel";
> > warning: 2 lines add whitespace errors.
> > Falling back to patching base and 3-way merge...
> > Auto-merging Documentation/devicetree/bindings/mfd/iqs62x.yaml
> > CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/iqs62x.yaml
> > Recorded preimage for 'Documentation/devicetree/bindings/mfd/iqs62x.yaml'
> 
> It looks like the following patch already beat this to the punch:
> 
> 8237e8382498 ("dt-bindings: mfd: Correct the node name of the panel LED")

Which tree is that commit on? This one?

https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/

> That patch does not retain the LED's label or rename the parent node to
> led-controller, however. The label hardly matters for this example, but
> perhaps we still want the parent node change to follow leds-pwm.yaml.

Should I rework the patch then to have that change only?

Greets
Alex
Jeff LaBundy Jan. 18, 2021, 4:02 a.m. UTC | #8
Hi Alexander,

Thanks again for your work on this.

On Fri, Jan 15, 2021 at 10:42:39AM +0100, Alexander Dahl wrote:
> Hello Jeff,
> 
> On Thu, Jan 14, 2021 at 09:50:50PM -0600, Jeff LaBundy wrote:
> > On Thu, Jan 14, 2021 at 10:03:12AM +0000, Lee Jones wrote:
> > > On Mon, 28 Dec 2020, Alexander Dahl wrote:
> > > 
> > > > The node names for devices using the pwm-leds driver follow a certain
> > > > naming scheme (now).  Parent node name is not enforced, but recommended
> > > > by DT project.
> > > > 
> > > >   DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > > >   CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > > > /home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-[0-9a-f]+)?$', 'pinctrl-[0-9]+'
> > > >         From schema: /home/alex/src/linux/leds/Documentation/devicetree/bindings/leds/leds-pwm.yaml
> > > > 
> > > > Signed-off-by: Alexander Dahl <post@lespocky.de>
> > > > Acked-by: Jeff LaBundy <jeff@labundy.com>
> > > > Acked-by: Rob Herring <robh@kernel.org>
> > > > ---
> > > > 
> > > > Notes:
> > > >     v8 -> v9:
> > > >       * added forgotten Acked-by (Jeff LaBundy)
> > > >       * rebased on v5.11-rc1
> > > >     
> > > >     v7 -> v8:
> > > >       * rebased on recent pavel/for-next (post v5.10-rc1)
> > > >       * added Acked-by (Rob Herring)
> > > >     
> > > >     v6 -> v7:
> > > >       * added warning message to commit message (Krzysztof Kozlowski)
> > > >     
> > > >     v6:
> > > >       * added this patch to series
> > > > 
> > > >  Documentation/devicetree/bindings/mfd/iqs62x.yaml | 5 +++--
> > > >  1 file changed, 3 insertions(+), 2 deletions(-)
> > > 
> > > Failed to apply:
> > > 
> > > Applying: dt-bindings: mfd: Fix schema warnings for pwm-leds
> > > Using index info to reconstruct a base tree...
> > > M	Documentation/devicetree/bindings/mfd/iqs62x.yaml
> > > /home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:34: indent with spaces.
> > >             led-1 {
> > > /home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:35: indent with spaces.
> > >                     label = "panel";
> > > warning: 2 lines add whitespace errors.
> > > Falling back to patching base and 3-way merge...
> > > Auto-merging Documentation/devicetree/bindings/mfd/iqs62x.yaml
> > > CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/iqs62x.yaml
> > > Recorded preimage for 'Documentation/devicetree/bindings/mfd/iqs62x.yaml'
> > 
> > It looks like the following patch already beat this to the punch:
> > 
> > 8237e8382498 ("dt-bindings: mfd: Correct the node name of the panel LED")
> 
> Which tree is that commit on? This one?
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/

That's correct.

> 
> > That patch does not retain the LED's label or rename the parent node to
> > led-controller, however. The label hardly matters for this example, but
> > perhaps we still want the parent node change to follow leds-pwm.yaml.
> 
> Should I rework the patch then to have that change only?

That seems like a reasonable compromise.

> 
> Greets
> Alex
> 
> -- 
> /"\ ASCII RIBBON | »With the first link, the chain is forged. The first
> \ / CAMPAIGN     | speech censured, the first thought forbidden, the
>  X  AGAINST      | first freedom denied, chains us all irrevocably.«
> / \ HTML MAIL    | (Jean-Luc Picard, quoting Judge Aaron Satie)

Kind regards,
Jeff LaBundy
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/mfd/iqs62x.yaml b/Documentation/devicetree/bindings/mfd/iqs62x.yaml
index 541b06d80e73..92dc48a8dfa7 100644
--- a/Documentation/devicetree/bindings/mfd/iqs62x.yaml
+++ b/Documentation/devicetree/bindings/mfd/iqs62x.yaml
@@ -90,10 +90,11 @@  examples:
             };
     };
 
-    pwmleds {
+    led-controller {
             compatible = "pwm-leds";
 
-            panel {
+            led-1 {
+                    label = "panel";
                     pwms = <&iqs620a_pwm 0 1000000>;
                     max-brightness = <255>;
             };