Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx53.dtsi

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 0777b41cdfe89d17299ffe42d504a3d0eda4fa7d..ca51dc03e327b3f89b3836ea8ba41d55359af58e 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -10,7 +10,6 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include "skeleton.dtsi"
 #include "imx53-pinfunc.h"
 #include <dt-bindings/clock/imx5-clock.h>
 #include <dt-bindings/gpio/gpio.h>
@@ -18,6 +17,9 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
        aliases {
                ethernet0 = &fec;
                gpio0 = &gpio1;
@@ -131,8 +133,8 @@
                        reg = <0x18000000 0x08000000>;
                        interrupts = <11 10>;
                        clocks = <&clks IMX5_CLK_IPU_GATE>,
-                                <&clks IMX5_CLK_IPU_DI0_GATE>,
-                                <&clks IMX5_CLK_IPU_DI1_GATE>;
+                                <&clks IMX5_CLK_IPU_DI0_GATE>,
+                                <&clks IMX5_CLK_IPU_DI1_GATE>;
                        clock-names = "bus", "di0", "di1";
                        resets = <&src 2>;
 
@@ -199,8 +201,8 @@
                                        reg = <0x50004000 0x4000>;
                                        interrupts = <1>;
                                        clocks = <&clks IMX5_CLK_ESDHC1_IPG_GATE>,
-                                                <&clks IMX5_CLK_DUMMY>,
-                                                <&clks IMX5_CLK_ESDHC1_PER_GATE>;
+                                                <&clks IMX5_CLK_DUMMY>,
+                                                <&clks IMX5_CLK_ESDHC1_PER_GATE>;
                                        clock-names = "ipg", "ahb", "per";
                                        bus-width = <4>;
                                        status = "disabled";
@@ -211,8 +213,8 @@
                                        reg = <0x50008000 0x4000>;
                                        interrupts = <2>;
                                        clocks = <&clks IMX5_CLK_ESDHC2_IPG_GATE>,
-                                                <&clks IMX5_CLK_DUMMY>,
-                                                <&clks IMX5_CLK_ESDHC2_PER_GATE>;
+                                                <&clks IMX5_CLK_DUMMY>,
+                                                <&clks IMX5_CLK_ESDHC2_PER_GATE>;
                                        clock-names = "ipg", "ahb", "per";
                                        bus-width = <4>;
                                        status = "disabled";
@@ -223,7 +225,7 @@
                                        reg = <0x5000c000 0x4000>;
                                        interrupts = <33>;
                                        clocks = <&clks IMX5_CLK_UART3_IPG_GATE>,
-                                                <&clks IMX5_CLK_UART3_PER_GATE>;
+                                                <&clks IMX5_CLK_UART3_PER_GATE>;
                                        clock-names = "ipg", "per";
                                        dmas = <&sdma 42 4 0>, <&sdma 43 4 0>;
                                        dma-names = "rx", "tx";
@@ -237,7 +239,7 @@
                                        reg = <0x50010000 0x4000>;
                                        interrupts = <36>;
                                        clocks = <&clks IMX5_CLK_ECSPI1_IPG_GATE>,
-                                                <&clks IMX5_CLK_ECSPI1_PER_GATE>;
+                                                <&clks IMX5_CLK_ECSPI1_PER_GATE>;
                                        clock-names = "ipg", "per";
                                        status = "disabled";
                                };
@@ -264,8 +266,8 @@
                                        reg = <0x50020000 0x4000>;
                                        interrupts = <3>;
                                        clocks = <&clks IMX5_CLK_ESDHC3_IPG_GATE>,
-                                                <&clks IMX5_CLK_DUMMY>,
-                                                <&clks IMX5_CLK_ESDHC3_PER_GATE>;
+                                                <&clks IMX5_CLK_DUMMY>,
+                                                <&clks IMX5_CLK_ESDHC3_PER_GATE>;
                                        clock-names = "ipg", "ahb", "per";
                                        bus-width = <4>;
                                        status = "disabled";
@@ -276,8 +278,8 @@
                                        reg = <0x50024000 0x4000>;
                                        interrupts = <4>;
                                        clocks = <&clks IMX5_CLK_ESDHC4_IPG_GATE>,
-                                                <&clks IMX5_CLK_DUMMY>,
-                                                <&clks IMX5_CLK_ESDHC4_PER_GATE>;
+                                                <&clks IMX5_CLK_DUMMY>,
+                                                <&clks IMX5_CLK_ESDHC4_PER_GATE>;
                                        clock-names = "ipg", "ahb", "per";
                                        bus-width = <4>;
                                        status = "disabled";
@@ -419,7 +421,7 @@
                                reg = <0x53fa0000 0x4000>;
                                interrupts = <39>;
                                clocks = <&clks IMX5_CLK_GPT_IPG_GATE>,
-                                        <&clks IMX5_CLK_GPT_HF_GATE>;
+                                        <&clks IMX5_CLK_GPT_HF_GATE>;
                                clock-names = "ipg", "per";
                        };
 
@@ -440,11 +442,11 @@
                                reg = <0x53fa8008 0x4>;
                                gpr = <&gpr>;
                                clocks = <&clks IMX5_CLK_LDB_DI0_SEL>,
-                                        <&clks IMX5_CLK_LDB_DI1_SEL>,
-                                        <&clks IMX5_CLK_IPU_DI0_SEL>,
-                                        <&clks IMX5_CLK_IPU_DI1_SEL>,
-                                        <&clks IMX5_CLK_LDB_DI0_GATE>,
-                                        <&clks IMX5_CLK_LDB_DI1_GATE>;
+                                        <&clks IMX5_CLK_LDB_DI1_SEL>,
+                                        <&clks IMX5_CLK_IPU_DI0_SEL>,
+                                        <&clks IMX5_CLK_IPU_DI1_SEL>,
+                                        <&clks IMX5_CLK_LDB_DI0_GATE>,
+                                        <&clks IMX5_CLK_LDB_DI1_GATE>;
                                clock-names = "di0_pll", "di1_pll",
                                              "di0_sel", "di1_sel",
                                              "di0", "di1";
@@ -486,7 +488,7 @@
                                compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
                                reg = <0x53fb4000 0x4000>;
                                clocks = <&clks IMX5_CLK_PWM1_IPG_GATE>,
-                                        <&clks IMX5_CLK_PWM1_HF_GATE>;
+                                        <&clks IMX5_CLK_PWM1_HF_GATE>;
                                clock-names = "ipg", "per";
                                interrupts = <61>;
                        };
@@ -496,7 +498,7 @@
                                compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
                                reg = <0x53fb8000 0x4000>;
                                clocks = <&clks IMX5_CLK_PWM2_IPG_GATE>,
-                                        <&clks IMX5_CLK_PWM2_HF_GATE>;
+                                        <&clks IMX5_CLK_PWM2_HF_GATE>;
                                clock-names = "ipg", "per";
                                interrupts = <94>;
                        };
@@ -506,7 +508,7 @@
                                reg = <0x53fbc000 0x4000>;
                                interrupts = <31>;
                                clocks = <&clks IMX5_CLK_UART1_IPG_GATE>,
-                                        <&clks IMX5_CLK_UART1_PER_GATE>;
+                                        <&clks IMX5_CLK_UART1_PER_GATE>;
                                clock-names = "ipg", "per";
                                dmas = <&sdma 18 4 0>, <&sdma 19 4 0>;
                                dma-names = "rx", "tx";
@@ -518,7 +520,7 @@
                                reg = <0x53fc0000 0x4000>;
                                interrupts = <32>;
                                clocks = <&clks IMX5_CLK_UART2_IPG_GATE>,
-                                        <&clks IMX5_CLK_UART2_PER_GATE>;
+                                        <&clks IMX5_CLK_UART2_PER_GATE>;
                                clock-names = "ipg", "per";
                                dmas = <&sdma 12 4 0>, <&sdma 13 4 0>;
                                dma-names = "rx", "tx";
@@ -530,7 +532,7 @@
                                reg = <0x53fc8000 0x4000>;
                                interrupts = <82>;
                                clocks = <&clks IMX5_CLK_CAN1_IPG_GATE>,
-                                        <&clks IMX5_CLK_CAN1_SERIAL_GATE>;
+                                        <&clks IMX5_CLK_CAN1_SERIAL_GATE>;
                                clock-names = "ipg", "per";
                                status = "disabled";
                        };
@@ -540,7 +542,7 @@
                                reg = <0x53fcc000 0x4000>;
                                interrupts = <83>;
                                clocks = <&clks IMX5_CLK_CAN2_IPG_GATE>,
-                                        <&clks IMX5_CLK_CAN2_SERIAL_GATE>;
+                                        <&clks IMX5_CLK_CAN2_SERIAL_GATE>;
                                clock-names = "ipg", "per";
                                status = "disabled";
                        };
@@ -603,7 +605,7 @@
                                reg = <0x53ff0000 0x4000>;
                                interrupts = <13>;
                                clocks = <&clks IMX5_CLK_UART4_IPG_GATE>,
-                                        <&clks IMX5_CLK_UART4_PER_GATE>;
+                                        <&clks IMX5_CLK_UART4_PER_GATE>;
                                clock-names = "ipg", "per";
                                dmas = <&sdma 2 4 0>, <&sdma 3 4 0>;
                                dma-names = "rx", "tx";
@@ -635,7 +637,7 @@
                                reg = <0x63f90000 0x4000>;
                                interrupts = <86>;
                                clocks = <&clks IMX5_CLK_UART5_IPG_GATE>,
-                                        <&clks IMX5_CLK_UART5_PER_GATE>;
+                                        <&clks IMX5_CLK_UART5_PER_GATE>;
                                clock-names = "ipg", "per";
                                dmas = <&sdma 16 4 0>, <&sdma 17 4 0>;
                                dma-names = "rx", "tx";
@@ -656,7 +658,7 @@
                                reg = <0x63fac000 0x4000>;
                                interrupts = <37>;
                                clocks = <&clks IMX5_CLK_ECSPI2_IPG_GATE>,
-                                        <&clks IMX5_CLK_ECSPI2_PER_GATE>;
+                                        <&clks IMX5_CLK_ECSPI2_PER_GATE>;
                                clock-names = "ipg", "per";
                                status = "disabled";
                        };
@@ -666,7 +668,7 @@
                                reg = <0x63fb0000 0x4000>;
                                interrupts = <6>;
                                clocks = <&clks IMX5_CLK_SDMA_GATE>,
-                                        <&clks IMX5_CLK_SDMA_GATE>;
+                                        <&clks IMX5_CLK_SDMA_GATE>;
                                clock-names = "ipg", "ahb";
                                #dma-cells = <3>;
                                fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";
@@ -679,7 +681,7 @@
                                reg = <0x63fc0000 0x4000>;
                                interrupts = <38>;
                                clocks = <&clks IMX5_CLK_CSPI_IPG_GATE>,
-                                        <&clks IMX5_CLK_CSPI_IPG_GATE>;
+                                        <&clks IMX5_CLK_CSPI_IPG_GATE>;
                                clock-names = "ipg", "per";
                                status = "disabled";
                        };
@@ -755,8 +757,8 @@
                                reg = <0x63fec000 0x4000>;
                                interrupts = <87>;
                                clocks = <&clks IMX5_CLK_FEC_GATE>,
-                                        <&clks IMX5_CLK_FEC_GATE>,
-                                        <&clks IMX5_CLK_FEC_GATE>;
+                                        <&clks IMX5_CLK_FEC_GATE>,
+                                        <&clks IMX5_CLK_FEC_GATE>;
                                clock-names = "ipg", "ahb", "ptp";
                                status = "disabled";
                        };
@@ -766,7 +768,7 @@
                                reg = <0x63ff0000 0x1000>;
                                interrupts = <92>;
                                clocks = <&clks IMX5_CLK_TVE_GATE>,
-                                        <&clks IMX5_CLK_IPU_DI1_SEL>;
+                                        <&clks IMX5_CLK_IPU_DI1_SEL>;
                                clock-names = "tve", "di_sel";
                                status = "disabled";
 
@@ -782,7 +784,7 @@
                                reg = <0x63ff4000 0x1000>;
                                interrupts = <9>;
                                clocks = <&clks IMX5_CLK_VPU_REFERENCE_GATE>,
-                                        <&clks IMX5_CLK_VPU_GATE>;
+                                        <&clks IMX5_CLK_VPU_GATE>;
                                clock-names = "per", "ahb";
                                resets = <&src 1>;
                                iram = <&ocram>;
@@ -793,7 +795,7 @@
                                reg = <0x63ff8000 0x4000>;
                                interrupts = <19 20>;
                                clocks = <&clks IMX5_CLK_SAHARA_IPG_GATE>,
-                                        <&clks IMX5_CLK_SAHARA_IPG_GATE>;
+                                        <&clks IMX5_CLK_SAHARA_IPG_GATE>;
                                clock-names = "ipg", "ahb";
                        };
                };