Re: [PATCH v9 1/4] dt-bindings: mfd: Fix schema warnings for pwm-leds
From: Alexander Dahl <hidden>
Date: 2021-01-15 09:45:58
Also in:
linux-amlogic, linux-devicetree, linux-leds, lkml
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:quoted
On Mon, 28 Dec 2020, Alexander Dahl wrote:quoted
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 <redacted> Acked-by: Jeff LaBundy <redacted> 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 -- /"\ 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)