Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1243691 > unrolled thread
| Started by | Arnaud Ebalard <arno@natisbad.org> |
|---|---|
| First post | 2015-10-10 00:20 +0200 |
| Last post | 2015-10-12 18:30 +0200 |
| Articles | 8 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH 0/2] arm: mvebu: disable unused rtc + cosmetic patch for ReadyNAS devices Arnaud Ebalard <arno@natisbad.org> - 2015-10-10 00:20 +0200
[PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 Arnaud Ebalard <arno@natisbad.org> - 2015-10-10 00:30 +0200
Re: [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 Andrew Lunn <andrew@lunn.ch> - 2015-10-12 16:30 +0200
Re: [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 Gregory CLEMENT <gregory.clement@free-electrons.com> - 2015-10-12 18:40 +0200
[PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file Arnaud Ebalard <arno@natisbad.org> - 2015-10-10 00:30 +0200
Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file Andrew Lunn <andrew@lunn.ch> - 2015-10-12 16:30 +0200
Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file Gregory CLEMENT <gregory.clement@free-electrons.com> - 2015-10-12 18:40 +0200
Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file Gregory CLEMENT <gregory.clement@free-electrons.com> - 2015-10-12 18:30 +0200
| From | Arnaud Ebalard <arno@natisbad.org> |
|---|---|
| Date | 2015-10-10 00:20 +0200 |
| Subject | [PATCH 0/2] arm: mvebu: disable unused rtc + cosmetic patch for ReadyNAS devices |
| Message-ID | <qhOb8-6RX-5@gated-at.bofh.it> |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Arnaud Ebalard <arno@natisbad.org> |
|---|---|
| Date | 2015-10-10 00:30 +0200 |
| Subject | [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 |
| Message-ID | <qhOkO-73l-29@gated-at.bofh.it> |
| In reply to | #1243691 |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Andrew Lunn <andrew@lunn.ch> |
|---|---|
| Date | 2015-10-12 16:30 +0200 |
| Subject | Re: [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 |
| Message-ID | <qiMgX-1zC-37@gated-at.bofh.it> |
| In reply to | #1243710 |
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@hotmail.de>
> Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Acked-by: Andrew Lunn <andrew@lunn.ch>
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 linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Gregory CLEMENT <gregory.clement@free-electrons.com> |
|---|---|
| Date | 2015-10-12 18:40 +0200 |
| Subject | Re: [PATCH 1/2] arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120 |
| Message-ID | <qiOiK-4vG-33@gated-at.bofh.it> |
| In reply to | #1243710 |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Arnaud Ebalard <arno@natisbad.org> |
|---|---|
| Date | 2015-10-10 00:30 +0200 |
| Subject | [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file |
| Message-ID | <qhOkP-73l-53@gated-at.bofh.it> |
| In reply to | #1243691 |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Andrew Lunn <andrew@lunn.ch> |
|---|---|
| Date | 2015-10-12 16:30 +0200 |
| Subject | Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file |
| Message-ID | <qiMgW-1zC-23@gated-at.bofh.it> |
| In reply to | #1243719 |
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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Gregory CLEMENT <gregory.clement@free-electrons.com> |
|---|---|
| Date | 2015-10-12 18:40 +0200 |
| Subject | Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file |
| Message-ID | <qiOiJ-4vG-9@gated-at.bofh.it> |
| In reply to | #1244746 |
Hi Andrew,
On lun., oct. 12 2015, Andrew Lunn <andrew@lunn.ch> 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@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
>>
--
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 linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Gregory CLEMENT <gregory.clement@free-electrons.com> |
|---|---|
| Date | 2015-10-12 18:30 +0200 |
| Subject | Re: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file |
| Message-ID | <qiO94-4kn-5@gated-at.bofh.it> |
| In reply to | #1243719 |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web