7 files changed, 7 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 685916e3d8a1..85cd8be22f71 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -31,11 +31,11 @@
                 };
         };
 
-        avic: avic-interrupt-controller@60000000 {
+        avic: interrupt-controller@68000000 {
                 compatible = "fsl,imx31-avic", "fsl,avic";
                 interrupt-controller;
                 #interrupt-cells = <1>;
-                reg = <0x60000000 0x100000>;
+                reg = <0x68000000 0x100000>;
         };
 
         soc {
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index e476d01959ea..26d060484728 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -533,7 +533,6 @@
                                 MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x17071
                                 MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x17071
                                 MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x17071
-                                MX6QDL_PAD_NANDF_CS2__GPIO6_IO15        0x000b0
                         >;
                 };
 
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 53e6e63cbb02..89b834f3fa17 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1100,6 +1100,7 @@
                                 interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6QDL_CLK_EIM_SLOW>;
                                 fsl,weim-cs-gpr = <&gpr>;
+                                status = "disabled";
                         };
 
                         ocotp: ocotp@021bc000 {
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 4fd6de29f07d..19cbd879c448 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -900,6 +900,7 @@
                                 reg = <0x021b8000 0x4000>;
                                 interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
                                 fsl,weim-cs-gpr = <&gpr>;
+                                status = "disabled";
                         };
 
                         ocotp: ocotp@021bc000 {
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 076a30f9bcae..10f333016197 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -977,6 +977,7 @@
                                 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6SX_CLK_EIM_SLOW>;
                                 fsl,weim-cs-gpr = <&gpr>;
+                                status = "disabled";
                         };
 
                         ocotp: ocotp@021bc000 {
diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
index 7ea617e47fe4..958b4c42d320 100644
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
@@ -153,7 +153,8 @@
                                         switch0phy1: switch1phy0@1 {
                                                 reg = <1>;
                                                 interrupt-parent = <&switch0>;
-                                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;                                   };
+                                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
+                                        };
                                         switch0phy2: switch1phy0@2 {
                                                 reg = <2>;
                                                 interrupt-parent = <&switch0>;
diff --git a/arch/arm/mach-imx/mach-imx1.c b/arch/arm/mach-imx/mach-imx1.c
index de5ab8d88549..3a8406e45b65 100644
--- a/arch/arm/mach-imx/mach-imx1.c
+++ b/arch/arm/mach-imx/mach-imx1.c
@@ -37,7 +37,6 @@ static const char * const imx1_dt_board_compat[] __initconst = {
 };
 
 DT_MACHINE_START(IMX1_DT, "Freescale i.MX1 (Device Tree Support)")
-        .map_io         = debug_ll_io_init,
         .init_early     = imx1_init_early,
         .init_irq       = imx1_init_irq,
         .dt_compat      = imx1_dt_board_compat,