diff options
author | Joachim Eastwood <manabian@gmail.com> | 2012-12-04 13:10:59 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-02-07 10:40:09 -0500 |
commit | ce3b2630fd4737a3f9aa9119d40647a9ac7baa38 (patch) | |
tree | 540a75f680dccc68f8165f4044a808a58fe070a7 | |
parent | 883a07f69cc7c6f40e5e57677f268267781d5b01 (diff) |
ARM: at91: add EMAC bindings to RM9200 DT
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/boot/dts/at91rm9200.dtsi | 38 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91rm9200ek.dts | 5 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 1 |
3 files changed, 44 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi index 6ff27bba6296..b0268a5f4b4e 100644 --- a/arch/arm/boot/dts/at91rm9200.dtsi +++ b/arch/arm/boot/dts/at91rm9200.dtsi | |||
@@ -127,6 +127,16 @@ | |||
127 | status = "disable"; | 127 | status = "disable"; |
128 | }; | 128 | }; |
129 | 129 | ||
130 | macb0: ethernet@fffbc000 { | ||
131 | compatible = "cdns,at91rm9200-emac", "cdns,emac"; | ||
132 | reg = <0xfffbc000 0x4000>; | ||
133 | interrupts = <24 4 3>; | ||
134 | phy-mode = "rmii"; | ||
135 | pinctrl-names = "default"; | ||
136 | pinctrl-0 = <&pinctrl_macb_rmii>; | ||
137 | status = "disabled"; | ||
138 | }; | ||
139 | |||
130 | pinctrl@fffff400 { | 140 | pinctrl@fffff400 { |
131 | #address-cells = <1>; | 141 | #address-cells = <1>; |
132 | #size-cells = <1>; | 142 | #size-cells = <1>; |
@@ -246,6 +256,34 @@ | |||
246 | }; | 256 | }; |
247 | }; | 257 | }; |
248 | 258 | ||
259 | macb { | ||
260 | pinctrl_macb_rmii: macb_rmii-0 { | ||
261 | atmel,pins = | ||
262 | <0 7 0x1 0x0 /* PA7 periph A */ | ||
263 | 0 8 0x1 0x0 /* PA8 periph A */ | ||
264 | 0 9 0x1 0x0 /* PA9 periph A */ | ||
265 | 0 10 0x1 0x0 /* PA10 periph A */ | ||
266 | 0 11 0x1 0x0 /* PA11 periph A */ | ||
267 | 0 12 0x1 0x0 /* PA12 periph A */ | ||
268 | 0 13 0x1 0x0 /* PA13 periph A */ | ||
269 | 0 14 0x1 0x0 /* PA14 periph A */ | ||
270 | 0 15 0x1 0x0 /* PA15 periph A */ | ||
271 | 0 16 0x1 0x0>; /* PA16 periph A */ | ||
272 | }; | ||
273 | |||
274 | pinctrl_macb_rmii_mii: macb_rmii_mii-0 { | ||
275 | atmel,pins = | ||
276 | <1 12 0x2 0x0 /* PB12 periph B */ | ||
277 | 1 13 0x2 0x0 /* PB13 periph B */ | ||
278 | 1 14 0x2 0x0 /* PB14 periph B */ | ||
279 | 1 15 0x2 0x0 /* PB15 periph B */ | ||
280 | 1 16 0x2 0x0 /* PB16 periph B */ | ||
281 | 1 17 0x2 0x0 /* PB17 periph B */ | ||
282 | 1 18 0x2 0x0 /* PB18 periph B */ | ||
283 | 1 19 0x2 0x0>; /* PB19 periph B */ | ||
284 | }; | ||
285 | }; | ||
286 | |||
249 | mmc0 { | 287 | mmc0 { |
250 | pinctrl_mmc0_clk: mmc0_clk-0 { | 288 | pinctrl_mmc0_clk: mmc0_clk-0 { |
251 | atmel,pins = | 289 | atmel,pins = |
diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts index 8aa48931e0a2..e586d85f8e23 100644 --- a/arch/arm/boot/dts/at91rm9200ek.dts +++ b/arch/arm/boot/dts/at91rm9200ek.dts | |||
@@ -44,6 +44,11 @@ | |||
44 | status = "okay"; | 44 | status = "okay"; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | macb0: ethernet@fffbc000 { | ||
48 | phy-mode = "rmii"; | ||
49 | status = "okay"; | ||
50 | }; | ||
51 | |||
47 | usb1: gadget@fffb0000 { | 52 | usb1: gadget@fffb0000 { |
48 | atmel,vbus-gpio = <&pioD 4 0>; | 53 | atmel,vbus-gpio = <&pioD 4 0>; |
49 | status = "okay"; | 54 | status = "okay"; |
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 9809f8546d7c..9706c000f294 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c | |||
@@ -211,6 +211,7 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
211 | CLKDEV_CON_DEV_ID("t1_clk", "fffa4000.timer", &tc4_clk), | 211 | CLKDEV_CON_DEV_ID("t1_clk", "fffa4000.timer", &tc4_clk), |
212 | CLKDEV_CON_DEV_ID("t2_clk", "fffa4000.timer", &tc5_clk), | 212 | CLKDEV_CON_DEV_ID("t2_clk", "fffa4000.timer", &tc5_clk), |
213 | CLKDEV_CON_DEV_ID("mci_clk", "fffb4000.mmc", &mmc_clk), | 213 | CLKDEV_CON_DEV_ID("mci_clk", "fffb4000.mmc", &mmc_clk), |
214 | CLKDEV_CON_DEV_ID("emac_clk", "fffbc000.ethernet", ðer_clk), | ||
214 | CLKDEV_CON_DEV_ID("hclk", "300000.ohci", &ohci_clk), | 215 | CLKDEV_CON_DEV_ID("hclk", "300000.ohci", &ohci_clk), |
215 | CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk), | 216 | CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk), |
216 | CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk), | 217 | CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk), |