Ka-Ro DT:

[karo-tx-linux.git] / arch / arm / boot / dts / imx28-tx28.dts

diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index b3ac2e19cf02681e0abce01d915dc12de3bf9b68..5ad2ec241f73b1137f374d74e8cca2eef58e88a4 100644 (file)
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -31,12 +31,12 @@
        apb@80000000 {
                apbh@80000000 {
                        gpmi-nand@8000c000 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
-                               nand-on-flash-bbt;
-                               status = "okay";
+                           #address-cells = <1>;
+                           #size-cells = <1>;
+                           pinctrl-names = "default";
+                           pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+                           nand-on-flash-bbt;
+                           status = "okay";
                        };
 
                        ssp0: ssp@80010000 {
@@ -133,8 +133,8 @@
                                usbphy0_pins_c: usbphy0@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
-                                               0x0133          /* MX28_PAD_GPMI_CE3N__GPIO_0_19 - USB_OC */
-                                               0x3121          /* MX28_PAD_PWM2__USB0_ID - USB0ID */
+                                               0x31b3          /* MX28_PAD_SPDIF__GPIO_3_27 - USBH_VBUSEN */
+                                               0x4143          /* MX28_PAD_JTAG_RTCK__GPIO_4_20 - USBH_OC */
                                        >;
                                        fsl,drive-strength = <2>;
                                        fsl,voltage = <1>;
@@ -144,12 +144,14 @@
                                usbphy1_pins_b: usbphy1@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
-                                               0x31b3          /* MX28_PAD_SPDIF__GPIO_3_27 - USB_OC */
+                                               0x0123          /* MX28_PAD_GPMI_CE2N__GPIO_0_18 - USBOTG_VBUSEN */
+                                               0x0133          /* MX28_PAD_GPMI_CE3N__GPIO_0_19 - USBOTH_OC */
                                        >;
                                        fsl,drive-strength = <2>;
                                        fsl,voltage = <1>;
                                        fsl,pull-up = <0>;
                                };
+
                        };
 
                        lcdif@80030000 {
@@ -165,8 +167,8 @@
                                pinctrl-0 = <&can0_pins_a>;
                                status = "okay";
                        };
-
-/*                     can1: can@80034000 {
+/*
+                       can1: can@80034000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&can1_pins_a>;
                                status = "okay";
@@ -193,8 +195,8 @@
                                reg = <0x68>;
                                trickle-charge = <0xa5>;
                                };
-
-/*                             pca9554: pca953x@20 {
+/*
+                               pca9554: pca953x@20 {
                                        compatible = "nxp,pca953x";
                                        reg = <0x20>;
                                        interrupt-parent = <&gpio3>;
@@ -204,7 +206,8 @@
                                        };
 */
 /* unfinished - required platform data bugfix */
-/*                             touchscreen: tsc2007@48 {
+/*
+                               touchscreen: tsc2007@48 {
                                        compatible = "ti,tsc2007";
                                        reg = <0x48>;
                                        interrupt-parent = <&gpio3>;
@@ -304,23 +307,25 @@
        };
 
        ahb@80080000 {
-/* wait for patch from sascha hauer
                usb0: usb@80080000 {
                        vbus-supply = <&reg_usb0_vbus>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&usbphy0_pins_c>;
                        disable-over-current;
-                       dr_mode = "otg";
+                       dr_mode = "host";
                        status = "okay";
                };
-*/
+
+/* OTG port - host mode */
                usb1: usb@80090000 {
                        vbus-supply = <&reg_usb1_vbus>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&usbphy1_pins_b>;
+                       disable-over-current;
                        dr_mode = "host";
                        status = "okay";
                };
+
                mac0: ethernet@800f0000 {
                        phy-mode = "rmii";
                        pinctrl-names = "default", "gpio_mode";
@@ -330,7 +335,6 @@
                };
        };
 
-
        regulators {
                compatible = "simple-bus";
 
@@ -339,7 +343,7 @@
                        regulator-name = "usb0_vbus";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio0 18 0>;
+                       gpio = <&gpio3 27 0>;
                        enable-active-high;
                };
 
@@ -348,7 +352,7 @@
                        regulator-name = "usb1_vbus";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio3 27 0>;
+                       gpio = <&gpio0 18 0>;
                        enable-active-high;
                };