From: dinguyen@altera.com (dinguyen at altera.com)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv4 1/6] ARM: socfpga: dts: Add ethernet bindings for SOCFPGA
Date: Fri, 24 May 2013 10:41:15 -0500 [thread overview]
Message-ID: <1369410080-436-1-git-send-email-dinguyen@altera.com> (raw)
From: Dinh Nguyen <dinguyen@altera.com>
Add entry for 2nd GMAC controller. Add the correct clocks for the GMAC.
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Olof Johansson <olof@lixom.net>
Cc: Pavel Machek <pavel@denx.de>
CC: <linux@arm.linux.org.uk>
v2:
- Moved "disabled" status to dtsi file
---
arch/arm/boot/dts/socfpga.dtsi | 18 ++++++++++++++++--
arch/arm/boot/dts/socfpga_cyclone5.dts | 13 +++++++++++++
arch/arm/boot/dts/socfpga_vt.dts | 5 +++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 16a6e13..02bb425 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -23,6 +23,7 @@
aliases {
ethernet0 = &gmac0;
+ ethernet1 = &gmac1;
serial0 = &uart0;
serial1 = &uart1;
timer0 = &timer0;
@@ -238,13 +239,26 @@
};
};
- gmac0: stmmac at ff700000 {
+ gmac0: ethernet at ff700000 {
compatible = "altr,socfpga-stmmac", "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 */
- phy-mode = "gmii";
+ clocks = <&emac0_clk>;
+ clock-names = "stmmaceth";
+ status = "disabled";
+ };
+
+ gmac1: ethernet at ff702000 {
+ compatible = "altr,socfpga-stmmac", "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";
+ status = "disabled";
};
L2: l2-cache at fffef000 {
diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dts b/arch/arm/boot/dts/socfpga_cyclone5.dts
index 2495958..973999d 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5.dts
@@ -32,6 +32,13 @@
reg = <0x0 0x40000000>; /* 1GB */
};
+ aliases {
+ /* this allow the ethaddr uboot environmnet variable contents
+ * to be added to the gmac1 device tree blob.
+ */
+ ethernet0 = &gmac1;
+ };
+
soc {
clkmgr at ffd04000 {
clocks {
@@ -41,6 +48,12 @@
};
};
+ ethernet at ff702000 {
+ phy-mode = "rgmii";
+ phy-addr = <0xffffffff>; /* probe for phy addr */
+ status = "okay";
+ };
+
timer0 at ffc08000 {
clock-frequency = <100000000>;
};
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
index 0bf035d..d1ec0ca 100644
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -41,6 +41,11 @@
};
};
+ ethernet at ff700000 {
+ phy-mode = "gmii";
+ status = "okay";
+ };
+
timer0 at ffc08000 {
clock-frequency = <7000000>;
};
--
1.7.9.5
next reply other threads:[~2013-05-24 15:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-24 15:41 dinguyen at altera.com [this message]
2013-05-24 15:41 ` [PATCHv4 2/6] ARM: socfpga: dts: Add gate-clock bindings dinguyen at altera.com
2013-05-24 15:41 ` [PATCHv4 3/6] ARM: socfpga: Add support to gate peripheral clocks dinguyen at altera.com
2013-05-30 19:42 ` Mike Turquette
2013-05-30 21:33 ` Dinh Nguyen
2013-05-24 15:41 ` [PATCHv4 4/6] ARM: socfpga: Add syscon to be part of socfpga dinguyen at altera.com
2013-05-24 15:41 ` [PATCHv4 5/6] ARM: socfpga: dts: Add support for SD/MMC dinguyen at altera.com
2013-05-24 15:41 ` [PATCHv4 6/6] mmc: dw_mmc: Add support DW SD/MMC driver on SOCFPGA dinguyen at altera.com
2013-05-24 17:10 ` Arnd Bergmann
2013-05-24 17:12 ` Arnd Bergmann
2013-05-24 18:03 ` Dinh Nguyen
2013-05-24 18:58 ` Arnd Bergmann
2013-05-26 18:11 ` Pavel Machek
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=1369410080-436-1-git-send-email-dinguyen@altera.com \
--to=dinguyen@altera.com \
--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).