From: <dinguyen@altera.com>
To: dinh.linux@gmail.com, arnd@arndb.de, davem@davemloft.net,
peppe.cavallaro@st.com
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
pawel.moll@arm.com, srinivas.kandagatla@st.com,
netdev@vger.kernel.org, ijc+devicetree@hellion.org.uk,
robh+dt@kernel.org, arm@kernel.org,
Dinh Nguyen <dinguyen@altera.com>,
galak@codeaurora.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] dts: socfpga: Fix ethernet entries for the stmmac
Date: Tue, 25 Mar 2014 18:34:41 -0500 [thread overview]
Message-ID: <1395790482-3957-3-git-send-email-dinguyen@altera.com> (raw)
In-Reply-To: <1395790482-3957-1-git-send-email-dinguyen@altera.com>
From: Dinh Nguyen <dinguyen@altera.com>
* Replaced the parent/child DT nodes with a combined node
* Renamed the device node from 'ethernet0' to 'ethernet'
as the standard name.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
---
arch/arm/boot/dts/socfpga.dtsi | 51 +++++++++----------------
arch/arm/boot/dts/socfpga_arria5_socdk.dts | 5 +--
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 5 +--
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 5 +--
arch/arm/boot/dts/socfpga_vt.dts | 5 +--
5 files changed, 22 insertions(+), 49 deletions(-)
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 404553c..953801c 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -450,43 +450,28 @@
};
};
- ethernet0: ethernet0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "altr,socfpga-stmmac";
- altr,sysmgr-syscon = <&sysmgr 0x60>;
+ gmac0: ethernet@ff700000 {
+ compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
status = "disabled";
- ranges;
-
- gmac0: gmac0@ff700000 {
- compatible = "snps,dwmac-3.70a", "snps,dwmac";
- reg = <0xff700000 0x2000>;
- interrupts = <0 115 4>;
- interrupt-names = "macirq";
- mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
- clocks = <&emac0_clk>;
- clock-names = "stmmaceth";
- };
+ altr,sysmgr-syscon = <&sysmgr 0x60>;
+ reg = <0xff700000 0x2000>;
+ interrupts = <0 115 4>;
+ interrupt-names = "macirq";
+ mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
+ clocks = <&emac0_clk>;
+ clock-names = "stmmaceth";
};
- ethernet1: ethernet1 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "altr,socfpga-stmmac";
- altr,sysmgr-syscon = <&sysmgr 0x60>;
+ gmac1: ethernet@ff702000 {
+ compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
status = "disabled";
- ranges;
-
- gmac1: gmac1@ff702000 {
- device_type = "network";
- compatible = "snps,dwmac-3.70a", "snps,dwmac";
- reg = <0xff702000 0x2000>;
- interrupts = <0 120 4>;
- interrupt-names = "macirq";
- mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
- clocks = <&emac1_clk>;
- clock-names = "stmmaceth";
- };
+ altr,sysmgr-syscon = <&sysmgr 0x60>;
+ reg = <0xff702000 0x2000>;
+ interrupts = <0 120 4>;
+ interrupt-names = "macirq";
+ mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
+ clocks = <&emac1_clk>;
+ clock-names = "stmmaceth";
};
L2: l2-cache@fffef000 {
diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
index 2d6b38b..a87ee1c 100644
--- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts
+++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
@@ -46,11 +46,8 @@
};
};
-ðernet1 {
- status = "okay";
-};
-
&gmac1 {
+ status = "okay";
phy-mode = "rgmii";
rxd0-skew-ps = <0>;
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
index 26c63a0..ae16d97 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
@@ -39,11 +39,8 @@
};
};
-ðernet1 {
- status = "okay";
-};
-
&gmac1 {
+ status = "okay";
phy-mode = "rgmii";
rxd0-skew-ps = <0>;
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
index 469bb5c..b79e2a2 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
@@ -39,11 +39,8 @@
};
};
-ðernet1 {
- status = "okay";
-};
-
&gmac1 {
+ status = "okay";
phy-mode = "rgmii";
rxd0-skew-ps = <0>;
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
index 91f6ccf..87d6f75 100644
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -87,10 +87,7 @@
};
};
-ðernet0 {
- status = "okay";
-};
-
&gmac0 {
+ status = "okay";
phy-mode = "gmii";
};
--
1.7.9.5
next prev parent reply other threads:[~2014-03-25 23:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-25 23:34 [PATCH 0/3] Fix stmmac-socfpga allmodconfig breakage in arm-soc dinguyen-EIB2kfCEclfQT0dZR+AlfA
[not found] ` <1395790482-3957-1-git-send-email-dinguyen-EIB2kfCEclfQT0dZR+AlfA@public.gmane.org>
2014-03-25 23:34 ` [PATCH 1/3] net: stmmac: improve binding and fix build dinguyen-EIB2kfCEclfQT0dZR+AlfA
2014-03-25 23:34 ` dinguyen [this message]
2014-03-26 22:12 ` [PATCH 2/3] dts: socfpga: Fix ethernet entries for the stmmac Gerhard Sittig
2014-03-27 0:05 ` Dinh Nguyen
2014-03-25 23:34 ` [PATCH 3/3] dts: documentation: Update documentation for the stmmac ethernet controller dinguyen
2014-03-26 21:54 ` [PATCH 0/3] Fix stmmac-socfpga allmodconfig breakage in arm-soc Arnd Bergmann
2014-03-27 0:05 ` Dinh Nguyen
[not found] ` <53336B39.3080209-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2014-03-27 0:29 ` Arnd Bergmann
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=1395790482-3957-3-git-send-email-dinguyen@altera.com \
--to=dinguyen@altera.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dinh.linux@gmail.com \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=pawel.moll@arm.com \
--cc=peppe.cavallaro@st.com \
--cc=robh+dt@kernel.org \
--cc=srinivas.kandagatla@st.com \
/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).