ENGR00303795-1 ARM: imx6sx: enable USB hsic

- Add USB hsic support for imx6sx
- Enable hsic support at imx6sx 17x17 board
- Enable usbotg1 and hsic support at imx6sx 19x19 board

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

3 files changed, 167 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
index 55491d9814ad..97bc4b6856cb 100644
--- a/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-17x17-arm2.dts
@@ -431,6 +431,15 @@
         status = "okay";
 };
 
+&usbh {
+        pinctrl-names = "idle", "active";
+        pinctrl-0 = <&pinctrl_usbh_1>;
+        pinctrl-1 = <&pinctrl_usbh_2>;
+        osc-clkgate-delay = <0x3>;
+        pad-supply = <&vgen1_reg>;
+        status = "okay";
+};
+
 &usbotg1 {
         vbus-supply = <&reg_usb_otg1_vbus>;
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
index dea59997b85c..d5e666676eef 100644
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
@@ -41,6 +41,19 @@
                 status = "disabled";
         };
 
+        regulators {
+                compatible = "simple-bus";
+
+                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;
+                };
+        };
+
         memory {
                 reg = <0x80000000 0x40000000>;
         };
@@ -75,10 +88,110 @@
 };
 
 &i2c1 {
-        clock-frequency = <100000>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_i2c1_1>;
-        status = "okay";
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1_1>;
+        status = "okay";
+
+        pmic: pfuze100@08 {
+                compatible = "fsl,pfuze100";
+                reg = <0x08>;
+
+                regulators {
+                        sw1a_reg: sw1ab {
+                                regulator-min-microvolt = <300000>;
+                                regulator-max-microvolt = <1875000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                                regulator-ramp-delay = <6250>;
+                        };
+
+                        sw1c_reg: sw1c {
+                                regulator-min-microvolt = <300000>;
+                                regulator-max-microvolt = <1875000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                                regulator-ramp-delay = <6250>;
+                        };
+
+                        sw2_reg: sw2 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        sw3a_reg: sw3a {
+                                regulator-min-microvolt = <400000>;
+                                regulator-max-microvolt = <1975000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        sw3b_reg: sw3b {
+                                regulator-min-microvolt = <400000>;
+                                regulator-max-microvolt = <1975000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        sw4_reg: sw4 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <3300000>;
+                        };
+
+                        swbst_reg: swbst {
+                                regulator-min-microvolt = <5000000>;
+                                regulator-max-microvolt = <5150000>;
+                        };
+
+                        snvs_reg: vsnvs {
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        vref_reg: vrefddr {
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        vgen1_reg: vgen1 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <1550000>;
+                        };
+
+                        vgen2_reg: vgen2 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <1550000>;
+                        };
+
+                        vgen3_reg: vgen3 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vgen4_reg: vgen4 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vgen5_reg: vgen5 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vgen6_reg: vgen6 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+                };
+        };
 };
 
 &i2c2 {
@@ -245,6 +358,23 @@
         };
 };
 
+&usbh {
+        pinctrl-names = "idle", "active";
+        pinctrl-0 = <&pinctrl_usbh_1>;
+        pinctrl-1 = <&pinctrl_usbh_2>;
+        osc-clkgate-delay = <0x3>;
+        pad-supply = <&vgen1_reg>;
+        status = "okay";
+};
+
+&usbotg1 {
+        vbus-supply = <&reg_usb_otg1_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg1_1>;
+        disable-over-current;
+        status = "okay";
+};
+
 &usdhc1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_usdhc1_1>;
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index d2444976db5b..6a527c7a02b3 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -531,6 +531,12 @@
                                 clocks = <&clks IMX6SX_CLK_USBPHY2>;
                                 fsl,anatop = <&anatop>;
                         };
+
+                        usbphy_nop1: usbphy_nop1 {
+                                compatible = "usb-nop-xceiv";
+                                clocks = <&clks IMX6SX_CLK_USBPHY1>;
+                                clock-names = "main_clk";
+                        };
                 };
 
                 aips-bus@02100000 { /* AIPS2 */
@@ -649,6 +655,9 @@
                                 interrupts = <0 40 0x04>;
                                 clocks = <&clks IMX6SX_CLK_USBOH3>;
                                 fsl,usbmisc = <&usbmisc 2>;
+                                phy_type = "hsic";
+                                fsl,usbphy = <&usbphy_nop1>;
+                                fsl,anatop = <&anatop>;
                                 status = "disabled";
                         };
 
@@ -1098,6 +1107,21 @@
                 };
         };
 
+        usbh {
+                pinctrl_usbh_1: usbhgrp-1 {
+                        fsl,pins = <
+                                MX6SX_PAD_USB_H_STROBE__USB_H_STROBE    0x40013030
+                                MX6SX_PAD_USB_H_DATA__USB_H_DATA 0x40013030
+                        >;
+                };
+
+                pinctrl_usbh_2: usbhgrp-2 {
+                        fsl,pins = <
+                                MX6SX_PAD_USB_H_STROBE__USB_H_STROBE    0x40017030
+                        >;
+                };
+        };
+
         usbotg1 {
                 pinctrl_usbotg1_1: usbotg1grp-1 {
                         fsl,pins = <