diff options
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/usb_phy.c (renamed from arch/arm/cpu/armv7/sunxi/usbc.c) | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-sunxi/usb_phy.h (renamed from arch/arm/include/asm/arch-sunxi/usbc.h) | 0 | ||||
-rw-r--r-- | board/sunxi/board.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-sunxi.c | 2 | ||||
-rw-r--r-- | drivers/usb/musb-new/musb_uboot.c | 2 | ||||
-rw-r--r-- | drivers/usb/musb-new/sunxi.c | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile index f1b619b..6a0299f 100644 --- a/arch/arm/cpu/armv7/sunxi/Makefile +++ b/arch/arm/cpu/armv7/sunxi/Makefile @@ -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/usbc.c b/arch/arm/cpu/armv7/sunxi/usb_phy.c index 71817c1..c238d38 100644 --- a/arch/arm/cpu/armv7/sunxi/usbc.c +++ b/arch/arm/cpu/armv7/sunxi/usb_phy.c @@ -13,7 +13,7 @@ #include <common.h> #include <asm/arch/clock.h> #include <asm/arch/cpu.h> -#include <asm/arch/usbc.h> +#include <asm/arch/usb_phy.h> #include <asm/gpio.h> #include <asm/io.h> #include <errno.h> diff --git a/arch/arm/include/asm/arch-sunxi/usbc.h b/arch/arm/include/asm/arch-sunxi/usb_phy.h index 14ed081..14ed081 100644 --- a/arch/arm/include/asm/arch-sunxi/usbc.h +++ b/arch/arm/include/asm/arch-sunxi/usb_phy.h diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 8818149..be76e62 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -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> diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c index b6fa538..9e74a0b 100644 --- a/drivers/usb/host/ehci-sunxi.c +++ b/drivers/usb/host/ehci-sunxi.c @@ -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" diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index 4d0213a..d1ee5f8 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -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> diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 5a9d39c..4f08f9f 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -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" |