diff options
| author | Benoît Thébaudeau <benoit.thebaudeau@advansee.com> | 2012-11-13 09:58:35 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-11-16 09:16:46 +0100 |
| commit | f22e4fae19c05ae66c83b846fee66a1b8fbc5a9b (patch) | |
| tree | 35a4576a1e92878bbd63c5249469bc9919222afd /drivers/usb | |
| parent | 961a762838d55dc9bae8fa7ea57bc3c51a9c7b57 (diff) | |
| download | talos-obmc-uboot-f22e4fae19c05ae66c83b846fee66a1b8fbc5a9b.tar.gz talos-obmc-uboot-f22e4fae19c05ae66c83b846fee66a1b8fbc5a9b.zip | |
ehci-mx5/6: Make board_ehci_hcd_init() optional
A custom board_ehci_hcd_init() may be unneeded, so add a weak default
implementation doing nothing.
By the way, use simple __weak from linux/compiler.h for
board_ehci_hcd_postinit() instead of weak alias with full attribute.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ehci-mx5.c | 8 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-mx6.c | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index 7e60c3c3bf..adbed5c90c 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -290,12 +290,14 @@ int mxc_set_usbcontrol(int port, unsigned int flags) return ret; } -void __board_ehci_hcd_postinit(struct usb_ehci *ehci, int port) +int __weak board_ehci_hcd_init(int port) { + return 0; } -void board_ehci_hcd_postinit(struct usb_ehci *ehci, int port) - __attribute((weak, alias("__board_ehci_hcd_postinit"))); +void __weak board_ehci_hcd_postinit(struct usb_ehci *ehci, int port) +{ +} int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) { diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 9ce25da598..1b20e4185c 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -159,6 +159,11 @@ static void usbh1_oc_config(void) __raw_writel(val, usbother_base + USB_H1_CTRL_OFFSET); } +int __weak board_ehci_hcd_init(int port) +{ + return 0; +} + int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) { struct usb_ehci *ehci; |
