usb: rename board_usb_init_type to usb_init_type

This will be used by usb_lowlevel_init so it will
no longer be used by only board specific functions.

Move definition of enum usb_init_type higher in file
so that it will be available for usb_low_level_init.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
This commit is contained in:
Troy Kisky 2013-10-10 15:27:55 -07:00 committed by Marek Vasut
parent ea02b653c2
commit bba679144d
11 changed files with 31 additions and 31 deletions

View file

@ -189,7 +189,7 @@ int board_early_init_f(void)
} }
#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT)
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
struct board_bcsr *bcsr_data = struct board_bcsr *bcsr_data =
(struct board_bcsr *)CONFIG_SYS_BCSR_BASE; (struct board_bcsr *)CONFIG_SYS_BCSR_BASE;
@ -230,7 +230,7 @@ int usb_board_stop(void)
return 0; return 0;
} }
int board_usb_cleanup(int index, enum board_usb_init_type init) int board_usb_cleanup(int index, enum usb_init_type init)
{ {
return usb_board_stop(); return usb_board_stop();
} }

View file

@ -60,7 +60,7 @@ void dram_init_banksize(void)
} }
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) & writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) &
~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
@ -91,7 +91,7 @@ int board_usb_init(int index, enum board_usb_init_type init)
return 0; return 0;
} }
int board_usb_cleanup(int index, enum board_usb_init_type init) int board_usb_cleanup(int index, enum usb_init_type init)
{ {
return 0; return 0;
} }

View file

@ -429,7 +429,7 @@ void reset_phy(void)
} }
#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT)
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
return 0; return 0;
} }
@ -454,7 +454,7 @@ int usb_board_stop(void)
return 0; return 0;
} }
int board_usb_cleanup(int index, enum board_usb_init_type init) int board_usb_cleanup(int index, enum usb_init_type init)
{ {
return usb_board_stop(); return usb_board_stop();
} }

View file

@ -822,7 +822,7 @@ int bootstrap_eeprom_read (unsigned dev_addr, unsigned offset,
} }
#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT) #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_BOARD_INIT)
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
char *act = getenv("usbact"); char *act = getenv("usbact");
int i; int i;
@ -846,7 +846,7 @@ int usb_board_stop(void)
return 0; return 0;
} }
int board_usb_cleanup(int index, enum board_usb_init_type init) int board_usb_cleanup(int index, enum usb_init_type init)
{ {
return usb_board_stop(); return usb_board_stop();
} }

View file

@ -59,7 +59,7 @@ int board_mmc_init(bd_t *bis)
#endif #endif
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) & writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
@ -90,7 +90,7 @@ int board_usb_init(int index, enum board_usb_init_type init)
return 0; return 0;
} }
int board_usb_cleanup(int index, enum board_usb_init_type init) int board_usb_cleanup(int index, enum usb_init_type init)
{ {
return 0; return 0;
} }

View file

@ -496,7 +496,7 @@ struct s3c_plat_otg_data s5pc210_otg_data = {
.usb_flags = PHY0_SLEEP, .usb_flags = PHY0_SLEEP,
}; };
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
debug("USB_udc_probe\n"); debug("USB_udc_probe\n");
return s3c_udc_probe(&s5pc210_otg_data); return s3c_udc_probe(&s5pc210_otg_data);

View file

@ -40,7 +40,7 @@ int dram_init(void)
} }
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) & writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) &
~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
@ -71,7 +71,7 @@ int board_usb_init(int index, enum board_usb_init_type init)
return 0; return 0;
} }
int board_usb_cleanup(int index, enum board_usb_init_type init) int board_usb_cleanup(int index, enum usb_init_type init)
{ {
return 0; return 0;
} }

View file

@ -43,7 +43,7 @@ extern struct serial_device serial_stuart_device;
* Miscelaneous platform dependent initialisations * Miscelaneous platform dependent initialisations
*/ */
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) & writel((readl(UHCHR) | UHCHR_PCPL | UHCHR_PSPL) &
~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
@ -70,7 +70,7 @@ int board_usb_init(int index, enum board_usb_init_type init)
return 0; return 0;
} }
int board_usb_cleanup(int index, enum board_usb_init_type init) int board_usb_cleanup(int index, enum usb_init_type init)
{ {
return 0; return 0;
} }

View file

@ -67,7 +67,7 @@ int board_mmc_init(bd_t *bis)
#endif #endif
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) & writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE), ~(UHCHR_SSEP0 | UHCHR_SSEP1 | UHCHR_SSEP2 | UHCHR_SSE),
@ -98,7 +98,7 @@ int board_usb_init(int index, enum board_usb_init_type init)
return 0; return 0;
} }
int board_usb_cleanup(int index, enum board_usb_init_type init) int board_usb_cleanup(int index, enum usb_init_type init)
{ {
return 0; return 0;
} }

View file

@ -1068,7 +1068,7 @@ int usb_new_device(struct usb_device *dev)
} }
__weak __weak
int board_usb_init(int index, enum board_usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
return 0; return 0;
} }

View file

@ -129,6 +129,16 @@ struct usb_device {
unsigned int slot_id; unsigned int slot_id;
}; };
/*
* You can initialize platform's USB host or device
* ports by passing this enum as an argument to
* board_usb_init().
*/
enum usb_init_type {
USB_INIT_HOST,
USB_INIT_DEVICE
};
/********************************************************************** /**********************************************************************
* this is how the lowlevel part communicate with the outer world * this is how the lowlevel part communicate with the outer world
*/ */
@ -169,16 +179,6 @@ extern void udc_disconnect(void);
#endif #endif
/*
* You can initialize platform's USB host or device
* ports by passing this enum as an argument to
* board_usb_init().
*/
enum board_usb_init_type {
USB_INIT_HOST,
USB_INIT_DEVICE
};
/* /*
* board-specific hardware initialization, called by * board-specific hardware initialization, called by
* usb drivers and u-boot commands * usb drivers and u-boot commands
@ -186,16 +186,16 @@ enum board_usb_init_type {
* @param index USB controller number * @param index USB controller number
* @param init initializes controller as USB host or device * @param init initializes controller as USB host or device
*/ */
int board_usb_init(int index, enum board_usb_init_type init); int board_usb_init(int index, enum usb_init_type init);
/* /*
* can be used to clean up after failed USB initialization attempt * can be used to clean up after failed USB initialization attempt
* vide: board_usb_init() * vide: board_usb_init()
* *
* @param index USB controller number for selective cleanup * @param index USB controller number for selective cleanup
* @param init board_usb_init_type passed to board_usb_init() * @param init usb_init_type passed to board_usb_init()
*/ */
int board_usb_cleanup(int index, enum board_usb_init_type init); int board_usb_cleanup(int index, enum usb_init_type init);
#ifdef CONFIG_USB_STORAGE #ifdef CONFIG_USB_STORAGE