diff options
| author | Paul Kocialkowski <contact@paulk.fr> | 2015-08-04 15:04:06 (GMT) |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2015-08-05 15:20:34 (GMT) |
| commit | 95de1e2f26b562156210833ff667be6d071de019 (patch) | |
| tree | 530344b5a4facba0eeb493123b2be8f752654103 /arch/arm | |
| parent | 68f7c5db2d1e714c15b49b0759ddef8f8344f184 (diff) | |
| download | u-boot-95de1e2f26b562156210833ff667be6d071de019.tar.xz | |
usb: musb-new: CONFIG_MUSB prefix replacement with CONFIG_USB_MUSB
USB-related options are usually prefixed with CONFIG_USB and platform-specific
adaptation for the MUSB controller already have a CONFIG_USB_MUSB prefix, so
this switches all MUSB-related options to a CONFIG_USB_MUSB prefix, for
consistency.
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv7/am33xx/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/usb_phy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index 67bef23..377c611 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -124,7 +124,7 @@ int cpu_mmc_init(bd_t *bis) #endif /* AM33XX has two MUSB controllers which can be host or gadget */ -#if (defined(CONFIG_MUSB_GADGET) || defined(CONFIG_MUSB_HOST)) && \ +#if (defined(CONFIG_USB_MUSB_GADGET) || defined(CONFIG_USB_MUSB_HOST)) && \ (defined(CONFIG_AM335X_USB0) || defined(CONFIG_AM335X_USB1)) static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; diff --git a/arch/arm/include/asm/arch-sunxi/usb_phy.h b/arch/arm/include/asm/arch-sunxi/usb_phy.h index 17d31b8..cef6c98 100644 --- a/arch/arm/include/asm/arch-sunxi/usb_phy.h +++ b/arch/arm/include/asm/arch-sunxi/usb_phy.h @@ -21,7 +21,7 @@ int sunxi_usb_phy_id_detect(int index); void sunxi_usb_phy_enable_squelch_detect(int index, int enable); /* Not really phy related, but we have to declare this somewhere ... */ -#if defined(CONFIG_MUSB_HOST) || defined(CONFIG_MUSB_GADGET) +#if defined(CONFIG_USB_MUSB_HOST) || defined(CONFIG_USB_MUSB_GADGET) void sunxi_musb_board_init(void); #else #define sunxi_musb_board_init() |