From 2aacc4239c32aa732621f3a432d576c68c3016d8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 27 Apr 2015 15:05:10 +0200 Subject: [PATCH] sunxi: usb: Rename the usbc.? files to usb_phy.? The usbc.? files now only contain usb-phy related code, rename them to make this clear. Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- arch/arm/cpu/armv7/sunxi/Makefile | 2 +- arch/arm/cpu/armv7/sunxi/{usbc.c => usb_phy.c} | 2 +- arch/arm/include/asm/arch-sunxi/{usbc.h => usb_phy.h} | 0 board/sunxi/board.c | 2 +- drivers/usb/host/ehci-sunxi.c | 2 +- drivers/usb/musb-new/musb_uboot.c | 2 +- drivers/usb/musb-new/sunxi.c | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm/cpu/armv7/sunxi/{usbc.c => usb_phy.c} (99%) rename arch/arm/include/asm/arch-sunxi/{usbc.h => usb_phy.h} (100%) diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile index f1b619b4dc..6a0299fe1c 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 similarity index 99% rename from arch/arm/cpu/armv7/sunxi/usbc.c rename to arch/arm/cpu/armv7/sunxi/usb_phy.c index 71817c192a..c238d38a1a 100644 --- a/arch/arm/cpu/armv7/sunxi/usbc.c +++ b/arch/arm/cpu/armv7/sunxi/usb_phy.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/include/asm/arch-sunxi/usbc.h b/arch/arm/include/asm/arch-sunxi/usb_phy.h similarity index 100% rename from arch/arm/include/asm/arch-sunxi/usbc.h rename to arch/arm/include/asm/arch-sunxi/usb_phy.h diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 881814965b..be76e62d2a 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c index b6fa538fb2..9e74a0babf 100644 --- a/drivers/usb/host/ehci-sunxi.c +++ b/drivers/usb/host/ehci-sunxi.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include "ehci.h" diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index 4d0213a52b..d1ee5f8d06 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -1,7 +1,7 @@ #include #include #ifdef CONFIG_ARCH_SUNXI -#include +#include #endif #include #include diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 5a9d39ca12..4f08f9f906 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "linux-compat.h" #include "musb_core.h" -- 2.30.2