MLK-10086-2 ARM: imx6: add dts entries for hsic controller

- Add usbphy_nop, hsic uses nop phy driver
- Add anatop phandle, hsic needs to access anatop register to
change osc clock for different boards
- Add phy_type, hsic needs to config PHY parameters at portsc
- For imx6q-arm2 board, hsic has pin conflict with ethernet, we create a
  dedicated dts(imx6q-arm2-hsic.dts) for it with ethernet disabled, besides
  please make sure keep the line of data and strobe unchanged between board
  boots up and enable hsic controller.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
(cherry picked from commit 2f8a266d271874cd398d14556752ab4ab0be27ba)

diff --git a/arch/arm/boot/dts/imx6q-arm2-hsic.dts b/arch/arm/boot/dts/imx6q-arm2-hsic.dts
new file mode 100644 (file)
index 0000000..d2cca3e
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-arm2-hsic.dts
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include "imx6q-arm2.dts"
+
+&fec {
+       status = "disabled";
+};
+
+&usbh2 {
+       pinctrl-names = "idle", "active";
+       pinctrl-0 = <&pinctrl_usbh2_1>;
+       pinctrl-1 = <&pinctrl_usbh2_2>;
+       osc-clkgate-delay = <0x3>;
+       status = "okay";
+};
+
+&usbh3 {
+       pinctrl-names = "idle", "active";
+       pinctrl-0 = <&pinctrl_usbh3_1>;
+       pinctrl-1 = <&pinctrl_usbh3_2>;
+       osc-clkgate-delay = <0x3>;
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index 4989d0b..9a4f7c0 100644 (file)
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -140,6 +140,32 @@
                        >;
                };
 
+               pinctrl_usbh2_1: usbh2grp-1 {
+                       fsl,pins = <
+                               MX6QDL_PAD_RGMII_TXC__USB_H2_DATA      0x40013030
+                               MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE 0x40013030
+                       >;
+               };
+
+               pinctrl_usbh2_2: usbh2grp-2 {
+                       fsl,pins = <
+                               MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE 0x40017030
+                       >;
+               };
+
+               pinctrl_usbh3_1: usbh3grp-1 {
+                       fsl,pins = <
+                               MX6QDL_PAD_RGMII_RX_CTL__USB_H3_DATA 0x40013030
+                               MX6QDL_PAD_RGMII_RXC__USB_H3_STROBE  0x40013030
+                       >;
+               };
+
+               pinctrl_usbh3_2: usbh3grp-2 {
+                       fsl,pins = <
+                               MX6QDL_PAD_RGMII_RXC__USB_H3_STROBE 0x40017030
+                       >;
+               };
+
                pinctrl_usdhc3: usdhc3grp {
                        fsl,pins = <
                                MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index ca632fc..0f994e1 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -752,6 +752,18 @@
                                fsl,anatop = <&anatop>;
                        };
 
+                       usbphy_nop1: usbphy_nop1 {
+                               compatible = "usb-nop-xceiv";
+                               clocks = <&clks IMX6QDL_CLK_USBPHY1>;
+                               clock-names = "main_clk";
+                       };
+
+                       usbphy_nop2: usbphy_nop2 {
+                               compatible = "usb-nop-xceiv";
+                               clocks = <&clks IMX6QDL_CLK_USBPHY1>;
+                               clock-names = "main_clk";
+                       };
+
                        snvs: snvs@020cc000 {
                                compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
                                reg = <0x020cc000 0x4000>;
@@ -970,6 +982,9 @@
                                ahb-burst-config = <0x0>;
                                tx-burst-size-dword = <0x10>;
                                rx-burst-size-dword = <0x10>;
+                               phy_type = "hsic";
+                               fsl,usbphy = <&usbphy_nop1>;
+                               fsl,anatop = <&anatop>;
                                status = "disabled";
                        };
 
@@ -983,6 +998,9 @@
                                ahb-burst-config = <0x0>;
                                tx-burst-size-dword = <0x10>;
                                rx-burst-size-dword = <0x10>;
+                               phy_type = "hsic";
+                               fsl,usbphy = <&usbphy_nop2>;
+                               fsl,anatop = <&anatop>;
                                status = "disabled";
                        };
 

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 6916835..153ec8b 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -638,6 +638,12 @@
                                fsl,anatop = <&anatop>;
                        };
 
+                       usbphy_nop1: usbphy_nop1 {
+                               compatible = "usb-nop-xceiv";
+                               clocks = <&clks IMX6SL_CLK_USBPHY1>;
+                               clock-names = "main_clk";
+                       };
+
                        snvs: snvs@020cc000 {
                                compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
                                reg = <0x020cc000 0x4000>;
@@ -797,6 +803,9 @@
                                ahb-burst-config = <0x0>;
                                tx-burst-size-dword = <0x10>;
                                rx-burst-size-dword = <0x10>;
+                               phy_type = "hsic";
+                               fsl,usbphy = <&usbphy_nop1>;
+                               fsl,anatop = <&anatop>;
                                status = "disabled";
                        };
 

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 9add8c7..6e7dc28 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -699,6 +699,12 @@
                                fsl,anatop = <&anatop>;
                        };
 
+                       usbphy_nop1: usbphy_nop1 {
+                               compatible = "usb-nop-xceiv";
+                               clocks = <&clks IMX6SX_CLK_USBPHY1>;
+                               clock-names = "main_clk";
+                       };
+
                        snvs: snvs@020cc000 {
                                compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd";
                                reg = <0x020cc000 0x4000>;
@@ -846,6 +852,7 @@
                                clocks = <&clks IMX6SX_CLK_USBOH3>;
                                fsl,usbmisc = <&usbmisc 2>;
                                phy_type = "hsic";
+                               fsl,usbphy = <&usbphy_nop1>;
                                fsl,anatop = <&anatop>;
                                dr_mode = "host";
                                ahb-burst-config = <0x0>;