Updated DT data to be in sync with 3.4 kernel
authorLothar Waßmann <LW@KARO-electronics.de>
Wed, 19 Dec 2012 11:59:03 +0000 (12:59 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 19 Dec 2012 11:59:03 +0000 (12:59 +0100)
arch/arm/dts/mx53.dtsi
board/karo/dts/tx53.dts

index f1948c2..7a85ced 100644 (file)
@@ -83,6 +83,8 @@
 
                        ipu@1e000000 {
                                compatible = "fsl,imx-ipuv3";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <0x1e000000 0x02000000>;
                                interrupts = <10 11>;
                                status = "disabled";
                                        status = "disabled";
                                };
 
-                               uart3: serial@5000c000 {
+                               uart3: uart@5000c000 {
                                        compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                        reg = <0x5000c000 0x4000>;
                                        interrupts = <33>;
                                };
 
                                ssi2: ssi@50014000 {
-                                       compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+                                       compatible = "fsl,imx-ssi";
                                        reg = <0x50014000 0x4000>;
                                        interrupts = <30>;
-                                       fsl,fifo-depth = <15>;
-                                       fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
                                        status = "disabled";
                                };
 
                                };
                        };
 
-                       usb@53f80000 {
-                               compatible = "fsl,imx53-usb", "fsl,imx27-usb";
-                               reg = <0x53f80000 0x0200>;
+                       imxotg@53f80000 {
+                               compatible = "fsl,imx-otg";
+                               reg = <0x53f80000 0x200>;
                                interrupts = <18>;
                                status = "disabled";
+
+                               phy-mode = "utmi-wide";
+                               host-device-name = "mxc-ehci";
+                               host-device-id = <0>;
+                               gadget-device-name = "fsl-usb2-udc";
                        };
 
-                       usb@53f80200 {
-                               compatible = "fsl,imx53-usb", "fsl,imx27-usb";
-                               reg = <0x53f80200 0x0200>;
+                       imxotg@53f80200 {
+                               compatible = "fsl,imx-otg";
+                               reg = <0x53f80200 0x200>;
                                interrupts = <14>;
                                status = "disabled";
+
+                               phy-mode = "utmi-wide";
+                               host-device-name = "mxc-ehci";
+                               host-device-id = <1>;
                        };
 
-                       usb@53f80400 {
-                               compatible = "fsl,imx53-usb", "fsl,imx27-usb";
-                               reg = <0x53f80400 0x0200>;
+                       mxc-ehci@53f80400 {
+                               compatible = "fsl,mxc-ehci";
+                               reg = <0x53f80400 0x200>;
                                interrupts = <16>;
                                status = "disabled";
                        };
 
-                       usb@53f80600 {
-                               compatible = "fsl,imx53-usb", "fsl,imx27-usb";
-                               reg = <0x53f80600 0x0200>;
+                       mxc-ehci@53f80600 {
+                               compatible = "fsl,mxc-ehci";
+                               reg = <0x53f80600 0x200>;
                                interrupts = <17>;
                                status = "disabled";
                        };
 
+                       imx-usb-phy@53f80800 {
+                               compatible = "fsl,imx53-usb-phy", "fsl,imx-usb-phy";
+                               reg = <0x53f80800 0x200>;
+                               status = "disabled";
+                       };
+
                        gpio1: gpio@53f84000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53f84000 0x4000>;
                                interrupts = <50 51>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <2>;
+                               #interrupt-cells = <1>;
                        };
 
                        gpio2: gpio@53f88000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53f88000 0x4000>;
                                interrupts = <52 53>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <2>;
+                               #interrupt-cells = <1>;
                        };
 
                        gpio3: gpio@53f8c000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53f8c000 0x4000>;
                                interrupts = <54 55>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <2>;
+                               #interrupt-cells = <1>;
                        };
 
                        gpio4: gpio@53f90000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53f90000 0x4000>;
                                interrupts = <56 57>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <2>;
+                               #interrupt-cells = <1>;
                        };
 
                        keypad@53f94000 {
                                status = "disabled";
                        };
 
-                       uart1: serial@53fbc000 {
+                       uart1: uart@53fbc000 {
                                compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                reg = <0x53fbc000 0x4000>;
                                interrupts = <31>;
                                status = "disabled";
                        };
 
-                       uart2: serial@53fc0000 {
+                       uart2: uart@53fc0000 {
                                compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                reg = <0x53fc0000 0x4000>;
                                interrupts = <32>;
                                status = "disabled";
                        };
 
-                       can1: can@53fc8000 {
-                               compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
+                       can1: flexcan@53fc8000 {
+                               compatible = "fsl,p1010-flexcan";
                                reg = <0x53fc8000 0x4000>;
                                interrupts = <82>;
                                status = "disabled";
                        };
 
-                       can2: can@53fcc000 {
-                               compatible = "fsl,imx53-flexcan", "fsl,p1010-flexcan";
+                       can2: flexcan@53fcc000 {
+                               compatible = "fsl,p1010-flexcan";
                                reg = <0x53fcc000 0x4000>;
                                interrupts = <83>;
                                status = "disabled";
                        };
 
                        gpio5: gpio@53fdc000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53fdc000 0x4000>;
                                interrupts = <103 104>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <2>;
+                               #interrupt-cells = <1>;
                        };
 
                        gpio6: gpio@53fe0000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53fe0000 0x4000>;
                                interrupts = <105 106>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <2>;
+                               #interrupt-cells = <1>;
                        };
 
                        gpio7: gpio@53fe4000 {
-                               compatible = "fsl,imx53-gpio", "fsl,imx35-gpio";
+                               compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53fe4000 0x4000>;
                                interrupts = <107 108>;
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupt-cells = <2>;
+                               #interrupt-cells = <1>;
                        };
 
                        i2c@53fec000 { /* I2C3 */
                                status = "disabled";
                        };
 
-                       uart4: serial@53ff0000 {
+                       uart4: uart@53ff0000 {
                                compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                reg = <0x53ff0000 0x4000>;
                                interrupts = <13>;
                        reg = <0x60000000 0x10000000>;
                        ranges;
 
-                       uart5: serial@63f90000 {
+                       uart5: uart@63f90000 {
                                compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                reg = <0x63f90000 0x4000>;
                                interrupts = <86>;
                        };
 
                        ssi1: ssi@63fcc000 {
-                               compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+                               compatible = "fsl,imx-ssi";
                                reg = <0x63fcc000 0x4000>;
                                interrupts = <29>;
-                               fsl,fifo-depth = <15>;
-                               fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
                                status = "disabled";
                        };
 
                        };
 
                        nand@63fdb000 {
-                               compatible = "fsl,imx53-nand";
-                               reg = <0x63fdb000 0x1000 0xf7ff0000 0x10000>;
+                               compatible = "fsl,imx53-nand", "mxc_nand";
+                               reg = <0xf7ff0000 0x10000>, <0x63fdb000 0x4000>;
                                interrupts = <8>;
                                status = "disabled";
                        };
 
                        ssi3: ssi@63fe8000 {
-                               compatible = "fsl,imx53-ssi", "fsl,imx21-ssi";
+                               compatible = "fsl,imx-ssi";
                                reg = <0x63fe8000 0x4000>;
                                interrupts = <96>;
-                               fsl,fifo-depth = <15>;
-                               fsl,ssi-dma-events = <47 46 45 44>; /* TX0 RX0 TX1 RX1 */
                                status = "disabled";
                        };
 
index 1ac3bfa..7c1381a 100644 (file)
@@ -24,9 +24,7 @@
        };
 
        aliases {
-               usbh1 = &usbh1;
-               usbotg = &usbotg;
-               usbphy = &usbphy;
+               ipu = &ipu;
        };
 
        clocks {
                                        status = "okay";
                                        cd-gpios = <&gpio3 24 0>;
                                        fsl,wp-controller;
-                                       pinctrl-names = "default";
-                                       pinctrl-0 = <
-                                               &pinctrl_esdhc1_1
-                                               &pinctrl_esdhc1_cd
-                                       >;
+                                       status = "okay";
                                };
 
                                mmc1: esdhc@50008000 { /* ESDHC2 */
                                        status = "okay";
                                        cd-gpios = <&gpio3 25 0>;
                                        fsl,wp-controller;
-                                       pinctrl-names = "default";
-                                       pinctrl-0 = <
-                                               &pinctrl_esdhc2_1
-                                               &pinctrl_esdhc2_cd
-                                       >;
                                };
 
-                               serial@5000c000 {
+                               uart3: uart@5000c000 {
                                        status = "okay";
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&pinctrl_uart3_1>;
                        };
 
                        iomuxc@53fa8000 {
+                               compatible = "fsl,imx53-iomuxc-tx53";
+
                                pinctrl-names = "default";
 
                                pincontroller {
                                status = "okay";
                        };
 
-                       serial@53fbc000 {
+                       uart1: uart@53fbc000 {
                                status = "okay";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_uart1_2>;
                                fsl,uart-has-rtscts;
                        };
 
-                       serial@53fc0000 {
+                       uart2: uart@53fc0000 {
                                status = "okay";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_uart2_1>;
                                fsl,uart-has-rtscts;
                        };
 
-                       can@53fc8000 {
+                       can1: flexcan@53fc8000 {
                                status = "okay";
                                transceiver-switch = <&flexcan_transceiver>;
                        };
 
-                       can@53fcc000 {
+                       can2: flexcan@53fcc000 {
                                status = "okay";
                                transceiver-switch = <&flexcan_transceiver>;
                        };
 
                        ssi@63fcc000 {
                                status = "okay";
-
-                               fsl,mode = "i2s-slave";
-                               codec-handle = <&sgtl5000>;
+                               rx-dma = <28>;
+                               tx-dma = <29>;
+                               i2s-sync-mode;
                        };
 
                        ssi@50014000 {
 
        lcd {
                compatible = "of-gpio-lcd";
+               parent = <&ipu>;
 
                power-switch = <&lcd_power>;
 /*