* [PATCH] ARM: dts: realview: Fix some more duplicate regulator nodes
@ 2018-12-03 19:12 Rob Herring
2018-12-03 20:39 ` Linus Walleij
2018-12-03 20:40 ` Olof Johansson
0 siblings, 2 replies; 4+ messages in thread
From: Rob Herring @ 2018-12-03 19:12 UTC (permalink / raw)
To: Linus Walleij, arm; +Cc: devicetree, linux-arm-kernel
There's a bug in dtc in checking for duplicate node names when there's
another section (e.g. "/ { };"). In this case, skeleton.dtsi provides
another section. Upon removal of skeleton.dtsi, the dtb fails to build
due to a duplicate node 'fixedregulator@0'. As both nodes were pretty
much the same 3.3V fixed regulator, it hasn't really mattered. Fix this
by renaming the nodes to something unique. In the process, drop the
unit-address which shouldn't be present wtihout reg property.
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
---
Sigh, not sure what happened, but I missed these 2 cases.
arch/arm/boot/dts/arm-realview-pb1176.dts | 4 ++--
arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts
index cee2d7aab203..cbbb8878daa3 100644
--- a/arch/arm/boot/dts/arm-realview-pb1176.dts
+++ b/arch/arm/boot/dts/arm-realview-pb1176.dts
@@ -47,7 +47,7 @@
};
/* The voltage to the MMC card is hardwired at 3.3V */
- vmmc: fixedregulator@0 {
+ vmmc: regulator-vmmc {
compatible = "regulator-fixed";
regulator-name = "vmmc";
regulator-min-microvolt = <3300000>;
@@ -55,7 +55,7 @@
regulator-boot-on;
};
- veth: fixedregulator@0 {
+ veth: regulator-veth {
compatible = "regulator-fixed";
regulator-name = "veth";
regulator-min-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts
index 63d71a1d8282..2015619ca22c 100644
--- a/arch/arm/boot/dts/arm-realview-pb11mp.dts
+++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts
@@ -147,7 +147,7 @@
};
/* The voltage to the MMC card is hardwired at 3.3V */
- vmmc: fixedregulator@0 {
+ vmmc: regulator-vmmc {
compatible = "regulator-fixed";
regulator-name = "vmmc";
regulator-min-microvolt = <3300000>;
@@ -155,7 +155,7 @@
regulator-boot-on;
};
- veth: fixedregulator@0 {
+ veth: regulator-veth {
compatible = "regulator-fixed";
regulator-name = "veth";
regulator-min-microvolt = <3300000>;
--
2.19.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ARM: dts: realview: Fix some more duplicate regulator nodes
2018-12-03 19:12 [PATCH] ARM: dts: realview: Fix some more duplicate regulator nodes Rob Herring
@ 2018-12-03 20:39 ` Linus Walleij
2018-12-03 20:44 ` Olof Johansson
2018-12-03 20:40 ` Olof Johansson
1 sibling, 1 reply; 4+ messages in thread
From: Linus Walleij @ 2018-12-03 20:39 UTC (permalink / raw)
To: Rob Herring
Cc: open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
arm-soc, Linux ARM
On Mon, Dec 3, 2018 at 8:12 PM Rob Herring <robh@kernel.org> wrote:
> There's a bug in dtc in checking for duplicate node names when there's
> another section (e.g. "/ { };"). In this case, skeleton.dtsi provides
> another section. Upon removal of skeleton.dtsi, the dtb fails to build
> due to a duplicate node 'fixedregulator@0'. As both nodes were pretty
> much the same 3.3V fixed regulator, it hasn't really mattered. Fix this
> by renaming the nodes to something unique. In the process, drop the
> unit-address which shouldn't be present wtihout reg property.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Arm SoC folks: are you applying it directly like with the last
one?
Yours,
Linus Walleij
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ARM: dts: realview: Fix some more duplicate regulator nodes
2018-12-03 20:39 ` Linus Walleij
@ 2018-12-03 20:44 ` Olof Johansson
0 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2018-12-03 20:44 UTC (permalink / raw)
To: LinusW; +Cc: Rob Herring, ARM-SoC Maintainers, Linux ARM Mailing List, DTML
On Mon, Dec 3, 2018 at 12:39 PM Linus Walleij <linus.walleij@linaro.org> wrote:
>
> On Mon, Dec 3, 2018 at 8:12 PM Rob Herring <robh@kernel.org> wrote:
>
> > There's a bug in dtc in checking for duplicate node names when there's
> > another section (e.g. "/ { };"). In this case, skeleton.dtsi provides
> > another section. Upon removal of skeleton.dtsi, the dtb fails to build
> > due to a duplicate node 'fixedregulator@0'. As both nodes were pretty
> > much the same 3.3V fixed regulator, it hasn't really mattered. Fix this
> > by renaming the nodes to something unique. In the process, drop the
> > unit-address which shouldn't be present wtihout reg property.
> >
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Signed-off-by: Rob Herring <robh@kernel.org>
>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
>
> Arm SoC folks: are you applying it directly like with the last
> one?
Yep, just did (but email didn't go out yet, I tend to batch them up).
Revisited and added your Reviewed-by though.
Thanks,
-Olof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: dts: realview: Fix some more duplicate regulator nodes
2018-12-03 19:12 [PATCH] ARM: dts: realview: Fix some more duplicate regulator nodes Rob Herring
2018-12-03 20:39 ` Linus Walleij
@ 2018-12-03 20:40 ` Olof Johansson
1 sibling, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2018-12-03 20:40 UTC (permalink / raw)
To: Rob Herring; +Cc: devicetree, Linus Walleij, arm, linux-arm-kernel
On Mon, Dec 03, 2018 at 01:12:48PM -0600, Rob Herring wrote:
> There's a bug in dtc in checking for duplicate node names when there's
> another section (e.g. "/ { };"). In this case, skeleton.dtsi provides
> another section. Upon removal of skeleton.dtsi, the dtb fails to build
> due to a duplicate node 'fixedregulator@0'. As both nodes were pretty
> much the same 3.3V fixed regulator, it hasn't really mattered. Fix this
> by renaming the nodes to something unique. In the process, drop the
> unit-address which shouldn't be present wtihout reg property.
>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> Sigh, not sure what happened, but I missed these 2 cases.
Applied to fixes. Thanks!
-Olof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-03 20:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-03 19:12 [PATCH] ARM: dts: realview: Fix some more duplicate regulator nodes Rob Herring
2018-12-03 20:39 ` Linus Walleij
2018-12-03 20:44 ` Olof Johansson
2018-12-03 20:40 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).