arm: mvebu: disable unused rtc + cosmetic patch for ReadyNAS devices
cover arm: mvebu: disable unused rtc + cosmetic patch for ReadyNAS devices
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(-)
Signature · 1 line
2.5.3
PATCH 1/2 arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120
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 <[email protected]>
Signed-off-by Arnaud Ebalard <[email protected]>
--- 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(+)
arch/arm/boot/dts/armada-370-netgear-rn102.dts +6 -0
@@ -82,6 +82,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc at 10300 { + status = "disabled"; + }; + serial at 12000 { status = "okay"; };
arch/arm/boot/dts/armada-370-netgear-rn104.dts +6 -0
@@ -82,6 +82,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc at 10300 { + status = "disabled"; + }; + serial at 12000 { status = "okay"; };
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +6 -0
@@ -88,6 +88,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc at 10300 { + status = "disabled"; + }; + /* Two rear eSATA ports */ sata at a0000 { nr-ports = <2>;
Signature · 1 line
2.5.3
PATCH 2/2 arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file
In reply to Arnaud EbalardThis cosmetic patch reorder nodes under internal-regs by increasing address order, as epxected.
Signed-off-by Arnaud Ebalard <[email protected]>
--- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 +++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-)
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +43 -43
@@ -94,54 +94,11 @@ status = "disabled"; }; - /* Two rear eSATA ports */ - sata at a0000 { - nr-ports = <2>; - status = "okay"; - }; - - serial at 12000 { - status = "okay"; - }; - - mdio { - phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ - reg = <0>; - }; - - phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ - reg = <1>; - }; - }; - - ethernet at 70000 { - status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; - }; - - ethernet at 74000 { - status = "okay"; - phy = <&phy1>; - phy-mode = "rgmii-id"; - }; - - /* Front USB 2.0 port */ - usb at 50000 { - status = "okay"; - }; - i2c at 11000 { compatible = "marvell,mv64xxx-i2c"; clock-frequency = <400000>; status = "okay"; - isl12057: isl12057 at 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 at 3e {
@@ -178,6 +135,49 @@ compatible = "gmt,g751"; reg = <0x4c>; }; + + isl12057: isl12057 at 68 { + compatible = "isil,isl12057"; + reg = <0x68>; + isil,irq2-can-wakeup-machine; + }; + }; + + serial at 12000 { + status = "okay"; + }; + + /* Front USB 2.0 port */ + usb at 50000 { + status = "okay"; + }; + + mdio { + phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ + reg = <0>; + }; + + phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ + reg = <1>; + }; + }; + + ethernet at 70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; + + ethernet at 74000 { + status = "okay"; + phy = <&phy1>; + phy-mode = "rgmii-id"; + }; + + /* Two rear eSATA ports */ + sata at a0000 { + nr-ports = <2>; + status = "okay"; }; nand at d0000 {
Signature · 1 line
2.5.3
Re: [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120
In reply to Arnaud EbalardQuoted 11 lines · Arnaud Ebalard
By default,
armada-370-xp.dtsifile 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
Quoted 5 lines
This patch marks Armada internal RTC as disabled in individual .dts files of those devices.
Reported-by TuxOholic <[email protected]>Signed-off-by Arnaud Ebalard <[email protected]>
Acked-by Andrew Lunn <[email protected]>
Thanks Arnaud
Andrew
Quoted 61 lines
--- 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(+)arch/arm/boot/dts/armada-370-netgear-rn102.dts +6
-0@@ -82,6 +82,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc at 10300 { + status = "disabled"; + }; + serial at 12000 { status = "okay"; };arch/arm/boot/dts/armada-370-netgear-rn104.dts +6
-0@@ -82,6 +82,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc at 10300 { + status = "disabled"; + }; + serial at 12000 { status = "okay"; };arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +6
-0@@ -88,6 +88,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc at 10300 { + status = "disabled"; + }; + /* Two rear eSATA ports */ sata at a0000 { nr-ports = <2>;Signature · 1 line
2.5.3
Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file
In reply to Arnaud EbalardQuoted 3 lines · Arnaud Ebalard
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 <[email protected]>
Andrew
Quoted 118 lines
Signed-off-by Arnaud Ebalard <[email protected]>--- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 +++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-)arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +43
-43@@ -94,54 +94,11 @@ status = "disabled"; }; - /* Two rear eSATA ports */ - sata at a0000 { - nr-ports = <2>; - status = "okay"; - }; - - serial at 12000 { - status = "okay"; - }; - - mdio { - phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ - reg = <0>; - }; - - phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ - reg = <1>; - }; - }; - - ethernet at 70000 { - status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; - }; - - ethernet at 74000 { - status = "okay"; - phy = <&phy1>; - phy-mode = "rgmii-id"; - }; - - /* Front USB 2.0 port */ - usb at 50000 { - status = "okay"; - }; - i2c at 11000 { compatible = "marvell,mv64xxx-i2c"; clock-frequency = <400000>; status = "okay"; - isl12057: isl12057 at 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 at 3e {@@ -178,6 +135,49 @@ compatible = "gmt,g751"; reg = <0x4c>; }; + + isl12057: isl12057 at 68 { + compatible = "isil,isl12057"; + reg = <0x68>; + isil,irq2-can-wakeup-machine; + }; + }; + + serial at 12000 { + status = "okay"; + }; + + /* Front USB 2.0 port */ + usb at 50000 { + status = "okay"; + }; + + mdio { + phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ + reg = <0>; + }; + + phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ + reg = <1>; + }; + }; + + ethernet at 70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; + + ethernet at 74000 { + status = "okay"; + phy = <&phy1>; + phy-mode = "rgmii-id"; + }; + + /* Two rear eSATA ports */ + sata at a0000 { + nr-ports = <2>; + status = "okay"; }; nand at d0000 {Signature · 1 line
2.5.3
Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file
In reply to Arnaud EbalardHi Arnaud,
Quoted 4 lines · Arnaud Ebalard
This cosmetic patch reorder nodes under internal-regs by increasing address order, as epxected.
Signed-off-by Arnaud Ebalard <[email protected]>
Applied on mvebu/dt with Andrew acked-by
Thanks,
Gregory
Quoted 116 lines
--- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 +++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-)arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +43
-43@@ -94,54 +94,11 @@ status = "disabled"; }; - /* Two rear eSATA ports */ - sata at a0000 { - nr-ports = <2>; - status = "okay"; - }; - - serial at 12000 { - status = "okay"; - }; - - mdio { - phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ - reg = <0>; - }; - - phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ - reg = <1>; - }; - }; - - ethernet at 70000 { - status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; - }; - - ethernet at 74000 { - status = "okay"; - phy = <&phy1>; - phy-mode = "rgmii-id"; - }; - - /* Front USB 2.0 port */ - usb at 50000 { - status = "okay"; - }; - i2c at 11000 { compatible = "marvell,mv64xxx-i2c"; clock-frequency = <400000>; status = "okay"; - isl12057: isl12057 at 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 at 3e {@@ -178,6 +135,49 @@ compatible = "gmt,g751"; reg = <0x4c>; }; + + isl12057: isl12057 at 68 { + compatible = "isil,isl12057"; + reg = <0x68>; + isil,irq2-can-wakeup-machine; + }; + }; + + serial at 12000 { + status = "okay"; + }; + + /* Front USB 2.0 port */ + usb at 50000 { + status = "okay"; + }; + + mdio { + phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ + reg = <0>; + }; + + phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ + reg = <1>; + }; + }; + + ethernet at 70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; + + ethernet at 74000 { + status = "okay"; + phy = <&phy1>; + phy-mode = "rgmii-id"; + }; + + /* Two rear eSATA ports */ + sata at a0000 { + nr-ports = <2>; + status = "okay"; }; nand at d0000 {Signature · 1 line
2.5.3
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Re: [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120
In reply to Arnaud EbalardHi Arnaud,
Quoted 10 lines · Arnaud Ebalard
By default,
armada-370-xp.dtsifile 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
Quoted 5 lines
This patch marks Armada internal RTC as disabled in individual .dts files of those devices.
Reported-by TuxOholic <[email protected]>Signed-off-by Arnaud Ebalard <[email protected]>
Applied on mvebu/dt with Andrew's acked-by
Thanks,
Gregory
Quoted 61 lines
--- 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(+)arch/arm/boot/dts/armada-370-netgear-rn102.dts +6
-0@@ -82,6 +82,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc at 10300 { + status = "disabled"; + }; + serial at 12000 { status = "okay"; };arch/arm/boot/dts/armada-370-netgear-rn104.dts +6
-0@@ -82,6 +82,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc at 10300 { + status = "disabled"; + }; + serial at 12000 { status = "okay"; };arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +6
-0@@ -88,6 +88,12 @@ }; internal-regs { + + /* RTC is provided by Intersil ISL12057 I2C RTC chip */ + rtc at 10300 { + status = "disabled"; + }; + /* Two rear eSATA ports */ sata at a0000 { nr-ports = <2>;Signature · 1 line
2.5.3
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file
In reply to Andrew LunnHi Andrew,
Quoted 8 lines · Andrew Lunn
Quoted 3 lines · Arnaud Ebalard
This cosmetic patch reorder nodes under internal-regs by increasing address order, as epxected.
expected.
Gregory, can you fix that as you commit?
Done!
Quoted 123 lines
Acked-by Andrew Lunn <[email protected]>Andrew
Quoted 118 lines
Signed-off-by Arnaud Ebalard <[email protected]>--- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 +++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-)arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +43
-43@@ -94,54 +94,11 @@ status = "disabled"; }; - /* Two rear eSATA ports */ - sata at a0000 { - nr-ports = <2>; - status = "okay"; - }; - - serial at 12000 { - status = "okay"; - }; - - mdio { - phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ - reg = <0>; - }; - - phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ - reg = <1>; - }; - }; - - ethernet at 70000 { - status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; - }; - - ethernet at 74000 { - status = "okay"; - phy = <&phy1>; - phy-mode = "rgmii-id"; - }; - - /* Front USB 2.0 port */ - usb at 50000 { - status = "okay"; - }; - i2c at 11000 { compatible = "marvell,mv64xxx-i2c"; clock-frequency = <400000>; status = "okay"; - isl12057: isl12057 at 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 at 3e {@@ -178,6 +135,49 @@ compatible = "gmt,g751"; reg = <0x4c>; }; + + isl12057: isl12057 at 68 { + compatible = "isil,isl12057"; + reg = <0x68>; + isil,irq2-can-wakeup-machine; + }; + }; + + serial at 12000 { + status = "okay"; + }; + + /* Front USB 2.0 port */ + usb at 50000 { + status = "okay"; + }; + + mdio { + phy0: ethernet-phy at 0 { /* Marvell 88E1318 */ + reg = <0>; + }; + + phy1: ethernet-phy at 1 { /* Marvell 88E1318 */ + reg = <1>; + }; + }; + + ethernet at 70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; + + ethernet at 74000 { + status = "okay"; + phy = <&phy1>; + phy-mode = "rgmii-id"; + }; + + /* Two rear eSATA ports */ + sata at a0000 { + nr-ports = <2>; + status = "okay"; }; nand at d0000 {Signature · 1 line
2.5.3
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com