From: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Russell King <linux@armlinux.org.uk>
Cc: Fabrizio Castro <fabrizio.castro@bp.renesas.com>,
Simon Horman <horms@verge.net.au>,
Magnus Damm <magnus.damm@gmail.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-renesas-soc@vger.kernel.org,
Chris Paterson <Chris.Paterson2@renesas.com>,
Biju Das <biju.das@bp.renesas.com>,
Chris Paterson <chris.paterson2@renesas.com>
Subject: [PATCH v2 4/9] ARM: dts: iwg22d-sodimm: sort dt nodes
Date: Mon, 23 Oct 2017 18:09:25 +0100 [thread overview]
Message-ID: <1508778570-28795-5-git-send-email-fabrizio.castro@bp.renesas.com> (raw)
In-Reply-To: <1508778570-28795-1-git-send-email-fabrizio.castro@bp.renesas.com>
Improve the layout of r8a7745-iwg22d-sodimm.dts by sorting the
nodes alphabetically.
Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
Changes in v2:
* rebased
arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 62 ++++++++++++++---------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
index 82587d7..3eb4f83 100644
--- a/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
+++ b/arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts
@@ -16,9 +16,9 @@
compatible = "iwave,g22d", "iwave,g22m", "renesas,r8a7745";
aliases {
+ ethernet0 = &avb;
serial3 = &scif4;
serial5 = &hscif1;
- ethernet0 = &avb;
};
chosen {
@@ -40,6 +40,25 @@
};
};
+&avb {
+ pinctrl-0 = <&avb_pins>;
+ pinctrl-names = "default";
+
+ phy-handle = <&phy3>;
+ phy-mode = "gmii";
+ renesas,no-ether-link;
+ status = "okay";
+
+ phy3: ethernet-phy@3 {
+ /*
+ * On some older versions of the platform (before R4.0) the phy address
+ * may be 1 or 3. The address is fixed to 3 for R4.0 onwards.
+ */
+ reg = <3>;
+ micrel,led-mode = <1>;
+ };
+};
+
&hscif1 {
pinctrl-0 = <&hscif1_pins>;
pinctrl-names = "default";
@@ -48,7 +67,18 @@
status = "okay";
};
+&pci1 {
+ status = "okay";
+ pinctrl-0 = <&usb1_pins>;
+ pinctrl-names = "default";
+};
+
&pfc {
+ avb_pins: avb {
+ groups = "avb_mdio", "avb_gmii";
+ function = "avb";
+ };
+
hscif1_pins: hscif1 {
groups = "hscif1_data", "hscif1_ctrl";
function = "hscif1";
@@ -59,11 +89,6 @@
function = "scif4";
};
- avb_pins: avb {
- groups = "avb_mdio", "avb_gmii";
- function = "avb";
- };
-
sdhi0_pins: sd0 {
groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0";
@@ -83,25 +108,6 @@
status = "okay";
};
-&avb {
- pinctrl-0 = <&avb_pins>;
- pinctrl-names = "default";
-
- phy-handle = <&phy3>;
- phy-mode = "gmii";
- renesas,no-ether-link;
- status = "okay";
-
- phy3: ethernet-phy@3 {
- /*
- * On some older versions of the platform (before R4.0) the phy address
- * may be 1 or 3. The address is fixed to 3 for R4.0 onwards.
- */
- reg = <3>;
- micrel,led-mode = <1>;
- };
-};
-
&sdhi0 {
pinctrl-0 = <&sdhi0_pins>;
pinctrl-names = "default";
@@ -112,12 +118,6 @@
status = "okay";
};
-&pci1 {
- status = "okay";
- pinctrl-0 = <&usb1_pins>;
- pinctrl-names = "default";
-};
-
&usbphy {
status = "okay";
};
--
2.7.4
next prev parent reply other threads:[~2017-10-23 17:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-23 17:09 [PATCH v2 0/9] r8a7745/iwg22d DT rework + serial + HS-USB + IIC Fabrizio Castro
[not found] ` <1508778570-28795-1-git-send-email-fabrizio.castro-kTT6dE0pTRh9uiUsa/gSgQ@public.gmane.org>
2017-10-23 17:09 ` [PATCH v2 1/9] ARM: dts: iwg22d: Use /dev/ttySC3 as debug console Fabrizio Castro
2017-10-23 17:09 ` [PATCH v2 2/9] ARM: dts: iwg22d: Add /dev/ttySC5 support Fabrizio Castro
2017-10-23 17:09 ` [PATCH v2 6/9] ARM: dts: r8a7745: Add USB-DMAC device nodes Fabrizio Castro
2017-10-23 17:09 ` [PATCH v2 7/9] ARM: dts: r8a7745: Enable DMA for HSUSB Fabrizio Castro
2017-10-23 17:09 ` [PATCH v2 9/9] ARM: dts: r8a7745: Add IIC cores to dtsi Fabrizio Castro
2017-10-23 17:09 ` [PATCH v2 3/9] ARM: dts: iwg22d-sodimm-dbhd-ca: Add device tree for HDMI DB Fabrizio Castro
2017-10-23 17:09 ` Fabrizio Castro [this message]
2017-10-23 17:09 ` [PATCH v2 5/9] ARM: dts: r8a7745: Add HS-USB device node Fabrizio Castro
2017-10-23 17:09 ` [PATCH v2 8/9] ARM: dts: iwg22d-sodimm: Enable HS-USB Fabrizio Castro
2017-10-29 15:12 ` [PATCH v2 0/9] r8a7745/iwg22d DT rework + serial + HS-USB + IIC Simon Horman
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=1508778570-28795-5-git-send-email-fabrizio.castro@bp.renesas.com \
--to=fabrizio.castro@bp.renesas.com \
--cc=Chris.Paterson2@renesas.com \
--cc=biju.das@bp.renesas.com \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=magnus.damm@gmail.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.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).