ARM: mvebu: fix ordering in Armada 370 .dtsi
PATCH 1/1 ARM: mvebu: fix ordering in Armada 370 .dtsi
--- arch/arm/boot/dts/armada-370.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/armada-370.dtsi +5 -5
@@ -106,11 +106,6 @@ reg = <0x11100 0x20>; }; - system-controller at 18200 { - compatible = "marvell,armada-370-xp-system-controller"; - reg = <0x18200 0x100>; - }; - pinctrl { compatible = "marvell,mv88f6710-pinctrl"; reg = <0x18000 0x38>;
@@ -205,6 +200,11 @@ interrupts = <91>; }; + system-controller at 18200 { + compatible = "marvell,armada-370-xp-system-controller"; + reg = <0x18200 0x100>; + }; + gateclk: clock-gating-control at 18220 { compatible = "marvell,armada-370-gating-clock"; reg = <0x18220 0x4>;
Signature · 1 line
2.1.3
PATCH 1/1 ARM: mvebu: fix ordering in Armada 370 .dtsi
Quoted 1 line · Uwe Kleine-K?nig
Signed-off-by Uwe Kleine-K?nig <[email protected]>
It is normal to have something in the changelog, even if it is the same as the subject said differently.
Here you could say something like:
Commit a095b1c78a35f05755 "ARM: mvebu: sort DT nodes by address" missed placing the system-controller in the correct order.
Quoted 22 lines
--- arch/arm/boot/dts/armada-370.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)arch/arm/boot/dts/armada-370.dtsi +0
-5@@ -106,11 +106,6 @@ reg = <0x11100 0x20>; }; - system-controller at 18200 { - compatible = "marvell,armada-370-xp-system-controller"; - reg = <0x18200 0x100>; - }; - pinctrl { compatible = "marvell,mv88f6710-pinctrl"; reg = <0x18000 0x38>;@@ -205,6 +200,11 @@ interrupts = <91>;
arch/arm/boot/dts/armada-370.dtsi line 210
Quoted 10 lines
arch/arm/boot/dts/armada-370.dtsi +5
-0}; + system-controller at 18200 { + compatible = "marvell,armada-370-xp-system-controller"; + reg = <0x18200 0x100>; + }; + gateclk: clock-gating-control at 18220 { compatible = "marvell,armada-370-gating-clock"; reg = <0x18220 0x4>;
Humm.
Now we have things in the right order, we see that the system-controller and the clock-gating-controller overlap.
I know the HW engineers have gone a bit crazy around here, so maybe we have no choice?
Andrew
PATCH 1/1 ARM: mvebu: fix ordering in Armada 370 .dtsi
Dear Andrew Lunn,
Quoted 7 lines · Andrew Lunn
Humm.
Now we have things in the right order, we see that the system-controller and the clock-gating-controller overlap.
I know the HW engineers have gone a bit crazy around here, so maybe we have no choice?
Not nice indeed. All those "system-level" registers that do not belong to clearly identified hardware blocks are really a mess. Maybe it's time to use the 'syscon' infrastructure to deal with those registers?
Unfortunately, due to the major pain caused by DT backward compatibility, switching completely and properly to syscon is probably going to be difficult if we don't want to break old Device Tree files.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/1 ARM: mvebu: fix ordering in Armada 370 .dtsi
In reply to Uwe Kleine-KönigCommit a095b1c78a35 ("ARM: mvebu: sort DT nodes by address") missed placing the system-controller in the correct order.
---
Hello Andrew,
I guess your question concerning overlapping ranges doesn't stop this patch from being useful, does it?
Also thanks for the suggested wording which I nearly took as is.
Best regards
Uwe
arch/arm/boot/dts/armada-370.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/armada-370.dtsi +5 -5
@@ -106,11 +106,6 @@ reg = <0x11100 0x20>; }; - system-controller at 18200 { - compatible = "marvell,armada-370-xp-system-controller"; - reg = <0x18200 0x100>; - }; - pinctrl { compatible = "marvell,mv88f6710-pinctrl"; reg = <0x18000 0x38>;
@@ -205,6 +200,11 @@ interrupts = <91>; }; + system-controller at 18200 { + compatible = "marvell,armada-370-xp-system-controller"; + reg = <0x18200 0x100>; + }; + gateclk: clock-gating-control at 18220 { compatible = "marvell,armada-370-gating-clock"; reg = <0x18220 0x4>;
Signature · 5 lines
2.1.3 -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v2 1/1 ARM: mvebu: fix ordering in Armada 370 .dtsi
Quoted 10 lines · Uwe Kleine-K?nig
Commit
a095b1c78a35("ARM: mvebu: sort DT nodes by address") missed placing the system-controller in the correct order.Fixes a095b1c78a35 ("ARM: mvebu: sort DT nodes by address")Signed-off-by Uwe Kleine-K?nig <[email protected]>---
Hello Andrew,I guess your question concerning overlapping ranges doesn't stop this patch from being useful, does it?
Not at all.
Andrew
Jason Cooper
AppliedPATCH v2 1/1 ARM: mvebu: fix ordering in Armada 370 .dtsi
In reply to Uwe Kleine-KönigQuoted 11 lines · Uwe Kleine-K?nig
Commit
a095b1c78a35("ARM: mvebu: sort DT nodes by address") missed placing the system-controller in the correct order.Fixes a095b1c78a35 ("ARM: mvebu: sort DT nodes by address")Signed-off-by Uwe Kleine-K?nig <[email protected]>---
Hello Andrew,I guess your question concerning overlapping ranges doesn't stop this patch from being useful, does it?
Quoted 7 lines
Also thanks for the suggested wording which I nearly took as is.
Best regards
Uwearch/arm/boot/dts/armada-370.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Applied to mvebu/dt with Andrew's Ack.
thx,
Jason.