[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1ec7a786c94564a9b15a61239f41a2a3fba8578a.1323086095.git.nicolas.ferre@atmel.com>
Date: Mon, 5 Dec 2011 12:59:53 +0100
From: Nicolas Ferre <nicolas.ferre@...el.com>
To: robherring2@...il.com, devicetree-discuss@...ts.ozlabs.org,
netdev@...r.kernel.org, plagnioj@...osoft.com
Cc: linux-arm-kernel@...ts.infradead.org, grant.likely@...retlab.ca,
linux-kernel@...r.kernel.org, jamie@...ieiles.com,
Nicolas Ferre <nicolas.ferre@...el.com>
Subject: [PATCH v3 2/2] ARM: at91/net: add macb ethernet controller in 9g45 DT
Add the Cadence macb ethernet controller in at91sam9g45 .dtsi and
enable it in at91sam9m10g45ek board device tree file.
Signed-off-by: Nicolas Ferre <nicolas.ferre@...el.com>
---
v3: - form a thread with "macb DT support" patch
- remove "local-mac-address" from 9m10g45ek.dts file but use it in
documentation example.
Documentation/devicetree/bindings/net/macb.txt | 1 +
arch/arm/boot/dts/at91sam9g45.dtsi | 7 +++++++
arch/arm/boot/dts/at91sam9m10g45ek.dts | 5 +++++
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 2e24f05..44afa0e 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -21,4 +21,5 @@ Examples:
reg = <0xfffc4000 0x4000>;
interrupts = <21>;
phy-mode = "rmii";
+ local-mac-address = [3a 0e 03 04 05 06];
};
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index e89b1d7..67f94d3 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -101,6 +101,13 @@
atmel,use-dma-tx;
status = "disabled";
};
+
+ macb0: ethernet@...bc000 {
+ compatible = "cdns,at32ap7000-macb", "cdns,macb";
+ reg = <0xfffbc000 0x100>;
+ interrupts = <25 4>;
+ status = "disabled";
+ };
};
};
};
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 85b34f5..a387e77 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -30,6 +30,11 @@
usart1: serial@...90000 {
status = "okay";
};
+
+ macb0: ethernet@...bc000 {
+ phy-mode = "rmii";
+ status = "okay";
+ };
};
};
};
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists