[lantiq] cleanup patches
[openwrt.git] / target / linux / lantiq / patches-3.3 / 0007-usb-support.patch
1 From a2089c84bb5c8ceab9a2ede7a87a97e37c308f8e Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Fri, 3 Aug 2012 09:53:45 +0200
4 Subject: [PATCH 07/25] usb support
5
6 ---
7  drivers/usb/Kconfig    |    4 ++++
8  drivers/usb/Makefile   |    4 ++++
9  drivers/usb/core/hub.c |    4 ++--
10  3 files changed, 10 insertions(+), 2 deletions(-)
11
12 diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
13 index 75823a1..f69cc4a 100644
14 --- a/drivers/usb/Kconfig
15 +++ b/drivers/usb/Kconfig
16 @@ -130,6 +130,8 @@ source "drivers/usb/wusbcore/Kconfig"
17  
18  source "drivers/usb/host/Kconfig"
19  
20 +source "drivers/usb/dwc_otg/Kconfig"
21 +
22  source "drivers/usb/musb/Kconfig"
23  
24  source "drivers/usb/renesas_usbhs/Kconfig"
25 @@ -182,4 +184,6 @@ source "drivers/usb/gadget/Kconfig"
26  
27  source "drivers/usb/otg/Kconfig"
28  
29 +source "drivers/usb/ifxhcd/Kconfig"
30 +
31  endif # USB_SUPPORT
32 diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
33 index 53a7bc0..7068e99 100644
34 --- a/drivers/usb/Makefile
35 +++ b/drivers/usb/Makefile
36 @@ -32,6 +32,8 @@ obj-$(CONFIG_USB_C67X00_HCD)  += c67x00/
37  
38  obj-$(CONFIG_USB_WUSB)         += wusbcore/
39  
40 +obj-$(CONFIG_DWC_OTG)           += dwc_otg/
41 +
42  obj-$(CONFIG_USB_ACM)          += class/
43  obj-$(CONFIG_USB_PRINTER)      += class/
44  obj-$(CONFIG_USB_WDM)          += class/
45 @@ -56,3 +58,5 @@ obj-$(CONFIG_USB_RENESAS_USBHS)       += renesas_usbhs/
46  obj-$(CONFIG_USB_GADGET)       += gadget/
47  
48  obj-$(CONFIG_USB_COMMON)       += usb-common.o
49 +
50 +obj-$(CONFIG_USB_HOST_IFX)     += ifxhcd/
51 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
52 index ce5e147..463da23 100644
53 --- a/drivers/usb/core/hub.c
54 +++ b/drivers/usb/core/hub.c
55 @@ -2939,11 +2939,11 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
56                 udev->ttport = hdev->ttport;
57         } else if (udev->speed != USB_SPEED_HIGH
58                         && hdev->speed == USB_SPEED_HIGH) {
59 -               if (!hub->tt.hub) {
60 +/*             if (!hub->tt.hub) {
61                         dev_err(&udev->dev, "parent hub has no TT\n");
62                         retval = -EINVAL;
63                         goto fail;
64 -               }
65 +               }*/
66                 udev->tt = &hub->tt;
67                 udev->ttport = port1;
68         }
69 -- 
70 1.7.9.1
71