summaryrefslogtreecommitdiff
path: root/drivers/usb/musb/musb_hcd.c
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2015-08-04 17:04:06 +0200
committerMarek Vasut <marex@denx.de>2015-08-05 17:20:34 +0200
commit95de1e2f26b562156210833ff667be6d071de019 (patch)
tree530344b5a4facba0eeb493123b2be8f752654103 /drivers/usb/musb/musb_hcd.c
parent68f7c5db2d1e714c15b49b0759ddef8f8344f184 (diff)
downloadu-boot-imx-95de1e2f26b562156210833ff667be6d071de019.zip
u-boot-imx-95de1e2f26b562156210833ff667be6d071de019.tar.gz
u-boot-imx-95de1e2f26b562156210833ff667be6d071de019.tar.bz2
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 'drivers/usb/musb/musb_hcd.c')
-rw-r--r--drivers/usb/musb/musb_hcd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index f0ba8aa..9a3b61a 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -117,7 +117,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
{
u16 csr;
int result = 1;
- int timeout = CONFIG_MUSB_TIMEOUT;
+ int timeout = CONFIG_USB_MUSB_TIMEOUT;
while (result > 0) {
csr = readw(&musbr->txcsr);
@@ -179,7 +179,7 @@ static int wait_until_ep0_ready(struct usb_device *dev, u32 bit_mask)
static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
{
u16 csr;
- int timeout = CONFIG_MUSB_TIMEOUT;
+ int timeout = CONFIG_USB_MUSB_TIMEOUT;
do {
if (check_stall(ep, 1)) {
@@ -211,7 +211,7 @@ static int wait_until_txep_ready(struct usb_device *dev, u8 ep)
static int wait_until_rxep_ready(struct usb_device *dev, u8 ep)
{
u16 csr;
- int timeout = CONFIG_MUSB_TIMEOUT;
+ int timeout = CONFIG_USB_MUSB_TIMEOUT;
do {
if (check_stall(ep, 0)) {