Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: add enum usb_init_type parameter to usb_lowlevel_init

Browse Source 
This parameter will later be used to verify OTG ports.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
master
Troy Kisky 11 years ago committed by Marek Vasut
parent bba679144d
commit 06d513ecb6
17 changed files with 17 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c
  2. 2
      arch/powerpc/cpu/mpc5xxx/usb_ohci.c
  3. 2
      arch/powerpc/cpu/ppc4xx/usb_ohci.c
  4. 2
      arch/sparc/cpu/leon3/usb_uhci.c
  5. 2
      board/mpl/common/usb_uhci.c
  6. 2
      common/usb.c
  7. 2
      drivers/usb/gadget/mv_udc.c
  8. 2
      drivers/usb/host/ehci-hcd.c
  9. 2
      drivers/usb/host/isp116x-hcd.c
  10. 2
      drivers/usb/host/ohci-hcd.c
  11. 2
      drivers/usb/host/ohci-s3c24xx.c
  12. 2
      drivers/usb/host/r8a66597-hcd.c
  13. 2
      drivers/usb/host/sl811-hcd.c
  14. 2
      drivers/usb/host/xhci.c
  15. 2
      drivers/usb/musb-new/musb_uboot.c
  16. 2
      drivers/usb/musb/musb_hcd.c
  17. 2
      include/usb.h

2
arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c
Unescape View File

@ -1548,7 +1548,7 @@ static void hc_release_ohci (ohci_t *ohci)
*/ */
static char ohci_inited = 0; static char ohci_inited = 0;
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
u32 pin_func; u32 pin_func;
u32 sys_freqctrl, sys_clksrc; u32 sys_freqctrl, sys_clksrc;

2
arch/powerpc/cpu/mpc5xxx/usb_ohci.c
Unescape View File

@ -1544,7 +1544,7 @@ static void hc_release_ohci (ohci_t *ohci)
*/ */
static char ohci_inited = 0; static char ohci_inited = 0;
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
/* Set the USB Clock */ /* Set the USB Clock */

2
arch/powerpc/cpu/ppc4xx/usb_ohci.c
Unescape View File

@ -1549,7 +1549,7 @@ static void hc_release_ohci (ohci_t *ohci)
*/ */
static char ohci_inited = 0; static char ohci_inited = 0;
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
memset (&gohci, 0, sizeof (ohci_t)); memset (&gohci, 0, sizeof (ohci_t));
memset (&urb_priv, 0, sizeof (urb_priv_t)); memset (&urb_priv, 0, sizeof (urb_priv_t));

2
arch/sparc/cpu/leon3/usb_uhci.c
Unescape View File

@ -688,7 +688,7 @@ void handle_usb_interrupt(void)
/* init uhci /* init uhci
*/ */
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
unsigned char temp; unsigned char temp;
ambapp_ahbdev ahbdev; ambapp_ahbdev ahbdev;

2
board/mpl/common/usb_uhci.c
Unescape View File

@ -584,7 +584,7 @@ void handle_usb_interrupt(void)
/* init uhci /* init uhci
*/ */
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
unsigned char temp; unsigned char temp;
int busdevfunc; int busdevfunc;

2
common/usb.c
Unescape View File

@ -75,7 +75,7 @@ int usb_init(void)
for (i = 0; i < CONFIG_USB_MAX_CONTROLLER_COUNT; i++) { for (i = 0; i < CONFIG_USB_MAX_CONTROLLER_COUNT; i++) {
/* init low_level USB */ /* init low_level USB */
printf("USB%d: ", i); printf("USB%d: ", i);
if (usb_lowlevel_init(i, &ctrl)) { if (usb_lowlevel_init(i, USB_INIT_HOST, &ctrl)) {
puts("lowlevel init failed\n"); puts("lowlevel init failed\n");
continue; continue;
} }

2
drivers/usb/gadget/mv_udc.c
Unescape View File

@ -692,7 +692,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
if (driver->speed != USB_SPEED_FULL && driver->speed != USB_SPEED_HIGH) if (driver->speed != USB_SPEED_FULL && driver->speed != USB_SPEED_HIGH)
return -EINVAL; return -EINVAL;
ret = usb_lowlevel_init(0, (void **)&controller.ctrl); ret = usb_lowlevel_init(0, USB_INIT_DEVICE, (void **)&controller.ctrl);
if (ret) if (ret)
return ret; return ret;

2
drivers/usb/host/ehci-hcd.c
Unescape View File

@ -919,7 +919,7 @@ int usb_lowlevel_stop(int index)
return ehci_hcd_stop(index); return ehci_hcd_stop(index);
} }
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
uint32_t reg; uint32_t reg;
uint32_t cmd; uint32_t cmd;

2
drivers/usb/host/isp116x-hcd.c
Unescape View File

@ -1377,7 +1377,7 @@ int isp116x_check_id(struct isp116x *isp116x)
return 0; return 0;
} }
int usb_lowlevel_init(int index, void **controller)) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller))
{ {
struct isp116x *isp116x = &isp116x_dev; struct isp116x *isp116x = &isp116x_dev;

2
drivers/usb/host/ohci-hcd.c
Unescape View File

@ -1847,7 +1847,7 @@ static void hc_release_ohci(ohci_t *ohci)
*/ */
static char ohci_inited = 0; static char ohci_inited = 0;
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
#ifdef CONFIG_PCI_OHCI #ifdef CONFIG_PCI_OHCI
pci_dev_t pdev; pci_dev_t pdev;

2
drivers/usb/host/ohci-s3c24xx.c
Unescape View File

@ -1642,7 +1642,7 @@ static void hc_release_ohci(struct ohci *ohci)
*/ */
static char ohci_inited = 0; static char ohci_inited = 0;
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
struct s3c24x0_clock_power *clk_power = s3c24x0_get_base_clock_power(); struct s3c24x0_clock_power *clk_power = s3c24x0_get_base_clock_power();
struct s3c24x0_gpio *gpio = s3c24x0_get_base_gpio(); struct s3c24x0_gpio *gpio = s3c24x0_get_base_gpio();

2
drivers/usb/host/r8a66597-hcd.c
Unescape View File

@ -903,7 +903,7 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
return 0; return 0;
} }
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
struct r8a66597 *r8a66597 = &gr8a66597; struct r8a66597 *r8a66597 = &gr8a66597;

2
drivers/usb/host/sl811-hcd.c
Unescape View File

@ -194,7 +194,7 @@ static int sl811_hc_reset(void)
return 1; return 1;
} }
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
root_hub_devnum = 0; root_hub_devnum = 0;
sl811_hc_reset(); sl811_hc_reset();

2
drivers/usb/host/xhci.c
Unescape View File

@ -936,7 +936,7 @@ submit_control_msg(struct usb_device *udev, unsigned long pipe, void *buffer,
* @param index index to the host controller data structure * @param index index to the host controller data structure
* @return pointer to the intialised controller * @return pointer to the intialised controller
*/ */
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
uint32_t val; uint32_t val;
uint32_t val2; uint32_t val2;

2
drivers/usb/musb-new/musb_uboot.c
Unescape View File

@ -112,7 +112,7 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe,
return submit_urb(&hcd, urb); return submit_urb(&hcd, urb);
} }
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
u8 power; u8 power;
void *mbase; void *mbase;

2
drivers/usb/musb/musb_hcd.c
Unescape View File

@ -1089,7 +1089,7 @@ int submit_bulk_msg(struct usb_device *dev, unsigned long pipe,
/* /*
* This function initializes the usb controller module. * This function initializes the usb controller module.
*/ */
int usb_lowlevel_init(int index, void **controller) int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
{ {
u8 power; u8 power;
u32 timeout; u32 timeout;

2
include/usb.h
Unescape View File

@ -152,7 +152,7 @@ enum usb_init_type {
defined(CONFIG_USB_MUSB_DSPS) || defined(CONFIG_USB_MUSB_AM35X) || \ defined(CONFIG_USB_MUSB_DSPS) || defined(CONFIG_USB_MUSB_AM35X) || \
defined(CONFIG_USB_MUSB_OMAP2PLUS) || defined(CONFIG_USB_XHCI) defined(CONFIG_USB_MUSB_OMAP2PLUS) || defined(CONFIG_USB_XHCI)
int usb_lowlevel_init(int index, void **controller); int usb_lowlevel_init(int index, enum usb_init_type init, void **controller);
int usb_lowlevel_stop(int index); int usb_lowlevel_stop(int index);
int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, int submit_bulk_msg(struct usb_device *dev, unsigned long pipe,

Write Preview
Loading…
Cancel
Save