diff options
author | Olof Johansson <olof@lixom.net> | 2012-12-17 18:40:51 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-12-17 18:40:51 -0800 |
commit | 1dc1d2e9485074d5f495beb7771a3ab20eb504e9 (patch) | |
tree | 96f5e6829816c21b6b6ad243ad26bde86abb12ed /arch/arm/boot/dts/imx27-phytec-phycore.dts | |
parent | a93178a13dbd35850ec8a86b023e1f8953e80dae (diff) | |
parent | 027c0a6af42efa4f2f6034421349bd26a3ca4923 (diff) |
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer:
ARM i.MX fixes for v3.8-rc
This fixes a compile failure on imx_v4_v5_defconfig and a regression
introduced with enabling the MIPI clocks on i.MX51. Also one rather
cosmetic fix for the i.MX27 dts file.
* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices
ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks
ARM: dts: mx27: Fix the AIPI bus for FEC
Diffstat (limited to 'arch/arm/boot/dts/imx27-phytec-phycore.dts')
-rw-r--r-- | arch/arm/boot/dts/imx27-phytec-phycore.dts | 13 |
1 files changed, 7 insertions, 6 deletions
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 @@ }; soc { - aipi@10000000 { /* aipi */ - + aipi@10000000 { /* aipi1 */ serial@1000a000 { fsl,uart-has-rtscts; status = "okay"; @@ -38,10 +37,6 @@ status = "okay"; }; - ethernet@1002b000 { - status = "okay"; - }; - i2c@1001d000 { clock-frequency = <400000>; status = "okay"; @@ -60,6 +55,12 @@ }; }; }; + + aipi@10020000 { /* aipi2 */ + ethernet@1002b000 { + status = "okay"; + }; + }; }; nor_flash@c0000000 { |