diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2012-11-21 14:19:38 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-17 04:49:41 -0500 |
commit | 3e24b05ba3be5281c3fbf0b126953f5810f9d8ab (patch) | |
tree | 4ea3b76918e920a6ab1c379eac8a9442e81f184b /arch/arm/boot | |
parent | a4f1de176614f634c367e5994a7bcc428c940df0 (diff) |
ARM: dts: mx27: Fix the AIPI bus for FEC
FEC controller is connected to AIPI2 bus.
Also fix the AIPI1 address range.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/imx27-3ds.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx27-phytec-phycore.dts | 13 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx27.dtsi | 11 |
3 files changed, 21 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx27-3ds.dts b/arch/arm/boot/dts/imx27-3ds.dts index b01c0d745fc5..fa04c7b18bcb 100644 --- a/arch/arm/boot/dts/imx27-3ds.dts +++ b/arch/arm/boot/dts/imx27-3ds.dts | |||
@@ -21,17 +21,17 @@ | |||
21 | }; | 21 | }; |
22 | 22 | ||
23 | soc { | 23 | soc { |
24 | aipi@10000000 { /* aipi */ | 24 | aipi@10000000 { /* aipi1 */ |
25 | |||
26 | uart1: serial@1000a000 { | 25 | uart1: serial@1000a000 { |
27 | fsl,uart-has-rtscts; | 26 | fsl,uart-has-rtscts; |
28 | status = "okay"; | 27 | status = "okay"; |
29 | }; | 28 | }; |
29 | }; | ||
30 | 30 | ||
31 | fec@1002b000 { | 31 | aipi@10020000 { /* aipi2 */ |
32 | ethernet@1002b000 { | ||
32 | status = "okay"; | 33 | status = "okay"; |
33 | }; | 34 | }; |
34 | }; | 35 | }; |
35 | }; | 36 | }; |
36 | |||
37 | }; | 37 | }; |
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore.dts b/arch/arm/boot/dts/imx27-phytec-phycore.dts index af50469e34b2..53b0ec0c228e 100644 --- a/arch/arm/boot/dts/imx27-phytec-phycore.dts +++ b/arch/arm/boot/dts/imx27-phytec-phycore.dts | |||
@@ -21,8 +21,7 @@ | |||
21 | }; | 21 | }; |
22 | 22 | ||
23 | soc { | 23 | soc { |
24 | aipi@10000000 { /* aipi */ | 24 | aipi@10000000 { /* aipi1 */ |
25 | |||
26 | serial@1000a000 { | 25 | serial@1000a000 { |
27 | fsl,uart-has-rtscts; | 26 | fsl,uart-has-rtscts; |
28 | status = "okay"; | 27 | status = "okay"; |
@@ -38,10 +37,6 @@ | |||
38 | status = "okay"; | 37 | status = "okay"; |
39 | }; | 38 | }; |
40 | 39 | ||
41 | ethernet@1002b000 { | ||
42 | status = "okay"; | ||
43 | }; | ||
44 | |||
45 | i2c@1001d000 { | 40 | i2c@1001d000 { |
46 | clock-frequency = <400000>; | 41 | clock-frequency = <400000>; |
47 | status = "okay"; | 42 | status = "okay"; |
@@ -60,6 +55,12 @@ | |||
60 | }; | 55 | }; |
61 | }; | 56 | }; |
62 | }; | 57 | }; |
58 | |||
59 | aipi@10020000 { /* aipi2 */ | ||
60 | ethernet@1002b000 { | ||
61 | status = "okay"; | ||
62 | }; | ||
63 | }; | ||
63 | }; | 64 | }; |
64 | 65 | ||
65 | nor_flash@c0000000 { | 66 | nor_flash@c0000000 { |
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi index b8d3905915ac..5a82cb5707a8 100644 --- a/arch/arm/boot/dts/imx27.dtsi +++ b/arch/arm/boot/dts/imx27.dtsi | |||
@@ -55,7 +55,7 @@ | |||
55 | compatible = "fsl,aipi-bus", "simple-bus"; | 55 | compatible = "fsl,aipi-bus", "simple-bus"; |
56 | #address-cells = <1>; | 56 | #address-cells = <1>; |
57 | #size-cells = <1>; | 57 | #size-cells = <1>; |
58 | reg = <0x10000000 0x10000000>; | 58 | reg = <0x10000000 0x20000>; |
59 | ranges; | 59 | ranges; |
60 | 60 | ||
61 | wdog: wdog@10002000 { | 61 | wdog: wdog@10002000 { |
@@ -211,6 +211,15 @@ | |||
211 | status = "disabled"; | 211 | status = "disabled"; |
212 | }; | 212 | }; |
213 | 213 | ||
214 | }; | ||
215 | |||
216 | aipi@10020000 { /* AIPI2 */ | ||
217 | compatible = "fsl,aipi-bus", "simple-bus"; | ||
218 | #address-cells = <1>; | ||
219 | #size-cells = <1>; | ||
220 | reg = <0x10020000 0x20000>; | ||
221 | ranges; | ||
222 | |||
214 | fec: ethernet@1002b000 { | 223 | fec: ethernet@1002b000 { |
215 | compatible = "fsl,imx27-fec"; | 224 | compatible = "fsl,imx27-fec"; |
216 | reg = <0x1002b000 0x4000>; | 225 | reg = <0x1002b000 0x4000>; |