diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-16 09:32:28 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-16 09:32:28 -0500 |
commit | 06d123e0984424505eedd09981f1bafc3c38de78 (patch) | |
tree | 4aa75853378becf583d9514f068045056f45c367 /arch/arm/boot | |
parent | 4966eba037bd0841cdb458907f27b71d4dcfd5d4 (diff) | |
parent | 2839038bb1a72ed7ef3c39521e0ca981c9cb1534 (diff) |
Merge branch 'at91/macb' into next/drivers
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/at91sam9g20.dtsi | 7 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9g45.dtsi | 7 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9m10g45ek.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/usb_a9g20.dts | 5 |
4 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi index aeef04269cf8..07603b8c9503 100644 --- a/arch/arm/boot/dts/at91sam9g20.dtsi +++ b/arch/arm/boot/dts/at91sam9g20.dtsi | |||
@@ -114,6 +114,13 @@ | |||
114 | atmel,use-dma-tx; | 114 | atmel,use-dma-tx; |
115 | status = "disabled"; | 115 | status = "disabled"; |
116 | }; | 116 | }; |
117 | |||
118 | macb0: ethernet@fffc4000 { | ||
119 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | ||
120 | reg = <0xfffc4000 0x100>; | ||
121 | interrupts = <21>; | ||
122 | status = "disabled"; | ||
123 | }; | ||
117 | }; | 124 | }; |
118 | }; | 125 | }; |
119 | }; | 126 | }; |
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index db6a45202f26..fffa005300a4 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi | |||
@@ -101,6 +101,13 @@ | |||
101 | atmel,use-dma-tx; | 101 | atmel,use-dma-tx; |
102 | status = "disabled"; | 102 | status = "disabled"; |
103 | }; | 103 | }; |
104 | |||
105 | macb0: ethernet@fffbc000 { | ||
106 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | ||
107 | reg = <0xfffbc000 0x100>; | ||
108 | interrupts = <25>; | ||
109 | status = "disabled"; | ||
110 | }; | ||
104 | }; | 111 | }; |
105 | }; | 112 | }; |
106 | }; | 113 | }; |
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 85b34f59cd82..a387e7704ce1 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts | |||
@@ -30,6 +30,11 @@ | |||
30 | usart1: serial@fff90000 { | 30 | usart1: serial@fff90000 { |
31 | status = "okay"; | 31 | status = "okay"; |
32 | }; | 32 | }; |
33 | |||
34 | macb0: ethernet@fffbc000 { | ||
35 | phy-mode = "rmii"; | ||
36 | status = "okay"; | ||
37 | }; | ||
33 | }; | 38 | }; |
34 | }; | 39 | }; |
35 | }; | 40 | }; |
diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts index d66e2c00ac35..f04b535477f5 100644 --- a/arch/arm/boot/dts/usb_a9g20.dts +++ b/arch/arm/boot/dts/usb_a9g20.dts | |||
@@ -25,6 +25,11 @@ | |||
25 | dbgu: serial@fffff200 { | 25 | dbgu: serial@fffff200 { |
26 | status = "okay"; | 26 | status = "okay"; |
27 | }; | 27 | }; |
28 | |||
29 | macb0: ethernet@fffc4000 { | ||
30 | phy-mode = "rmii"; | ||
31 | status = "okay"; | ||
32 | }; | ||
28 | }; | 33 | }; |
29 | }; | 34 | }; |
30 | }; | 35 | }; |