TX53 DTS bugfixes
authorLothar Waßmann <LW@KARO-electronics.de>
Thu, 20 Dec 2012 09:48:36 +0000 (10:48 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 20 Dec 2012 09:48:36 +0000 (10:48 +0100)
arch/arm/dts/mx53.dtsi
board/karo/dts/tx53.dts

index 7a85ced..2e936eb 100644 (file)
                serial2 = &uart3;
                serial3 = &uart4;
                serial4 = &uart5;
-               gpio0 = &gpio1;
-               gpio1 = &gpio2;
-               gpio2 = &gpio3;
-               gpio3 = &gpio4;
-               gpio4 = &gpio5;
-               gpio5 = &gpio6;
-               gpio6 = &gpio7;
+               gpio1 = &gpio1;
+               gpio2 = &gpio2;
+               gpio3 = &gpio3;
+               gpio4 = &gpio4;
+               gpio5 = &gpio5;
+               gpio6 = &gpio6;
+               gpio7 = &gpio7;
        };
 
        tzic: tz-interrupt-controller@0fffc000 {
index 510df4e..c949765 100644 (file)
@@ -22,7 +22,7 @@
        compatible = "karo,tx53", "fsl,imx53";
 
        chosen {
-               bootargs = "init=/linuxrc console=ttymxc0,115200 root=/dev/mtdblock4 rootfstype=jffs2 ro debug panic=1";
+               bootargs = "init=/linuxrc console=ttymxc0,115200 root=/dev/mtdblock3 rootfstype=jffs2 ro debug panic=1";
        };
 
        aliases {
@@ -52,7 +52,6 @@
                                        status = "okay";
                                        cd-gpios = <&gpio3 24 0>;
                                        fsl,wp-controller;
-                                       status = "okay";
                                };
 
                                mmc1: esdhc@50008000 { /* ESDHC2 */
                                compatible = "fsl,imx53-iomuxc-tx53";
 
                                pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_tsc2007_pd>;
 
                                pincontroller {
                                        pinctrl_stk5_led: stk5-led-gpios {
 
                                        pinctrl_esdhc1_cd: esdhc1-cd-gpios {
                                                fsl,pins = <
-                                                       501 0x1f0 /* MX53_PAD_EIM_D25__GPIO3_25 */
+                                                       493 0x1f0 /* MX53_PAD_EIM_D24__GPIO3_24 */
                                                >;
                                        };
 
                                        pinctrl_esdhc2_cd: esdhc2-cd-gpios {
+                                               fsl,pins = <
+                                                       501 0x1f0 /* MX53_PAD_EIM_D25__GPIO3_25 */
+                                               >;
+                                       };
+
+                                       pinctrl_tsc2007_pd: pendown-gpios {
                                                fsl,pins = <
                                                        517 0x1f0 /* MX53_PAD_EIM_D27__GPIO3_27 */
                                                >;
        };
 
        sound {
-               compatible = "karo,tx53x-audio-sgtl5000", "fsl,imx-audio-sgtl5000";
+               compatible = "fsl,imx-sgtl5000";
                status = "okay";
-               model = "tx53x-audio-sgtl5000";
-               ssi-controller = <&ssi1>;
-               audio-codec = <&sgtl5000>;
-               audio-routing =
-                       "MIC_IN", "Mic Jack",
-                       "Mic Jack", "Mic Bias",
-                       "Headphone Jack", "HP_OUT";
                /* '1' based port numbers according to datasheet names */
-               mux-int-port = <1>;
-               mux-ext-port = <5>;
+               ssi-port = <1>;
+               audmux-port = <5>;
+               sysclk = <26000000>;
        };
 
        gpio-switch {