WIP changes to TX28-dts and mach-mxc

diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index 695d22ff4123366bf0b3d04740b54d9bdb863848..d9935b6191553bf96d393c274b8f27b295087e2c 100644 (file)
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -51,6 +51,23 @@
                                status = "okay";
                        };
 
+                       ssp2: ssp@80014000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "fsl,imx28-spi";
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&spi3_pins_tx28>;
+                               status = "okay";
+
+/*                             flash: m25p80@0 {
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       compatible = "m25p80";
+                                       spi-max-frequency = <40000000>;
+                                       reg = <0>;
+                               }; */
+                       };
+
                        pinctrl@80018000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&hog_pins_a>;
@@ -133,7 +150,7 @@
                                usbphy0_pins_c: usbphy0@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
-                                               0x31b3          /* MX28_PAD_SPDIF__GPIO_3_27 - USBH_VBUSEN */
+//                                             0x31b3          /* MX28_PAD_SPDIF__GPIO_3_27 - USBH_VBUSEN */
                                                0x4143          /* MX28_PAD_JTAG_RTCK__GPIO_4_20 - USBH_OC */
                                        >;
                                        fsl,drive-strength = <2>;
@@ -152,6 +169,21 @@
                                        fsl,pull-up = <0>;
                                };*/
 
+                               spi3_pins_tx28: spi3@0 {
+                                       reg = <0>;
+                                       fsl,pinmux-ids = <
+                                               0x3082          /* MX28_PAD_AUART2_RX__SSP3_D4 */
+                                               0x3092          /* MX28_PAD_AUART2_TX__SSP3_D5 */
+                                               0x2180          /* MX28_PAD_SSP3_SCK__SSP3_SCK */
+                                               0x2190          /* MX28_PAD_SSP3_MOSI__SSP3_CMD */
+                                               0x21A0          /* MX28_PAD_SSP3_MISO__SSP3_D0 */
+                                               0x21B0          /* MX28_PAD_SSP3_SS0__SSP3_D3 */
+                                       >;
+                                       fsl,drive-strength = <1>;
+                                       fsl,voltage = <1>;
+                                       fsl,pull-up = <0>;
+                               };
+
                        };
 
                        lcdif@80030000 {
@@ -190,23 +222,23 @@
                                pinctrl-0 = <&i2c0_pins_a>;
                                clock-frequency = <400000>;
                                status = "okay";
+
                                ds1339: rtc@68 {
-                               compatible = "mxim,ds1339";
-                               reg = <0x68>;
-                               trickle-charge = <0xa5>;
+                                       compatible = "mxim,ds1339";
+                                       reg = <0x68>;
+                                       trickle-charge = <0xa5>;
                                };
-/*
+
                                pca9554: pca953x@20 {
-                                       compatible = "nxp,pca953x";
+                                       compatible = "nxp,pca9554";
                                        reg = <0x20>;
                                        interrupt-parent = <&gpio3>;
                                        interrupts = <20>;
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       };
-*/
+                               };
+
 /* unfinished - required platform data bugfix */
-/*
                                touchscreen: tsc2007@48 {
                                        compatible = "ti,tsc2007";
                                        reg = <0x48>;
@@ -215,24 +247,23 @@
                                        pendown-gpio = <&gpio3 20 1>;
                                        model = "2007";
                                        x-plate-ohms = <660>;
-                                       };
-*/
-                               polytouch: edt-ft5x06@ {
+                               };
+
+                               polytouch: edt-ft5x06@38 {
                                        compatible = "edt,edt-ft5x06";
                                        reg = <0x38>;
                                        interrupt-parent = <&gpio2>;
                                        interrupts = <5>;
                                        reset-switch = <&edt_ft5x06_reset>;
                                        wake-switch = <&edt_ft5x06_wake>;
-                                       irq-switch = <&edt_ft5x06_irq>;
-                                       };
+                               };
 
                                codec: sgtl5000@0a {
                                        compatible = "fsl,sgtl5000";
                                        reg = <0x0a>;
                                        VDDA-supply = <&reg_2p5v>;
                                        VDDIO-supply = <&reg_3p3v>;
-                                       };
+                               };
                        };
 
                        lradc@80050000 {
@@ -387,15 +418,8 @@
                edt_ft5x06_wake: gpio-switch@1 {
                        compatible = "linux,gpio-switch";
                        gpio = <&gpio4 9 0>;
-                       label = "EDT-FT5x06 WAKE";
-                       init-state = <1>;
-               };
-
-               edt_ft5x06_irq: gpio-switch@2 {
-                       compatible = "linux,gpio-switch";
-                       gpio = <&gpio2 5 0>;
-                       label = "EDT-FT5x06 IRQ";
                        init-state = <1>;
+                       label = "EDT-FT5x06 WAKE";
                };
        };
 

diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 84fc5dc4790704885e32c238231928b61c3b006d..b5eee4cedd186ad82d811c7b826cea73da530d1e 100644 (file)
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -124,9 +124,9 @@ static struct fb_videomode tx28_video_modes[] = {
                .lower_margin   = 10,
                .hsync_len      = 96,
                .vsync_len      = 2,
-               .sync           = FB_SYNC_DATA_ENABLE_HIGH_ACT,
-               .vmode      = FB_VMODE_NONINTERLACED,
-       }
+               //              .sync           = FB_SYNC_DATA_ENABLE_HIGH_ACT,
+               .vmode          = FB_VMODE_NONINTERLACED,
+       },
 };
 
 static struct fb_videomode apx4devkit_video_modes[] = {
@@ -159,9 +159,11 @@ static struct fb_videomode apf28dev_video_modes[] = {
                .lower_margin   = 0x15,
                .hsync_len      = 64,
                .vsync_len      = 4,
-               .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT |
-                                 FB_SYNC_DATA_ENABLE_HIGH_ACT |
+               .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT
+/* |                                            \
+                                 FB_SYNC_DATA_ENABLE_HIGH_ACT | \
                                  FB_SYNC_DOTCLK_FAILING_ACT,
+*/
        },
 };