sunxi: usb_phy: Add support for A83T USB PHYs

The A83T has 3 USB PHYs: 1 for USB OTG, 1 for standard USB 1.1/2.0 host,
1 for USB HSIC.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/arch/arm/cpu/armv7/sunxi/usb_phy.c b/arch/arm/cpu/armv7/sunxi/usb_phy.c
index 0749fbdadc30febd0d8695ce6cf00c1aba594e50..fa375f1d16de1a44e927e4f76cd19a876171c55f 100644 (file)
--- a/arch/arm/cpu/armv7/sunxi/usb_phy.c
+++ b/arch/arm/cpu/armv7/sunxi/usb_phy.c
@@ -34,6 +34,16 @@
 #define REG_PHY_UNK_H3                 0x420
 #define REG_PMU_UNK_H3                 0x810
 
+/* A83T specific control bits for PHY0 */
+#define SUNXI_PHY_CTL_VBUSVLDEXT       BIT(5)
+#define SUNXI_PHY_CTL_SIDDQ            BIT(3)
+
+/* A83T HSIC specific bits */
+#define SUNXI_EHCI_HS_FORCE            BIT(20)
+#define SUNXI_EHCI_CONNECT_DET         BIT(17)
+#define SUNXI_EHCI_CONNECT_INT         BIT(16)
+#define SUNXI_EHCI_HSIC                        BIT(1)
+
 static struct sunxi_usb_phy {
        int usb_rst_mask;
        int gpio_vbus;
@@ -56,7 +66,12 @@ static struct sunxi_usb_phy {
        },
 #if CONFIG_SUNXI_USB_PHYS >= 3
        {
+#ifdef CONFIG_MACH_SUN8I_A83T
+               .usb_rst_mask = CCM_USB_CTRL_HSIC_RST | CCM_USB_CTRL_HSIC_CLK |
+                               CCM_USB_CTRL_12M_CLK,
+#else
                .usb_rst_mask = CCM_USB_CTRL_PHY2_RST | CCM_USB_CTRL_PHY2_CLK,
+#endif
                .id = 2,
                .base = SUNXI_USB2_BASE,
        },
@@ -97,8 +112,8 @@ static int get_id_detect_gpio(int index)
        return -EINVAL;
 }
 
-static void usb_phy_write(struct sunxi_usb_phy *phy, int addr,
-                         int data, int len)
+__maybe_unused static void usb_phy_write(struct sunxi_usb_phy *phy, int addr,
+                                        int data, int len)
 {
        int j = 0, usbc_bit = 0;
        void *dest = (void *)SUNXI_USB0_BASE + SUNXI_USB_CSR;
@@ -137,6 +152,10 @@ static void sunxi_usb_phy_config(struct sunxi_usb_phy *phy)
 
        clrbits_le32(phy->base + REG_PMU_UNK_H3, 0x02);
 }
+#elif defined CONFIG_MACH_SUN8I_A83T
+static void sunxi_usb_phy_config(struct sunxi_usb_phy *phy)
+{
+}
 #else
 static void sunxi_usb_phy_config(struct sunxi_usb_phy *phy)
 {
@@ -174,6 +193,13 @@ static void sunxi_usb_phy_passby(struct sunxi_usb_phy *phy, int enable)
                SUNXI_EHCI_AHB_INCRX_ALIGN_EN |
                SUNXI_EHCI_ULPI_BYPASS_EN;
 
+#ifdef CONFIG_MACH_SUN8I_A83T
+       if (phy->id == 2)
+               bits |= SUNXI_EHCI_HS_FORCE |
+                       SUNXI_EHCI_CONNECT_INT |
+                       SUNXI_EHCI_HSIC;
+#endif
+
        if (enable)
                setbits_le32(addr, bits);
        else
@@ -184,9 +210,11 @@ static void sunxi_usb_phy_passby(struct sunxi_usb_phy *phy, int enable)
 
 void sunxi_usb_phy_enable_squelch_detect(int index, int enable)
 {
+#ifndef CONFIG_MACH_SUN8I_A83T
        struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
 
        usb_phy_write(phy, 0x3c, enable ? 0 : 2, 2);
+#endif
 }
 
 void sunxi_usb_phy_init(int index)
@@ -204,6 +232,15 @@ void sunxi_usb_phy_init(int index)
 
        if (phy->id != 0)
                sunxi_usb_phy_passby(phy, SUNXI_USB_PASSBY_EN);
+
+#ifdef CONFIG_MACH_SUN8I_A83T
+       if (phy->id == 0) {
+               setbits_le32(SUNXI_USB0_BASE + SUNXI_USB_CSR,
+                            SUNXI_PHY_CTL_VBUSVLDEXT);
+               clrbits_le32(SUNXI_USB0_BASE + SUNXI_USB_CSR,
+                            SUNXI_PHY_CTL_SIDDQ);
+       }
+#endif
 }
 
 void sunxi_usb_phy_exit(int index)
@@ -218,6 +255,13 @@ void sunxi_usb_phy_exit(int index)
        if (phy->id != 0)
                sunxi_usb_phy_passby(phy, !SUNXI_USB_PASSBY_EN);
 
+#ifdef CONFIG_MACH_SUN8I_A83T
+       if (phy->id == 0) {
+               setbits_le32(SUNXI_USB0_BASE + SUNXI_USB_CSR,
+                            SUNXI_PHY_CTL_SIDDQ);
+       }
+#endif
+
        clrbits_le32(&ccm->usb_clk_cfg, phy->usb_rst_mask);
 }
 

diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
index 7c0ab1eab4b2278d8e884e293e85021d9abb4aae..eb5db4eb16bf26ad4843b99ae7f469de8ad4be03 100644 (file)
--- a/include/configs/sun8i.h
+++ b/include/configs/sun8i.h
@@ -20,6 +20,8 @@
 
 #ifdef CONFIG_MACH_SUN8I_H3
        #define CONFIG_SUNXI_USB_PHYS   4
+#elif defined CONFIG_MACH_SUN8I_A83T
+       #define CONFIG_SUNXI_USB_PHYS   3
 #else
        #define CONFIG_SUNXI_USB_PHYS   2
 #endif