| Message ID | 1415993776-3469-1-git-send-email-u.kleine-koenig@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
On Fri, Nov 14, 2014 at 08:36:16PM +0100, Uwe Kleine-König wrote: > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 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. > --- > arch/arm/boot/dts/armada-370.dtsi | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi > index 6b3c23b1e138..7513410f7b89 100644 > --- a/arch/arm/boot/dts/armada-370.dtsi > +++ b/arch/arm/boot/dts/armada-370.dtsi > @@ -106,11 +106,6 @@ > reg = <0x11100 0x20>; > }; > > - system-controller@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@18200 { > + compatible = "marvell,armada-370-xp-system-controller"; > + reg = <0x18200 0x100>; > + }; > + > gateclk: clock-gating-control@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
On Fri, Nov 14, 2014 at 09:43:33PM +0100, Uwe Kleine-König wrote: > 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 <u.kleine-koenig@pengutronix.de> > --- > Hello Andrew, > > I guess your question concerning overlapping ranges doesn't stop this > patch from being useful, does it? Not at all. Acked-by: Andrew Lunn <andrew@lunn.ch> Andrew
Dear Andrew Lunn, On Fri, 14 Nov 2014 21:22:00 +0100, Andrew Lunn wrote: > 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
On Fri, Nov 14, 2014 at 09:43:33PM +0100, Uwe Kleine-König wrote: > 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 <u.kleine-koenig@pengutronix.de> > --- > 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(-) Applied to mvebu/dt with Andrew's Ack. thx, Jason.
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 6b3c23b1e138..7513410f7b89 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -106,11 +106,6 @@ reg = <0x11100 0x20>; }; - system-controller@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@18200 { + compatible = "marvell,armada-370-xp-system-controller"; + reg = <0x18200 0x100>; + }; + gateclk: clock-gating-control@18220 { compatible = "marvell,armada-370-gating-clock"; reg = <0x18220 0x4>;
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- arch/arm/boot/dts/armada-370.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)