diff options
| author | Lucas Stach <dev@lynxeye.de> | 2012-09-26 00:14:34 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:54:00 -0700 |
| commit | c7e3b2b58636704d504ac270031d87b716d8b273 (patch) | |
| tree | ccbba6153c289fdb23ce766b80094b0a98d53bd2 /arch/sparc | |
| parent | 5527efe501c117fc86273e2d7c7b6f30884015c3 (diff) | |
| download | olio-uboot-2014.01-c7e3b2b58636704d504ac270031d87b716d8b273.tar.xz olio-uboot-2014.01-c7e3b2b58636704d504ac270031d87b716d8b273.zip | |
usb: lowlevel interface change to support multiple controllers
Carry an index in the lowlevel usb functions to make specify the
respective usb controller.
Also pass through an controller struct from lowlevel_init to the
creation of the root usb device of this controller.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/cpu/leon3/usb_uhci.c | 4 | ||||
| -rw-r--r-- | arch/sparc/lib/bootm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/cpu/leon3/usb_uhci.c b/arch/sparc/cpu/leon3/usb_uhci.c index 62cc25dc9..b3b8a4d0b 100644 --- a/arch/sparc/cpu/leon3/usb_uhci.c +++ b/arch/sparc/cpu/leon3/usb_uhci.c @@ -706,7 +706,7 @@ void handle_usb_interrupt(void) /* init uhci */ -int usb_lowlevel_init(void) +int usb_lowlevel_init(int index, void **controller) { unsigned char temp; ambapp_ahbdev ahbdev; @@ -745,7 +745,7 @@ int usb_lowlevel_init(void) /* stop uhci */ -int usb_lowlevel_stop(void) +int usb_lowlevel_stop(int index) { if (grusb_irq == -1) return 1; diff --git a/arch/sparc/lib/bootm.c b/arch/sparc/lib/bootm.c index e5b933d1d..bcc63584b 100644 --- a/arch/sparc/lib/bootm.c +++ b/arch/sparc/lib/bootm.c @@ -36,7 +36,7 @@ extern void srmmu_init_cpu(unsigned int entry); extern void prepare_bootargs(char *bootargs); #ifdef CONFIG_USB_UHCI -extern int usb_lowlevel_stop(void); +extern int usb_lowlevel_stop(int index); #endif /* sparc kernel argument (the ROM vector) */ |