arm: mvebu: non-critical fixes for NETGEAR ReadyNAS 102
cover arm: mvebu: non-critical fixes for NETGEAR ReadyNAS 102
Hi,
This two patches are non-critical and respectively fix the following in RN102 .dts file:
- the color for LEDs labels (they are blue, and not green)
- eSATA/SATA ports info
Arnaud Ebalard (2):
arm: mvebu: fix LED color in NETGEAR ReadyNAS 102 .dts file
arm: mvebu: clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts file
arch/arm/boot/dts/armada-370-netgear-rn102.dts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
Signature · 1 line
2.1.1
PATCH 1/2 arm: mvebu: fix LED color in NETGEAR ReadyNAS 102 .dts file
When writing initial .dts file for NETGEAR ReadyNAS 102, I put the wrong color for backup and SATA leds (green instead of blue for all three).
--- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/armada-370-netgear-rn102.dts +6 -6
@@ -204,20 +204,20 @@ default-state = "keep"; }; - green-sata1-led { - label = "rn102:green:sata1"; + blue-sata1-led { + label = "rn102:blue:sata1"; gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; default-state = "on"; }; - green-sata2-led { - label = "rn102:green:sata2"; + blue-sata2-led { + label = "rn102:blue:sata2"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; - green-backup-led { - label = "rn102:green:backup"; + blue-backup-led { + label = "rn102:blue:backup"; gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; default-state = "on"; };
Signature · 1 line
2.1.1
PATCH 1/2 arm: mvebu: fix LED color in NETGEAR ReadyNAS 102 .dts file
Quoted 6 lines · Arnaud Ebalard
When writing initial .dts file for NETGEAR ReadyNAS 102, I put the wrong color for backup and SATA leds (green instead of blue for all three).
Reported-by Johan Kristell <[email protected]>Signed-off-by Arnaud Ebalard <[email protected]>
Andrew
Quoted 39 lines
--- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)arch/arm/boot/dts/armada-370-netgear-rn102.dts +6
-6@@ -204,20 +204,20 @@ default-state = "keep"; }; - green-sata1-led { - label = "rn102:green:sata1"; + blue-sata1-led { + label = "rn102:blue:sata1"; gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; default-state = "on"; }; - green-sata2-led { - label = "rn102:green:sata2"; + blue-sata2-led { + label = "rn102:blue:sata2"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; default-state = "on"; }; - green-backup-led { - label = "rn102:green:backup"; + blue-backup-led { + label = "rn102:blue:backup"; gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; default-state = "on"; };Signature · 1 line
2.1.1
PATCH 2/2 arm: mvebu: clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts file
In reply to Arnaud EbalardOn NETGEAR ReadyNAS 102, the two disks are connected to the external Marvell 88SE9170 SATA Controller connected to the PCIe bus. The rear eSATA port is connected to the native Armada 370 SATA controller.
This patch updates the comments in .dts file wrt SATA interfaces and reduces the number of ports for native Armada 370 interface from 1 to 2.
--- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/boot/dts/armada-370-netgear-rn102.dts +3 -2
@@ -35,7 +35,7 @@ pcie-controller { status = "okay"; - /* Connected to Marvell SATA controller */ + /* Connected to Marvell 88SE9170 SATA controller */ pcie at 1,0 { /* Port 0, Lane 0 */ status = "okay";
@@ -53,8 +53,9 @@ status = "okay"; }; + /* eSATA interface */ sata at a0000 { - nr-ports = <2>; + nr-ports = <1>; status = "okay"; };
Signature · 1 line
2.1.1
PATCH 2/2 arm: mvebu: clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts file
Quoted 8 lines · Arnaud Ebalard
On NETGEAR ReadyNAS 102, the two disks are connected to the external Marvell 88SE9170 SATA Controller connected to the PCIe bus. The rear eSATA port is connected to the native Armada 370 SATA controller.
This patch updates the comments in .dts file wrt SATA interfaces and reduces the number of ports for native Armada 370 interface from 1 to 2.
Typ0.
Jason, can you swap the 1 and 2 around when you commit? Save having a v2.
Otherwise
Andrew
Quoted 33 lines
Signed-off-by Arnaud Ebalard <[email protected]>--- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/arm/boot/dts/armada-370-netgear-rn102.dts +3
-2@@ -35,7 +35,7 @@ pcie-controller { status = "okay"; - /* Connected to Marvell SATA controller */ + /* Connected to Marvell 88SE9170 SATA controller */ pcie at 1,0 { /* Port 0, Lane 0 */ status = "okay";@@ -53,8 +53,9 @@ status = "okay"; }; + /* eSATA interface */ sata at a0000 { - nr-ports = <2>; + nr-ports = <1>; status = "okay"; };Signature · 1 line
2.1.1
PATCH 2/2 arm: mvebu: clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts file
Quoted 10 lines · Andrew Lunn
Quoted 8 lines · Arnaud Ebalard
On NETGEAR ReadyNAS 102, the two disks are connected to the external Marvell 88SE9170 SATA Controller connected to the PCIe bus. The rear eSATA port is connected to the native Armada 370 SATA controller.
This patch updates the comments in .dts file wrt SATA interfaces and reduces the number of ports for native Armada 370 interface from 1 to 2.
Quoted 8 lines
Typ0.
Jason, can you swap the 1 and 2 around when you commit? Save having a v2.
Otherwise
Acked-by Andrew Lunn <[email protected]>
Good catch. Thanks, Andrew.
Cheers,
a+
cover arm: mvebu: non-critical fixes for NETGEAR ReadyNAS 102
In reply to Arnaud EbalardHi Arnaud,
Quoted 7 lines · Arnaud Ebalard
Hi,
This two patches are non-critical and respectively fix the following in RN102 .dts file:
- the color for LEDs labels (they are blue, and not green)
- eSATA/SATA ports info
Quoted 7 lines
Arnaud Ebalard (2):
arm: mvebu: fix LED color in NETGEAR ReadyNAS 102 .dts file
arm: mvebu: clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts filearch/arm/boot/dts/armada-370-netgear-rn102.dts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
For both patches:
Thanks,
Gregory
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
cover arm: mvebu: non-critical fixes for NETGEAR ReadyNAS 102
In reply to Arnaud EbalardQuoted 7 lines · Arnaud Ebalard
Hi,
This two patches are non-critical and respectively fix the following in RN102 .dts file:
- the color for LEDs labels (they are blue, and not green)
- eSATA/SATA ports info
Quoted 6 lines
Arnaud Ebalard (2):
arm: mvebu: fix LED color in NETGEAR ReadyNAS 102 .dts file
arm: mvebu: clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts filearch/arm/boot/dts/armada-370-netgear-rn102.dts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
Both applied to mvebu/dt with Gregory and Andrew's Acks. Also fixed the commit typo in the second patch.
thx,
Jason.