From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file
Date: Mon, 12 Oct 2015 16:23:24 +0200 [thread overview]
Message-ID: <20151012142324.GB30801@lunn.ch> (raw)
In-Reply-To: <277de75473af2431849a7494ae65b57dbc9a8309.1444428035.git.arno@natisbad.org>
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 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 {
> --
> 2.5.3
>
next prev parent reply other threads:[~2015-10-12 14:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
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-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 [this message]
2015-10-12 16:32 ` Gregory CLEMENT
2015-10-12 16:27 ` Gregory CLEMENT
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151012142324.GB30801@lunn.ch \
--to=andrew@lunn.ch \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).