sunxi: usb: Rename the usbc.? files to usb_phy.?
authorHans de Goede <hdegoede@redhat.com>
Mon, 27 Apr 2015 13:05:10 +0000 (15:05 +0200)
committerHans de Goede <hdegoede@redhat.com>
Mon, 4 May 2015 14:51:55 +0000 (16:51 +0200)
The usbc.? files now only contain usb-phy related code, rename them to make
this clear.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
arch/arm/cpu/armv7/sunxi/Makefile
arch/arm/cpu/armv7/sunxi/usb_phy.c [new file with mode: 0644]
arch/arm/cpu/armv7/sunxi/usbc.c [deleted file]
arch/arm/include/asm/arch-sunxi/usb_phy.h [new file with mode: 0644]
arch/arm/include/asm/arch-sunxi/usbc.h [deleted file]
board/sunxi/board.c
drivers/usb/host/ehci-sunxi.c
drivers/usb/musb-new/musb_uboot.c
drivers/usb/musb-new/sunxi.c

index f1b619b4dcd33030082bacf199c65ac9ac84bb70..6a0299fe1cd8fe1bbeaf92561b7244ff5b8e4a36 100644 (file)
@@ -13,7 +13,7 @@ obj-y += clock.o
 obj-y  += cpu_info.o
 obj-y  += dram_helpers.o
 obj-y  += pinmux.o
-obj-y  += usbc.o
+obj-y  += usb_phy.o
 obj-$(CONFIG_MACH_SUN6I)       += prcm.o
 obj-$(CONFIG_MACH_SUN8I)       += prcm.o
 obj-$(CONFIG_MACH_SUN9I)       += prcm.o
diff --git a/arch/arm/cpu/armv7/sunxi/usb_phy.c b/arch/arm/cpu/armv7/sunxi/usb_phy.c
new file mode 100644 (file)
index 0000000..c238d38
--- /dev/null
@@ -0,0 +1,278 @@
+/*
+ * Sunxi usb-phy code
+ *
+ * Copyright (C) 2015 Hans de Goede <hdegoede@redhat.com>
+ * Copyright (C) 2014 Roman Byshko <rbyshko@gmail.com>
+ *
+ * Based on code from
+ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/usb_phy.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <errno.h>
+#ifdef CONFIG_AXP152_POWER
+#include <axp152.h>
+#endif
+#ifdef CONFIG_AXP209_POWER
+#include <axp209.h>
+#endif
+#ifdef CONFIG_AXP221_POWER
+#include <axp221.h>
+#endif
+
+#define SUNXI_USB_PMU_IRQ_ENABLE       0x800
+#ifdef CONFIG_MACH_SUN8I_A33
+#define SUNXI_USB_CSR                  0x410
+#else
+#define SUNXI_USB_CSR                  0x404
+#endif
+#define SUNXI_USB_PASSBY_EN            1
+
+#define SUNXI_EHCI_AHB_ICHR8_EN                (1 << 10)
+#define SUNXI_EHCI_AHB_INCR4_BURST_EN  (1 << 9)
+#define SUNXI_EHCI_AHB_INCRX_ALIGN_EN  (1 << 8)
+#define SUNXI_EHCI_ULPI_BYPASS_EN      (1 << 0)
+
+static struct sunxi_usb_phy {
+       int usb_rst_mask;
+       int gpio_vbus;
+       int gpio_vbus_det;
+       int id;
+} sunxi_usb_phy[] = {
+       {
+               .usb_rst_mask = CCM_USB_CTRL_PHY0_RST | CCM_USB_CTRL_PHY0_CLK,
+               .id = 0,
+       },
+       {
+               .usb_rst_mask = CCM_USB_CTRL_PHY1_RST | CCM_USB_CTRL_PHY1_CLK,
+               .id = 1,
+       },
+#if (CONFIG_USB_MAX_CONTROLLER_COUNT > 1)
+       {
+               .usb_rst_mask = CCM_USB_CTRL_PHY2_RST | CCM_USB_CTRL_PHY2_CLK,
+               .id = 2,
+       }
+#endif
+};
+
+static int sunxi_usb_phy_enabled_count;
+
+static int get_vbus_gpio(int index)
+{
+       switch (index) {
+       case 0: return sunxi_name_to_gpio(CONFIG_USB0_VBUS_PIN);
+       case 1: return sunxi_name_to_gpio(CONFIG_USB1_VBUS_PIN);
+       case 2: return sunxi_name_to_gpio(CONFIG_USB2_VBUS_PIN);
+       }
+       return -EINVAL;
+}
+
+static int get_vbus_detect_gpio(int index)
+{
+       switch (index) {
+       case 0: return sunxi_name_to_gpio(CONFIG_USB0_VBUS_DET);
+       }
+       return -EINVAL;
+}
+
+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;
+
+#ifdef CONFIG_MACH_SUN8I_A33
+       /* CSR needs to be explicitly initialized to 0 on A33 */
+       writel(0, dest);
+#endif
+
+       usbc_bit = 1 << (phy->id * 2);
+       for (j = 0; j < len; j++) {
+               /* set the bit address to be written */
+               clrbits_le32(dest, 0xff << 8);
+               setbits_le32(dest, (addr + j) << 8);
+
+               clrbits_le32(dest, usbc_bit);
+               /* set data bit */
+               if (data & 0x1)
+                       setbits_le32(dest, 1 << 7);
+               else
+                       clrbits_le32(dest, 1 << 7);
+
+               setbits_le32(dest, usbc_bit);
+
+               clrbits_le32(dest, usbc_bit);
+
+               data >>= 1;
+       }
+}
+
+static void sunxi_usb_phy_config(struct sunxi_usb_phy *phy)
+{
+       /* The following comments are machine
+        * translated from Chinese, you have been warned!
+        */
+
+       /* Regulation 45 ohms */
+       if (phy->id == 0)
+               usb_phy_write(phy, 0x0c, 0x01, 1);
+
+       /* adjust PHY's magnitude and rate */
+       usb_phy_write(phy, 0x20, 0x14, 5);
+
+       /* threshold adjustment disconnect */
+#if defined CONFIG_MACH_SUN4I || defined CONFIG_MACH_SUN6I
+       usb_phy_write(phy, 0x2a, 3, 2);
+#else
+       usb_phy_write(phy, 0x2a, 2, 2);
+#endif
+
+       return;
+}
+
+static void sunxi_usb_phy_passby(int index, int enable)
+{
+       unsigned long bits = 0;
+       void *addr;
+
+       if (index == 1)
+               addr = (void *)SUNXI_USB1_BASE + SUNXI_USB_PMU_IRQ_ENABLE;
+       else
+               addr = (void *)SUNXI_USB2_BASE + SUNXI_USB_PMU_IRQ_ENABLE;
+
+       bits = SUNXI_EHCI_AHB_ICHR8_EN |
+               SUNXI_EHCI_AHB_INCR4_BURST_EN |
+               SUNXI_EHCI_AHB_INCRX_ALIGN_EN |
+               SUNXI_EHCI_ULPI_BYPASS_EN;
+
+       if (enable)
+               setbits_le32(addr, bits);
+       else
+               clrbits_le32(addr, bits);
+
+       return;
+}
+
+void sunxi_usb_phy_enable_squelch_detect(int index, int enable)
+{
+       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
+
+       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)
+{
+       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
+       struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+
+       if (phy->id != 0)
+               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)
+{
+       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
+
+       if (phy->gpio_vbus >= 0)
+               gpio_set_value(phy->gpio_vbus, 1);
+}
+
+void sunxi_usb_phy_power_off(int index)
+{
+       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
+
+       if (phy->gpio_vbus >= 0)
+               gpio_set_value(phy->gpio_vbus, 0);
+}
+
+int sunxi_usb_phy_vbus_detect(int index)
+{
+       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
+       int err, retries = 3;
+
+       if (phy->gpio_vbus_det < 0) {
+               eprintf("Error: invalid vbus detection pin\n");
+               return phy->gpio_vbus_det;
+       }
+
+       err = gpio_get_value(phy->gpio_vbus_det);
+       /*
+        * Vbus may have been provided by the board and just been turned of
+        * some milliseconds ago on reset, what we're measuring then is a
+        * residual charge on Vbus, sleep a bit and try again.
+        */
+       while (err > 0 && retries--) {
+               mdelay(100);
+               err = gpio_get_value(phy->gpio_vbus_det);
+       }
+
+       return err;
+}
diff --git a/arch/arm/cpu/armv7/sunxi/usbc.c b/arch/arm/cpu/armv7/sunxi/usbc.c
deleted file mode 100644 (file)
index 71817c1..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Sunxi usb-phy code
- *
- * Copyright (C) 2015 Hans de Goede <hdegoede@redhat.com>
- * Copyright (C) 2014 Roman Byshko <rbyshko@gmail.com>
- *
- * Based on code from
- * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/usbc.h>
-#include <asm/gpio.h>
-#include <asm/io.h>
-#include <errno.h>
-#ifdef CONFIG_AXP152_POWER
-#include <axp152.h>
-#endif
-#ifdef CONFIG_AXP209_POWER
-#include <axp209.h>
-#endif
-#ifdef CONFIG_AXP221_POWER
-#include <axp221.h>
-#endif
-
-#define SUNXI_USB_PMU_IRQ_ENABLE       0x800
-#ifdef CONFIG_MACH_SUN8I_A33
-#define SUNXI_USB_CSR                  0x410
-#else
-#define SUNXI_USB_CSR                  0x404
-#endif
-#define SUNXI_USB_PASSBY_EN            1
-
-#define SUNXI_EHCI_AHB_ICHR8_EN                (1 << 10)
-#define SUNXI_EHCI_AHB_INCR4_BURST_EN  (1 << 9)
-#define SUNXI_EHCI_AHB_INCRX_ALIGN_EN  (1 << 8)
-#define SUNXI_EHCI_ULPI_BYPASS_EN      (1 << 0)
-
-static struct sunxi_usb_phy {
-       int usb_rst_mask;
-       int gpio_vbus;
-       int gpio_vbus_det;
-       int id;
-} sunxi_usb_phy[] = {
-       {
-               .usb_rst_mask = CCM_USB_CTRL_PHY0_RST | CCM_USB_CTRL_PHY0_CLK,
-               .id = 0,
-       },
-       {
-               .usb_rst_mask = CCM_USB_CTRL_PHY1_RST | CCM_USB_CTRL_PHY1_CLK,
-               .id = 1,
-       },
-#if (CONFIG_USB_MAX_CONTROLLER_COUNT > 1)
-       {
-               .usb_rst_mask = CCM_USB_CTRL_PHY2_RST | CCM_USB_CTRL_PHY2_CLK,
-               .id = 2,
-       }
-#endif
-};
-
-static int sunxi_usb_phy_enabled_count;
-
-static int get_vbus_gpio(int index)
-{
-       switch (index) {
-       case 0: return sunxi_name_to_gpio(CONFIG_USB0_VBUS_PIN);
-       case 1: return sunxi_name_to_gpio(CONFIG_USB1_VBUS_PIN);
-       case 2: return sunxi_name_to_gpio(CONFIG_USB2_VBUS_PIN);
-       }
-       return -EINVAL;
-}
-
-static int get_vbus_detect_gpio(int index)
-{
-       switch (index) {
-       case 0: return sunxi_name_to_gpio(CONFIG_USB0_VBUS_DET);
-       }
-       return -EINVAL;
-}
-
-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;
-
-#ifdef CONFIG_MACH_SUN8I_A33
-       /* CSR needs to be explicitly initialized to 0 on A33 */
-       writel(0, dest);
-#endif
-
-       usbc_bit = 1 << (phy->id * 2);
-       for (j = 0; j < len; j++) {
-               /* set the bit address to be written */
-               clrbits_le32(dest, 0xff << 8);
-               setbits_le32(dest, (addr + j) << 8);
-
-               clrbits_le32(dest, usbc_bit);
-               /* set data bit */
-               if (data & 0x1)
-                       setbits_le32(dest, 1 << 7);
-               else
-                       clrbits_le32(dest, 1 << 7);
-
-               setbits_le32(dest, usbc_bit);
-
-               clrbits_le32(dest, usbc_bit);
-
-               data >>= 1;
-       }
-}
-
-static void sunxi_usb_phy_config(struct sunxi_usb_phy *phy)
-{
-       /* The following comments are machine
-        * translated from Chinese, you have been warned!
-        */
-
-       /* Regulation 45 ohms */
-       if (phy->id == 0)
-               usb_phy_write(phy, 0x0c, 0x01, 1);
-
-       /* adjust PHY's magnitude and rate */
-       usb_phy_write(phy, 0x20, 0x14, 5);
-
-       /* threshold adjustment disconnect */
-#if defined CONFIG_MACH_SUN4I || defined CONFIG_MACH_SUN6I
-       usb_phy_write(phy, 0x2a, 3, 2);
-#else
-       usb_phy_write(phy, 0x2a, 2, 2);
-#endif
-
-       return;
-}
-
-static void sunxi_usb_phy_passby(int index, int enable)
-{
-       unsigned long bits = 0;
-       void *addr;
-
-       if (index == 1)
-               addr = (void *)SUNXI_USB1_BASE + SUNXI_USB_PMU_IRQ_ENABLE;
-       else
-               addr = (void *)SUNXI_USB2_BASE + SUNXI_USB_PMU_IRQ_ENABLE;
-
-       bits = SUNXI_EHCI_AHB_ICHR8_EN |
-               SUNXI_EHCI_AHB_INCR4_BURST_EN |
-               SUNXI_EHCI_AHB_INCRX_ALIGN_EN |
-               SUNXI_EHCI_ULPI_BYPASS_EN;
-
-       if (enable)
-               setbits_le32(addr, bits);
-       else
-               clrbits_le32(addr, bits);
-
-       return;
-}
-
-void sunxi_usb_phy_enable_squelch_detect(int index, int enable)
-{
-       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
-
-       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)
-{
-       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
-       struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
-
-       if (phy->id != 0)
-               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)
-{
-       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
-
-       if (phy->gpio_vbus >= 0)
-               gpio_set_value(phy->gpio_vbus, 1);
-}
-
-void sunxi_usb_phy_power_off(int index)
-{
-       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
-
-       if (phy->gpio_vbus >= 0)
-               gpio_set_value(phy->gpio_vbus, 0);
-}
-
-int sunxi_usb_phy_vbus_detect(int index)
-{
-       struct sunxi_usb_phy *phy = &sunxi_usb_phy[index];
-       int err, retries = 3;
-
-       if (phy->gpio_vbus_det < 0) {
-               eprintf("Error: invalid vbus detection pin\n");
-               return phy->gpio_vbus_det;
-       }
-
-       err = gpio_get_value(phy->gpio_vbus_det);
-       /*
-        * Vbus may have been provided by the board and just been turned of
-        * some milliseconds ago on reset, what we're measuring then is a
-        * residual charge on Vbus, sleep a bit and try again.
-        */
-       while (err > 0 && retries--) {
-               mdelay(100);
-               err = gpio_get_value(phy->gpio_vbus_det);
-       }
-
-       return err;
-}
diff --git a/arch/arm/include/asm/arch-sunxi/usb_phy.h b/arch/arm/include/asm/arch-sunxi/usb_phy.h
new file mode 100644 (file)
index 0000000..14ed081
--- /dev/null
@@ -0,0 +1,20 @@
+/*
+ * Sunxi usb-phy code
+ *
+ * Copyright (C) 2015 Hans de Goede <hdegoede@redhat.com>
+ * Copyright (C) 2014 Roman Byshko <rbyshko@gmail.com>
+ *
+ * Based on code from
+ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+int sunxi_usb_phy_probe(int index);
+int sunxi_usb_phy_remove(int index);
+void sunxi_usb_phy_init(int index);
+void sunxi_usb_phy_exit(int index);
+void sunxi_usb_phy_power_on(int index);
+void sunxi_usb_phy_power_off(int index);
+int sunxi_usb_phy_vbus_detect(int index);
+void sunxi_usb_phy_enable_squelch_detect(int index, int enable);
diff --git a/arch/arm/include/asm/arch-sunxi/usbc.h b/arch/arm/include/asm/arch-sunxi/usbc.h
deleted file mode 100644 (file)
index 14ed081..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Sunxi usb-phy code
- *
- * Copyright (C) 2015 Hans de Goede <hdegoede@redhat.com>
- * Copyright (C) 2014 Roman Byshko <rbyshko@gmail.com>
- *
- * Based on code from
- * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-int sunxi_usb_phy_probe(int index);
-int sunxi_usb_phy_remove(int index);
-void sunxi_usb_phy_init(int index);
-void sunxi_usb_phy_exit(int index);
-void sunxi_usb_phy_power_on(int index);
-void sunxi_usb_phy_power_off(int index);
-int sunxi_usb_phy_vbus_detect(int index);
-void sunxi_usb_phy_enable_squelch_detect(int index, int enable);
index 881814965b174f9f35c63af47bb5b5c44bc75bfb..be76e62d2a386ac255a87a140d20f8699b99dc67 100644 (file)
@@ -28,7 +28,7 @@
 #include <asm/arch/dram.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mmc.h>
-#include <asm/arch/usbc.h>
+#include <asm/arch/usb_phy.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <linux/usb/musb.h>
index b6fa538fb21c66511cfa9f455d42904625e3e2f9..9e74a0babfbfe2cf8d5e4ca32cd356da9ffca57f 100644 (file)
@@ -12,7 +12,7 @@
 
 #include <common.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/usbc.h>
+#include <asm/arch/usb_phy.h>
 #include <asm/io.h>
 #include "ehci.h"
 
index 4d0213a52bca01afa64f999a6b91e42df2556349..d1ee5f8d0651eac8532fcda026e3ce2cc64d5054 100644 (file)
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <watchdog.h>
 #ifdef CONFIG_ARCH_SUNXI
-#include <asm/arch/usbc.h>
+#include <asm/arch/usb_phy.h>
 #endif
 #include <asm/errno.h>
 #include <linux/usb/ch9.h>
index 5a9d39ca12c1af0c5cc9281bc7a1bd7fd0319c99..4f08f9f90680cd395b06e8e1c95c11a717aa7751 100644 (file)
@@ -24,7 +24,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/usbc.h>
+#include <asm/arch/usb_phy.h>
 #include <asm-generic/gpio.h>
 #include "linux-compat.h"
 #include "musb_core.h"