* [PATCH 0/2] arm: mvebu: disable unused rtc + cosmetic patch for ReadyNAS devices @ 2015-10-09 22:10 Arnaud Ebalard 2015-10-09 22:10 ` [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 Arnaud Ebalard 2015-10-09 22:10 ` [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file Arnaud Ebalard 0 siblings, 2 replies; 8+ messages in thread From: Arnaud Ebalard @ 2015-10-09 22:10 UTC (permalink / raw) To: Jason Cooper, Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, linux-arm-kernel Cc: devicetree, linux-kernel, TuxOholic Hi, Here are two simple patches for Armada-based ReadyNAS devices. The first one disables Armada 370/XP rtc in the .dts files of ReadyNAS 102, 104 and 2120 devices. Those use an Intersil ISL12057 I2C RTC chip and do not use the internal Armada RTC. Because it is enabled in included armada-370-xp.dtsi, it just pollutes logs during boot. While writing the patches, I noticed RN2120 .dts file has nodes that are badly ordered under internal-regs. This second patch fixes that. Note that it depends on first patch. Arnaud Ebalard (2): arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 arm: mvebu: reorder internal-regs nodes by address in RN2120 .dts file arch/arm/boot/dts/armada-370-netgear-rn102.dts | 6 ++ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 6 ++ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 ++++++++++++++------------ 3 files changed, 58 insertions(+), 40 deletions(-) -- 2.5.3 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 2015-10-09 22:10 [PATCH 0/2] arm: mvebu: disable unused rtc + cosmetic patch for ReadyNAS devices Arnaud Ebalard @ 2015-10-09 22:10 ` Arnaud Ebalard [not found] ` <2e62abb84de02c0495bde9d60a90282deae40967.1444428035.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org> 2015-10-12 16:31 ` Gregory CLEMENT 2015-10-09 22:10 ` [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file Arnaud Ebalard 1 sibling, 2 replies; 8+ messages in thread From: Arnaud Ebalard @ 2015-10-09 22:10 UTC (permalink / raw) To: Jason Cooper, Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, linux-arm-kernel Cc: devicetree, linux-kernel, TuxOholic By default, armada-370-xp.dtsi file has internal RTC enabled. NETGEAR ReadyNAS 102, 104 and 2120 all use an Intersil ISL12057 I2C RTC chip. The internal RTC not being disabled in the .dts files of those devices result in the following useless first line during boot: [ 4.500056] rtc-mv d0010300.rtc: internal RTC not ticking [ 4.505684] i2c /dev entries driver [ 4.513246] rtc-isl12057 0-0068: rtc core: registered rtc-isl12057 as rtc0 This patch marks Armada internal RTC as disabled in individual .dts files of those devices. Reported-by: TuxOholic <tuxoholic@hotmail.de> Signed-off-by: Arnaud Ebalard <arno@natisbad.org> --- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 6 ++++++ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 6 ++++++ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts index a31207860f34..5851964196bd 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts @@ -82,6 +82,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc@10300 { + status = "disabled"; + }; + serial@12000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts index 00540f292979..b0b07ba677b9 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts @@ -82,6 +82,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc@10300 { + status = "disabled"; + }; + serial@12000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts index 1516fc2627f9..85b2f87c0b8a 100644 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts @@ -88,6 +88,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc@10300 { + status = "disabled"; + }; + /* Two rear eSATA ports */ sata@a0000 { nr-ports = <2>; -- 2.5.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
[parent not found: <2e62abb84de02c0495bde9d60a90282deae40967.1444428035.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>]
* Re: [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 [not found] ` <2e62abb84de02c0495bde9d60a90282deae40967.1444428035.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org> @ 2015-10-12 14:21 ` Andrew Lunn 0 siblings, 0 replies; 8+ messages in thread From: Andrew Lunn @ 2015-10-12 14:21 UTC (permalink / raw) To: Arnaud Ebalard Cc: Jason Cooper, Gregory Clement, Sebastian Hesselbarth, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, TuxOholic On Sat, Oct 10, 2015 at 12:10:24AM +0200, Arnaud Ebalard wrote: > > By default, armada-370-xp.dtsi file has internal RTC enabled. > NETGEAR ReadyNAS 102, 104 and 2120 all use an Intersil ISL12057 > I2C RTC chip. The internal RTC not being disabled in the .dts > files of those devices result in the following useless first > line during boot: > > [ 4.500056] rtc-mv d0010300.rtc: internal RTC not ticking > [ 4.505684] i2c /dev entries driver > [ 4.513246] rtc-isl12057 0-0068: rtc core: registered rtc-isl12057 as rtc0 > > This patch marks Armada internal RTC as disabled in individual .dts > files of those devices. > > Reported-by: TuxOholic <tuxoholic-PkbjNfxxIASELgA04lAiVw@public.gmane.org> > Signed-off-by: Arnaud Ebalard <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org> Acked-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> Thanks Arnaud Andrew > --- > arch/arm/boot/dts/armada-370-netgear-rn102.dts | 6 ++++++ > arch/arm/boot/dts/armada-370-netgear-rn104.dts | 6 ++++++ > arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 6 ++++++ > 3 files changed, 18 insertions(+) > > diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts > index a31207860f34..5851964196bd 100644 > --- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts > +++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts > @@ -82,6 +82,12 @@ > }; > > internal-regs { > + > + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ > + rtc@10300 { > + status = "disabled"; > + }; > + > serial@12000 { > status = "okay"; > }; > diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts > index 00540f292979..b0b07ba677b9 100644 > --- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts > +++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts > @@ -82,6 +82,12 @@ > }; > > internal-regs { > + > + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ > + rtc@10300 { > + status = "disabled"; > + }; > + > serial@12000 { > status = "okay"; > }; > diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > index 1516fc2627f9..85b2f87c0b8a 100644 > --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > @@ -88,6 +88,12 @@ > }; > > internal-regs { > + > + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ > + rtc@10300 { > + status = "disabled"; > + }; > + > /* Two rear eSATA ports */ > sata@a0000 { > nr-ports = <2>; > -- > 2.5.3 > > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 2015-10-09 22:10 ` [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 Arnaud Ebalard [not found] ` <2e62abb84de02c0495bde9d60a90282deae40967.1444428035.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org> @ 2015-10-12 16:31 ` Gregory CLEMENT 1 sibling, 0 replies; 8+ messages in thread From: Gregory CLEMENT @ 2015-10-12 16:31 UTC (permalink / raw) To: Arnaud Ebalard Cc: Jason Cooper, Andrew Lunn, Sebastian Hesselbarth, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, linux-arm-kernel, devicetree, linux-kernel, TuxOholic Hi Arnaud, On sam., oct. 10 2015, Arnaud Ebalard <arno@natisbad.org> wrote: > By default, armada-370-xp.dtsi file has internal RTC enabled. > NETGEAR ReadyNAS 102, 104 and 2120 all use an Intersil ISL12057 > I2C RTC chip. The internal RTC not being disabled in the .dts > files of those devices result in the following useless first > line during boot: > > [ 4.500056] rtc-mv d0010300.rtc: internal RTC not ticking > [ 4.505684] i2c /dev entries driver > [ 4.513246] rtc-isl12057 0-0068: rtc core: registered rtc-isl12057 as rtc0 > > This patch marks Armada internal RTC as disabled in individual .dts > files of those devices. > > Reported-by: TuxOholic <tuxoholic@hotmail.de> > Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Applied on mvebu/dt with Andrew's acked-by Thanks, Gregory > --- > arch/arm/boot/dts/armada-370-netgear-rn102.dts | 6 ++++++ > arch/arm/boot/dts/armada-370-netgear-rn104.dts | 6 ++++++ > arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 6 ++++++ > 3 files changed, 18 insertions(+) > > diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts > index a31207860f34..5851964196bd 100644 > --- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts > +++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts > @@ -82,6 +82,12 @@ > }; > > internal-regs { > + > + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ > + rtc@10300 { > + status = "disabled"; > + }; > + > serial@12000 { > status = "okay"; > }; > diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts > index 00540f292979..b0b07ba677b9 100644 > --- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts > +++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts > @@ -82,6 +82,12 @@ > }; > > internal-regs { > + > + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ > + rtc@10300 { > + status = "disabled"; > + }; > + > serial@12000 { > status = "okay"; > }; > diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > index 1516fc2627f9..85b2f87c0b8a 100644 > --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > @@ -88,6 +88,12 @@ > }; > > internal-regs { > + > + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ > + rtc@10300 { > + status = "disabled"; > + }; > + > /* Two rear eSATA ports */ > sata@a0000 { > nr-ports = <2>; > -- > 2.5.3 > > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file 2015-10-09 22:10 [PATCH 0/2] arm: mvebu: disable unused rtc + cosmetic patch for ReadyNAS devices Arnaud Ebalard 2015-10-09 22:10 ` [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 Arnaud Ebalard @ 2015-10-09 22:10 ` Arnaud Ebalard 2015-10-12 14:23 ` Andrew Lunn 2015-10-12 16:27 ` Gregory CLEMENT 1 sibling, 2 replies; 8+ messages in thread From: Arnaud Ebalard @ 2015-10-09 22:10 UTC (permalink / raw) To: Jason Cooper, Andrew Lunn, Gregory Clement, Sebastian Hesselbarth, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, linux-arm-kernel Cc: devicetree, linux-kernel, TuxOholic This cosmetic patch reorder nodes under internal-regs by increasing address order, as epxected. Signed-off-by: Arnaud Ebalard <arno@natisbad.org> --- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 +++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts index 85b2f87c0b8a..d72a69d97ba2 100644 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts @@ -94,54 +94,11 @@ status = "disabled"; }; - /* Two rear eSATA ports */ - sata@a0000 { - nr-ports = <2>; - status = "okay"; - }; - - serial@12000 { - status = "okay"; - }; - - mdio { - phy0: ethernet-phy@0 { /* Marvell 88E1318 */ - reg = <0>; - }; - - phy1: ethernet-phy@1 { /* Marvell 88E1318 */ - reg = <1>; - }; - }; - - ethernet@70000 { - status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; - }; - - ethernet@74000 { - status = "okay"; - phy = <&phy1>; - phy-mode = "rgmii-id"; - }; - - /* Front USB 2.0 port */ - usb@50000 { - status = "okay"; - }; - i2c@11000 { compatible = "marvell,mv64xxx-i2c"; clock-frequency = <400000>; status = "okay"; - isl12057: isl12057@68 { - compatible = "isil,isl12057"; - reg = <0x68>; - isil,irq2-can-wakeup-machine; - }; - /* Controller for rear fan #1 of 3 (Protechnic * MGT4012XB-O20, 8000RPM) near eSATA port */ g762_fan1: g762@3e { @@ -178,6 +135,49 @@ compatible = "gmt,g751"; reg = <0x4c>; }; + + isl12057: isl12057@68 { + compatible = "isil,isl12057"; + reg = <0x68>; + isil,irq2-can-wakeup-machine; + }; + }; + + serial@12000 { + status = "okay"; + }; + + /* Front USB 2.0 port */ + usb@50000 { + status = "okay"; + }; + + mdio { + phy0: ethernet-phy@0 { /* Marvell 88E1318 */ + reg = <0>; + }; + + phy1: ethernet-phy@1 { /* Marvell 88E1318 */ + reg = <1>; + }; + }; + + ethernet@70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; + + ethernet@74000 { + status = "okay"; + phy = <&phy1>; + phy-mode = "rgmii-id"; + }; + + /* Two rear eSATA ports */ + sata@a0000 { + nr-ports = <2>; + status = "okay"; }; nand@d0000 { -- 2.5.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file 2015-10-09 22:10 ` [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file Arnaud Ebalard @ 2015-10-12 14:23 ` Andrew Lunn [not found] ` <20151012142324.GB30801-g2DYL2Zd6BY@public.gmane.org> 2015-10-12 16:27 ` Gregory CLEMENT 1 sibling, 1 reply; 8+ messages in thread From: Andrew Lunn @ 2015-10-12 14:23 UTC (permalink / raw) To: Arnaud Ebalard Cc: Jason Cooper, Gregory Clement, Sebastian Hesselbarth, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, linux-arm-kernel, devicetree, linux-kernel, TuxOholic On Sat, Oct 10, 2015 at 12:10:39AM +0200, Arnaud Ebalard wrote: > > This cosmetic patch reorder nodes under internal-regs by increasing > address order, as epxected. expected. Gregory, can you fix that as you commit? Acked-by: Andrew Lunn <andrew@lunn.ch> Andrew > > Signed-off-by: Arnaud Ebalard <arno@natisbad.org> > --- > arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 +++++++++++++------------- > 1 file changed, 43 insertions(+), 43 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > index 85b2f87c0b8a..d72a69d97ba2 100644 > --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > @@ -94,54 +94,11 @@ > status = "disabled"; > }; > > - /* Two rear eSATA ports */ > - sata@a0000 { > - nr-ports = <2>; > - status = "okay"; > - }; > - > - serial@12000 { > - status = "okay"; > - }; > - > - mdio { > - phy0: ethernet-phy@0 { /* Marvell 88E1318 */ > - reg = <0>; > - }; > - > - phy1: ethernet-phy@1 { /* Marvell 88E1318 */ > - reg = <1>; > - }; > - }; > - > - ethernet@70000 { > - status = "okay"; > - phy = <&phy0>; > - phy-mode = "rgmii-id"; > - }; > - > - ethernet@74000 { > - status = "okay"; > - phy = <&phy1>; > - phy-mode = "rgmii-id"; > - }; > - > - /* Front USB 2.0 port */ > - usb@50000 { > - status = "okay"; > - }; > - > i2c@11000 { > compatible = "marvell,mv64xxx-i2c"; > clock-frequency = <400000>; > status = "okay"; > > - isl12057: isl12057@68 { > - compatible = "isil,isl12057"; > - reg = <0x68>; > - isil,irq2-can-wakeup-machine; > - }; > - > /* Controller for rear fan #1 of 3 (Protechnic > * MGT4012XB-O20, 8000RPM) near eSATA port */ > g762_fan1: g762@3e { > @@ -178,6 +135,49 @@ > compatible = "gmt,g751"; > reg = <0x4c>; > }; > + > + isl12057: isl12057@68 { > + compatible = "isil,isl12057"; > + reg = <0x68>; > + isil,irq2-can-wakeup-machine; > + }; > + }; > + > + serial@12000 { > + status = "okay"; > + }; > + > + /* Front USB 2.0 port */ > + usb@50000 { > + status = "okay"; > + }; > + > + mdio { > + phy0: ethernet-phy@0 { /* Marvell 88E1318 */ > + reg = <0>; > + }; > + > + phy1: ethernet-phy@1 { /* Marvell 88E1318 */ > + reg = <1>; > + }; > + }; > + > + ethernet@70000 { > + status = "okay"; > + phy = <&phy0>; > + phy-mode = "rgmii-id"; > + }; > + > + ethernet@74000 { > + status = "okay"; > + phy = <&phy1>; > + phy-mode = "rgmii-id"; > + }; > + > + /* Two rear eSATA ports */ > + sata@a0000 { > + nr-ports = <2>; > + status = "okay"; > }; > > nand@d0000 { > -- > 2.5.3 > ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <20151012142324.GB30801-g2DYL2Zd6BY@public.gmane.org>]
* Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file [not found] ` <20151012142324.GB30801-g2DYL2Zd6BY@public.gmane.org> @ 2015-10-12 16:32 ` Gregory CLEMENT 0 siblings, 0 replies; 8+ messages in thread From: Gregory CLEMENT @ 2015-10-12 16:32 UTC (permalink / raw) To: Andrew Lunn Cc: Arnaud Ebalard, Jason Cooper, Sebastian Hesselbarth, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, TuxOholic Hi Andrew, On lun., oct. 12 2015, Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> wrote: > On Sat, Oct 10, 2015 at 12:10:39AM +0200, Arnaud Ebalard wrote: >> >> This cosmetic patch reorder nodes under internal-regs by increasing >> address order, as epxected. > > expected. > > Gregory, can you fix that as you commit? Done! > > Acked-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> > > Andrew > >> >> Signed-off-by: Arnaud Ebalard <arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org> >> --- >> arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 +++++++++++++------------- >> 1 file changed, 43 insertions(+), 43 deletions(-) >> >> diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts >> index 85b2f87c0b8a..d72a69d97ba2 100644 >> --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts >> +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts >> @@ -94,54 +94,11 @@ >> status = "disabled"; >> }; >> >> - /* Two rear eSATA ports */ >> - sata@a0000 { >> - nr-ports = <2>; >> - status = "okay"; >> - }; >> - >> - serial@12000 { >> - status = "okay"; >> - }; >> - >> - mdio { >> - phy0: ethernet-phy@0 { /* Marvell 88E1318 */ >> - reg = <0>; >> - }; >> - >> - phy1: ethernet-phy@1 { /* Marvell 88E1318 */ >> - reg = <1>; >> - }; >> - }; >> - >> - ethernet@70000 { >> - status = "okay"; >> - phy = <&phy0>; >> - phy-mode = "rgmii-id"; >> - }; >> - >> - ethernet@74000 { >> - status = "okay"; >> - phy = <&phy1>; >> - phy-mode = "rgmii-id"; >> - }; >> - >> - /* Front USB 2.0 port */ >> - usb@50000 { >> - status = "okay"; >> - }; >> - >> i2c@11000 { >> compatible = "marvell,mv64xxx-i2c"; >> clock-frequency = <400000>; >> status = "okay"; >> >> - isl12057: isl12057@68 { >> - compatible = "isil,isl12057"; >> - reg = <0x68>; >> - isil,irq2-can-wakeup-machine; >> - }; >> - >> /* Controller for rear fan #1 of 3 (Protechnic >> * MGT4012XB-O20, 8000RPM) near eSATA port */ >> g762_fan1: g762@3e { >> @@ -178,6 +135,49 @@ >> compatible = "gmt,g751"; >> reg = <0x4c>; >> }; >> + >> + isl12057: isl12057@68 { >> + compatible = "isil,isl12057"; >> + reg = <0x68>; >> + isil,irq2-can-wakeup-machine; >> + }; >> + }; >> + >> + serial@12000 { >> + status = "okay"; >> + }; >> + >> + /* Front USB 2.0 port */ >> + usb@50000 { >> + status = "okay"; >> + }; >> + >> + mdio { >> + phy0: ethernet-phy@0 { /* Marvell 88E1318 */ >> + reg = <0>; >> + }; >> + >> + phy1: ethernet-phy@1 { /* Marvell 88E1318 */ >> + reg = <1>; >> + }; >> + }; >> + >> + ethernet@70000 { >> + status = "okay"; >> + phy = <&phy0>; >> + phy-mode = "rgmii-id"; >> + }; >> + >> + ethernet@74000 { >> + status = "okay"; >> + phy = <&phy1>; >> + phy-mode = "rgmii-id"; >> + }; >> + >> + /* Two rear eSATA ports */ >> + sata@a0000 { >> + nr-ports = <2>; >> + status = "okay"; >> }; >> >> nand@d0000 { >> -- >> 2.5.3 >> -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file 2015-10-09 22:10 ` [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file Arnaud Ebalard 2015-10-12 14:23 ` Andrew Lunn @ 2015-10-12 16:27 ` Gregory CLEMENT 1 sibling, 0 replies; 8+ messages in thread From: Gregory CLEMENT @ 2015-10-12 16:27 UTC (permalink / raw) To: Arnaud Ebalard Cc: Jason Cooper, Andrew Lunn, Sebastian Hesselbarth, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King, linux-arm-kernel, devicetree, linux-kernel, TuxOholic Hi Arnaud, On sam., oct. 10 2015, Arnaud Ebalard <arno@natisbad.org> wrote: > This cosmetic patch reorder nodes under internal-regs by increasing > address order, as epxected. > > Signed-off-by: Arnaud Ebalard <arno@natisbad.org> Applied on mvebu/dt with Andrew acked-by Thanks, Gregory > --- > arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 +++++++++++++------------- > 1 file changed, 43 insertions(+), 43 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > index 85b2f87c0b8a..d72a69d97ba2 100644 > --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > @@ -94,54 +94,11 @@ > status = "disabled"; > }; > > - /* Two rear eSATA ports */ > - sata@a0000 { > - nr-ports = <2>; > - status = "okay"; > - }; > - > - serial@12000 { > - status = "okay"; > - }; > - > - mdio { > - phy0: ethernet-phy@0 { /* Marvell 88E1318 */ > - reg = <0>; > - }; > - > - phy1: ethernet-phy@1 { /* Marvell 88E1318 */ > - reg = <1>; > - }; > - }; > - > - ethernet@70000 { > - status = "okay"; > - phy = <&phy0>; > - phy-mode = "rgmii-id"; > - }; > - > - ethernet@74000 { > - status = "okay"; > - phy = <&phy1>; > - phy-mode = "rgmii-id"; > - }; > - > - /* Front USB 2.0 port */ > - usb@50000 { > - status = "okay"; > - }; > - > i2c@11000 { > compatible = "marvell,mv64xxx-i2c"; > clock-frequency = <400000>; > status = "okay"; > > - isl12057: isl12057@68 { > - compatible = "isil,isl12057"; > - reg = <0x68>; > - isil,irq2-can-wakeup-machine; > - }; > - > /* Controller for rear fan #1 of 3 (Protechnic > * MGT4012XB-O20, 8000RPM) near eSATA port */ > g762_fan1: g762@3e { > @@ -178,6 +135,49 @@ > compatible = "gmt,g751"; > reg = <0x4c>; > }; > + > + isl12057: isl12057@68 { > + compatible = "isil,isl12057"; > + reg = <0x68>; > + isil,irq2-can-wakeup-machine; > + }; > + }; > + > + serial@12000 { > + status = "okay"; > + }; > + > + /* Front USB 2.0 port */ > + usb@50000 { > + status = "okay"; > + }; > + > + mdio { > + phy0: ethernet-phy@0 { /* Marvell 88E1318 */ > + reg = <0>; > + }; > + > + phy1: ethernet-phy@1 { /* Marvell 88E1318 */ > + reg = <1>; > + }; > + }; > + > + ethernet@70000 { > + status = "okay"; > + phy = <&phy0>; > + phy-mode = "rgmii-id"; > + }; > + > + ethernet@74000 { > + status = "okay"; > + phy = <&phy1>; > + phy-mode = "rgmii-id"; > + }; > + > + /* Two rear eSATA ports */ > + sata@a0000 { > + nr-ports = <2>; > + status = "okay"; > }; > > nand@d0000 { > -- > 2.5.3 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-10-12 16:32 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-09 22:10 [PATCH 0/2] arm: mvebu: disable unused rtc + cosmetic patch for ReadyNAS devices Arnaud Ebalard
2015-10-09 22:10 ` [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 Arnaud Ebalard
[not found] ` <2e62abb84de02c0495bde9d60a90282deae40967.1444428035.git.arno-LkuqDEemtHBg9hUCZPvPmw@public.gmane.org>
2015-10-12 14:21 ` Andrew Lunn
2015-10-12 16:31 ` Gregory CLEMENT
2015-10-09 22:10 ` [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file Arnaud Ebalard
2015-10-12 14:23 ` Andrew Lunn
[not found] ` <20151012142324.GB30801-g2DYL2Zd6BY@public.gmane.org>
2015-10-12 16:32 ` Gregory CLEMENT
2015-10-12 16:27 ` Gregory CLEMENT
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).