sunxi: usb: Do not call phy_probe from hcd code

The 2/3 usb-phys on the sunxi SoCs are really a single separate functional
block, and are modelled as such in devicetree. So once we've moved all the
sunxi usb code to the driver-model then phy_probe will be called once
for the entire block from the driver-model enumeration code.

Move to this now as this also avoids problems with phy_probe being called
multiple times once we introduce ohci support. This also allows us to get rid
of the sunxi_usb_phy_enabled_count variable as phy_probe now is guaranteed
to be called only once.

Since we're effectively rewriting the probe / remove functions, move them
to the end of the file while we are at it, as that is the most logical place
for them.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

diff --git a/arch/arm/cpu/armv7/sunxi/usb_phy.c b/arch/arm/cpu/armv7/sunxi/usb_phy.c
index c238d38a1afa7018813e037231386b1a0ee37383..1f85dec07edc9da5d0aaea1ee0f01d2fca7b81ac 100644 (file)
--- a/arch/arm/cpu/armv7/sunxi/usb_phy.c
+++ b/arch/arm/cpu/armv7/sunxi/usb_phy.c
@@ -54,7 +54,7 @@ static struct sunxi_usb_phy {
                .usb_rst_mask = CCM_USB_CTRL_PHY1_RST | CCM_USB_CTRL_PHY1_CLK,
                .id = 1,
        },
-#if (CONFIG_USB_MAX_CONTROLLER_COUNT > 1)
+#if CONFIG_SUNXI_USB_PHYS >= 3
        {
                .usb_rst_mask = CCM_USB_CTRL_PHY2_RST | CCM_USB_CTRL_PHY2_CLK,
                .id = 2,
@@ -62,8 +62,6 @@ static struct sunxi_usb_phy {
 #endif
 };
 
-static int sunxi_usb_phy_enabled_count;
-
 static int get_vbus_gpio(int index)
 {
        switch (index) {
@@ -167,57 +165,17 @@ void sunxi_usb_phy_enable_squelch_detect(int index, int enable)
        usb_phy_write(phy, 0x3c, enable ? 0 : 2, 2);
 }
 
-int sunxi_usb_phy_probe(int index)
-{
-       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
-       int ret = 0;
-
-       phy->gpio_vbus = get_vbus_gpio(index);
-       if (phy->gpio_vbus >= 0) {
-               ret |= gpio_request(phy->gpio_vbus, "usbc_vbus");
-               ret |= gpio_direction_output(phy->gpio_vbus, 0);
-       }
-
-       phy->gpio_vbus_det = get_vbus_detect_gpio(index);
-       if (phy->gpio_vbus_det >= 0) {
-               ret |= gpio_request(phy->gpio_vbus_det, "usbc_vbus_det");
-               ret |= gpio_direction_input(phy->gpio_vbus_det);
-       }
-
-       return ret;
-}
-
-int sunxi_usb_phy_remove(int index)
-{
-       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
-       int ret = 0;
-
-       if (phy->gpio_vbus >= 0)
-               ret |= gpio_free(phy->gpio_vbus);
-
-       if (phy->gpio_vbus_det >= 0)
-               ret |= gpio_free(phy->gpio_vbus_det);
-
-       return ret;
-}
-
 void sunxi_usb_phy_init(int index)
 {
        struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
        struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
 
-       /* enable common PHY only once */
-       if (sunxi_usb_phy_enabled_count == 0)
-               setbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE);
-
        setbits_le32(&ccm->usb_clk_cfg, phy->usb_rst_mask);
 
        sunxi_usb_phy_config(phy);
 
        if (phy->id != 0)
                sunxi_usb_phy_passby(index, SUNXI_USB_PASSBY_EN);
-
-       sunxi_usb_phy_enabled_count++;
 }
 
 void sunxi_usb_phy_exit(int index)
@@ -229,12 +187,6 @@ void sunxi_usb_phy_exit(int index)
                sunxi_usb_phy_passby(index, !SUNXI_USB_PASSBY_EN);
 
        clrbits_le32(&ccm->usb_clk_cfg, phy->usb_rst_mask);
-
-       /* disable common PHY only once, for the last enabled phy */
-       if (sunxi_usb_phy_enabled_count == 1)
-               clrbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE);
-
-       sunxi_usb_phy_enabled_count--;
 }
 
 void sunxi_usb_phy_power_on(int index)
@@ -276,3 +228,59 @@ int sunxi_usb_phy_vbus_detect(int index)
 
        return err;
 }
+
+int sunxi_usb_phy_probe(void)
+{
+       struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+       struct sunxi_usb_phy *phy;
+       int i, ret = 0;
+
+       for (i = 0; i < CONFIG_SUNXI_USB_PHYS; i++) {
+               phy = &sunxi_usb_phy[i];
+
+               phy->gpio_vbus = get_vbus_gpio(i);
+               if (phy->gpio_vbus >= 0) {
+                       ret = gpio_request(phy->gpio_vbus, "usb_vbus");
+                       if (ret)
+                               return ret;
+                       ret = gpio_direction_output(phy->gpio_vbus, 0);
+                       if (ret)
+                               return ret;
+               }
+
+               phy->gpio_vbus_det = get_vbus_detect_gpio(i);
+               if (phy->gpio_vbus_det >= 0) {
+                       ret = gpio_request(phy->gpio_vbus_det, "usb_vbus_det");
+                       if (ret)
+                               return ret;
+                       ret = gpio_direction_input(phy->gpio_vbus_det);
+                       if (ret)
+                               return ret;
+               }
+       }
+
+       setbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE);
+
+       return 0;
+}
+
+int sunxi_usb_phy_remove(void)
+{
+       struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+       struct sunxi_usb_phy *phy;
+       int i;
+
+       clrbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE);
+
+       for (i = 0; i < CONFIG_SUNXI_USB_PHYS; i++) {
+               phy = &sunxi_usb_phy[i];
+
+               if (phy->gpio_vbus >= 0)
+                       gpio_free(phy->gpio_vbus);
+
+               if (phy->gpio_vbus_det >= 0)
+                       gpio_free(phy->gpio_vbus_det);
+       }
+
+       return 0;
+}

diff --git a/arch/arm/include/asm/arch-sunxi/usb_phy.h b/arch/arm/include/asm/arch-sunxi/usb_phy.h
index 14ed0814dda7a6493d8d0a544a135f245bec58a4..b7b831e24aaa9c4960ff065a9136522768424d49 100644 (file)
--- a/arch/arm/include/asm/arch-sunxi/usb_phy.h
+++ b/arch/arm/include/asm/arch-sunxi/usb_phy.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-int sunxi_usb_phy_probe(int index);
-int sunxi_usb_phy_remove(int index);
+int sunxi_usb_phy_probe(void);
+int sunxi_usb_phy_remove(void);
 void sunxi_usb_phy_init(int index);
 void sunxi_usb_phy_exit(int index);
 void sunxi_usb_phy_power_on(int index);

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index be76e62d2a386ac255a87a140d20f8699b99dc67..d9f76913730fc3c06212e736209e157a83beab77 100644 (file)
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -510,6 +510,10 @@ int misc_init_r(void)
                }
        }
 
+       ret = sunxi_usb_phy_probe();
+       if (ret)
+               return ret;
+
 #if defined(CONFIG_MUSB_HOST) || defined(CONFIG_MUSB_GADGET)
        musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
 #endif

diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c
index 9e74a0babfbfe2cf8d5e4ca32cd356da9ffca57f..0edb6438cbd74348df57d529c987d370caffe80b 100644 (file)
--- a/drivers/usb/host/ehci-sunxi.c
+++ b/drivers/usb/host/ehci-sunxi.c
@@ -20,11 +20,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr **hccr,
                struct ehci_hcor **hcor)
 {
        struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
-       int ahb_gate_offset, err;
-
-       err = sunxi_usb_phy_probe(index + 1);
-       if (err)
-               return err;
+       int ahb_gate_offset;
 
        ahb_gate_offset = index ? AHB_GATE_OFFSET_USB_EHCI1 :
                                  AHB_GATE_OFFSET_USB_EHCI0;
@@ -66,5 +62,5 @@ int ehci_hcd_stop(int index)
 #endif
        clrbits_le32(&ccm->ahb_gate0, 1 << ahb_gate_offset);
 
-       return sunxi_usb_phy_remove(index + 1);
+       return 0;
 }

diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 4f08f9f90680cd395b06e8e1c95c11a717aa7751..e8a3a23aa45fe82d28eb792a906f3464cfbd5db5 100644 (file)
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -250,15 +250,10 @@ static int sunxi_musb_init(struct musb *musb)
 
        pr_debug("%s():\n", __func__);
 
-       err = sunxi_usb_phy_probe(0);
-       if (err)
-               return err;
-
        if (is_host_enabled(musb)) {
                err = sunxi_usb_phy_vbus_detect(0);
                if (err) {
                        eprintf("Error: A charger is plugged into the OTG\n");
-                       sunxi_usb_phy_remove(0);
                        return -EIO;
                }
        }
@@ -296,7 +291,7 @@ static int sunxi_musb_exit(struct musb *musb)
        sunxi_usb_phy_power_off(0);
        sunxi_usb_phy_exit(0);
 
-       return sunxi_usb_phy_remove(0);
+       return 0;
 }
 
 const struct musb_platform_ops sunxi_musb_ops = {

diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h
index 7cd5c69d3a8f9801043b6fd98aba781de4f472e6..ea079eb5f78b721cc9c69ebd69c42cac633ff106 100644 (file)
--- a/include/configs/sun4i.h
+++ b/include/configs/sun4i.h
@@ -17,6 +17,8 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
 
+#define CONFIG_SUNXI_USB_PHYS  3
+
 /*
  * Include common sunxi configuration where most the settings are
  */

diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h
index e0470d4282c9cf086631f606419d005917afee07..d2576599036a3fee56cfdaa7944c11ef3390685d 100644 (file)
--- a/include/configs/sun5i.h
+++ b/include/configs/sun5i.h
@@ -17,6 +17,8 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #endif
 
+#define CONFIG_SUNXI_USB_PHYS  2
+
 /*
  * Include common sunxi configuration where most the settings are
  */

diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h
index 617c1cdfdecb734c9558c0610bf0584ebef278ef..2c24bd2312ddb35a88ff84ce8747c4552e79eb4d 100644 (file)
--- a/include/configs/sun6i.h
+++ b/include/configs/sun6i.h
@@ -20,6 +20,8 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
 
+#define CONFIG_SUNXI_USB_PHYS  3
+
 /*
  * Include common sunxi configuration where most the settings are
  */

diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
index 7fa7cec2441a4add5c3c27a857e99557ae834cc3..56101a9ffcd27532a81fb721476dbaf43e9519d9 100644 (file)
--- a/include/configs/sun7i.h
+++ b/include/configs/sun7i.h
@@ -18,6 +18,8 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
 
+#define CONFIG_SUNXI_USB_PHYS  3
+
 #define CONFIG_ARMV7_PSCI              1
 #define CONFIG_ARMV7_SECURE_BASE       SUNXI_SRAM_B_BASE
 #define CONFIG_TIMER_CLK_FREQ          24000000

diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
index 79796d75d3439a4288ccc36afeb37afc20b91a33..7111c635c152d06c9684eecb5e1fc94d427fd3cc 100644 (file)
--- a/include/configs/sun8i.h
+++ b/include/configs/sun8i.h
@@ -18,6 +18,8 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #endif
 
+#define CONFIG_SUNXI_USB_PHYS  2
+
 /*
  * Include common sunxi configuration where most the settings are
  */