ENGR00301290-1 ARM: imx6sx: add usb support

- Add usbotg1 and usbotg2 support
- Enable usbotg1 at arm2 board

Signed-off-by: Peter Chen <peter.chen@freescale.com>

2 files changed, 133 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
index 4d7fcaf97bb8..1103d4986876 100644
--- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
@@ -51,6 +51,24 @@
                         regulator-max-microvolt = <3300000>;
                         regulator-always-on;
                 };
+
+                reg_usb_otg1_vbus: usb_otg1_vbus {
+                        compatible = "regulator-fixed";
+                        regulator-name = "usb_otg1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio1 9 0>;
+                        enable-active-high;
+                };
+
+                reg_usb_otg2_vbus: usb_otg2_vbus {
+                        compatible = "regulator-fixed";
+                        regulator-name = "usb_otg2_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio1 12 0>;
+                        enable-active-high;
+                };
         };
 
         memory {
@@ -371,6 +389,26 @@
         status = "okay";
 };
 
+&usbotg1 {
+        vbus-supply = <&reg_usb_otg1_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg1_1>;
+        disable-over-current;
+        status = "okay";
+};
+
+&usbotg2 {
+        /*
+         * Pin conflict with others, need to switch R580 & R579
+         * to B and disable pwm3 to enable it.
+         */
+        vbus-supply = <&reg_usb_otg2_vbus>;
+        disable-over-current;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg2_1>;
+        status = "disabled";
+};
+
 &usdhc2 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_usdhc2_1>;
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 16b605a74dbb..c1c7f8f4b85a 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -26,6 +26,8 @@
                 gpio6 = &gpio7;
                 serial0 = &uart1;
                 serial1 = &uart2;
+                usbphy0 = &usbphy1;
+                usbphy1 = &usbphy2;
         };
 
         cpus {
@@ -484,6 +486,22 @@
                                 #dma-cells = <3>;
                                 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
                         };
+
+                        usbphy1: usbphy@020c9000 {
+                                compatible = "fsl,imx6sx-usbphy", "fsl,imx23-usbphy";
+                                reg = <0x020c9000 0x1000>;
+                                interrupts = <0 44 0x04>;
+                                clocks = <&clks IMX6SX_CLK_USBPHY1>;
+                                fsl,anatop = <&anatop>;
+                        };
+
+                        usbphy2: usbphy@020ca000 {
+                                compatible = "fsl,imx6sx-usbphy", "fsl,imx23-usbphy";
+                                reg = <0x020ca000 0x1000>;
+                                interrupts = <0 45 0x04>;
+                                clocks = <&clks IMX6SX_CLK_USBPHY2>;
+                                fsl,anatop = <&anatop>;
+                        };
                 };
 
                 aips-bus@02100000 { /* AIPS2 */
@@ -565,6 +583,43 @@
                                 status = "disabled";
                         };
 
+                        usbotg1: usb@02184000 {
+                                compatible = "fsl,imx6sx-usb", "fsl,imx27-usb";
+                                reg = <0x02184000 0x200>;
+                                interrupts = <0 43 0x04>;
+                                clocks = <&clks IMX6SX_CLK_USBOH3>;
+                                fsl,usbphy = <&usbphy1>;
+                                fsl,usbmisc = <&usbmisc 0>;
+                                fsl,anatop = <&anatop>;
+                                status = "disabled";
+                        };
+
+                        usbotg2: usb@02184200 {
+                                compatible = "fsl,imx6sx-usb", "fsl,imx27-usb";
+                                reg = <0x02184200 0x200>;
+                                interrupts = <0 42 0x04>;
+                                clocks = <&clks IMX6SX_CLK_USBOH3>;
+                                fsl,usbphy = <&usbphy2>;
+                                fsl,usbmisc = <&usbmisc 1>;
+                                status = "disabled";
+                        };
+
+                        usbh: usb@02184400 {
+                                compatible = "fsl,imx6sx-usb", "fsl,imx27-usb";
+                                reg = <0x02184400 0x200>;
+                                interrupts = <0 40 0x04>;
+                                clocks = <&clks IMX6SX_CLK_USBOH3>;
+                                fsl,usbmisc = <&usbmisc 2>;
+                                status = "disabled";
+                        };
+
+                        usbmisc: usbmisc: usbmisc@02184800 {
+                                #index-cells = <1>;
+                                compatible = "fsl,imx6sx-usbmisc";
+                                reg = <0x02184800 0x200>;
+                                clocks = <&clks IMX6SX_CLK_USBOH3>;
+                        };
+
                         usdhc1: usdhc@02190000 {
                                 compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
                                 reg = <0x02190000 0x4000>;
@@ -956,6 +1011,46 @@
                 };
         };
 
+        usbotg1 {
+                pinctrl_usbotg1_1: usbotg1grp-1 {
+                        fsl,pins = <
+                                MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID 0x17059
+                        >;
+                };
+
+                pinctrl_usbotg1_2: usbotg1grp-2 {
+                        fsl,pins = <
+                                MX6SX_PAD_ENET2_COL__ANATOP_OTG1_ID 0x17059
+                        >;
+                };
+
+                pinctrl_usbotg1_3: usbotg1grp-3 {
+                        fsl,pins = <
+                                MX6SX_PAD_QSPI1A_DATA1__ANATOP_OTG1_ID 0x17059
+                        >;
+                };
+        };
+
+        usbotg2 {
+                pinctrl_usbotg2_1: usbotg2grp-1 {
+                        fsl,pins = <
+                                MX6SX_PAD_GPIO1_IO13__ANATOP_OTG2_ID 0x17059
+                        >;
+                };
+
+                pinctrl_usbotg2_2: usbotg2grp-2 {
+                        fsl,pins = <
+                                MX6SX_PAD_ENET2_CRS__ANATOP_OTG2_ID 0x17059
+                        >;
+                };
+
+                pinctrl_usbotg2_3: usbotg2grp-3 {
+                        fsl,pins = <
+                                MX6SX_PAD_QSPI1A_SCLK__ANATOP_OTG2_ID 0x17059
+                        >;
+                };
+        };
+
         usdhc2 {
                 pinctrl_usdhc2_1: usdhc2grp-1 {
                         fsl,pins = <