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

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 b01c0d745fc..fa04c7b18bc 100644
--- a/arch/arm/boot/dts/imx27-3ds.dts
+++ b/arch/arm/boot/dts/imx27-3ds.dts
@@ -21,17 +21,17 @@
         };
 
         soc {
-                aipi@10000000 { /* aipi */
-
+                aipi@10000000 { /* aipi1 */
                         uart1: serial@1000a000 {
                                 fsl,uart-has-rtscts;
                                 status = "okay";
                         };
+                };
 
-                        fec@1002b000 {
+                aipi@10020000 { /* aipi2 */
+                        ethernet@1002b000 {
                                 status = "okay";
                         };
                 };
         };
-
 };
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore.dts b/arch/arm/boot/dts/imx27-phytec-phycore.dts
index af50469e34b..53b0ec0c228 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 {
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index b8d3905915a..5a82cb5707a 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -55,7 +55,7 @@
                         compatible = "fsl,aipi-bus", "simple-bus";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        reg = <0x10000000 0x10000000>;
+                        reg = <0x10000000 0x20000>;
                         ranges;
 
                         wdog: wdog@10002000 {
@@ -211,6 +211,15 @@
                                 status = "disabled";
                         };
 
+                };
+
+                aipi@10020000 { /* AIPI2 */
+                        compatible = "fsl,aipi-bus", "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x10020000 0x20000>;
+                        ranges;
+
                         fec: ethernet@1002b000 {
                                 compatible = "fsl,imx27-fec";
                                 reg = <0x1002b000 0x4000>;