Changeset 31089 for trunk


Ignore:
Timestamp:
2012-03-27T17:38:56+02:00 (5 years ago)
Author:
hauke
Message:

brcm47xx: update usb driver to the version send for mainline kernel integartion

Location:
trunk/target/linux/brcm47xx/patches-3.2
Files:
1 deleted
6 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-3.2/180-USB-OHCI-Add-a-generic-platform-device-driver.patch

    r31088 r31089  
    1 From 2232a2ab6015496fecdfad68a9d6794312a9b2f2 Mon Sep 17 00:00:00 2001 
    2 From: Hauke Mehrtens <hauke@hauke-m.de> 
    3 Date: Sat, 26 Nov 2011 21:20:54 +0100 
    4 Subject: [PATCH 181/186] USB: OHCI: Add a generic platform device driver 
    5  
    6 This adds a generic driver for platform devices. It works like the PCI 
    7 driver and is based on it. This is for devices which do not have an own 
    8 bus but their OHCI controller works like a PCI controller. It will be 
    9 used for the Broadcom bcma and ssb USB OHCI controller. 
    10  
    11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
    12 --- 
    13  drivers/usb/host/Kconfig         |   10 ++ 
    14  drivers/usb/host/ohci-hcd.c      |    5 + 
    15  drivers/usb/host/ohci-platform.c |  183 ++++++++++++++++++++++++++++++++++++++ 
    16  3 files changed, 198 insertions(+), 0 deletions(-) 
    17  create mode 100644 drivers/usb/host/ohci-platform.c 
    18  
    191--- a/drivers/usb/host/Kconfig 
    202+++ b/drivers/usb/host/Kconfig 
     
    246  
    257+config USB_OHCI_HCD_PLATFORM 
    26 +       bool "OHCI driver for a platform device" 
     8+       bool "Generic OHCI driver for a platform device" 
    279+       depends on USB_OHCI_HCD && EXPERIMENTAL 
    2810+       default n 
     
    5234--- /dev/null 
    5335+++ b/drivers/usb/host/ohci-platform.c 
    54 @@ -0,0 +1,183 @@ 
     36@@ -0,0 +1,194 @@ 
    5537+/* 
    5638+ * Generic platform ohci driver 
     
    6951+ */ 
    7052+#include <linux/platform_device.h> 
    71 +#include <linux/usb/hci_driver.h> 
     53+#include <linux/usb/ohci_pdriver.h> 
    7254+ 
    7355+static int ohci_platform_reset(struct usb_hcd *hcd) 
    7456+{ 
     57+       struct platform_device *pdev = to_platform_device(hcd->self.controller); 
     58+       struct usb_ohci_pdata *pdata = pdev->dev.platform_data; 
    7559+       struct ohci_hcd *ohci = hcd_to_ohci(hcd); 
    7660+       int err; 
     61+ 
     62+       if (pdata->big_endian_desc) 
     63+               ohci->flags |= OHCI_QUIRK_BE_DESC; 
     64+       if (pdata->big_endian_mmio) 
     65+               ohci->flags |= OHCI_QUIRK_BE_MMIO; 
     66+       if (pdata->no_big_frame_no) 
     67+               ohci->flags |= OHCI_QUIRK_FRAME_NO; 
    7768+ 
    7869+       ohci_hcd_init(ohci); 
     
    131122+       int irq; 
    132123+       int err = -ENOMEM; 
     124+ 
     125+       BUG_ON(!dev->dev.platform_data); 
    133126+ 
    134127+       if (usb_disabled()) 
     
    236229+       } 
    237230+}; 
     231--- /dev/null 
     232+++ b/include/linux/usb/ohci_pdriver.h 
     233@@ -0,0 +1,38 @@ 
     234+/* 
     235+ * Copyright (C) 2012 Hauke Mehrtens <hauke@hauke-m.de> 
     236+ * 
     237+ * This program is free software; you can redistribute it and/or modify it 
     238+ * under the terms of the GNU General Public License as published by the 
     239+ * Free Software Foundation; either version 2 of the License, or (at your 
     240+ * option) any later version. 
     241+ * 
     242+ * This program is distributed in the hope that it will be useful, but 
     243+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
     244+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
     245+ * for more details. 
     246+ * 
     247+ * You should have received a copy of the GNU General Public License 
     248+ * along with this program; if not, write to the Free Software Foundation, 
     249+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
     250+ */ 
     251+ 
     252+#ifndef __USB_CORE_OHCI_PDRIVER_H 
     253+#define __USB_CORE_OHCI_PDRIVER_H 
     254+ 
     255+/** 
     256+ * struct usb_ohci_pdata - platform_data for generic ohci driver 
     257+ * 
     258+ * @big_endian_desc:   BE descriptors 
     259+ * @big_endian_mmio:   BE registers 
     260+ * @no_big_frame_no:   no big endian frame_no shift 
     261+ * 
     262+ * These are general configuration options for the OHCI controller. All of 
     263+ * these options are activating more or less workarounds for some hardware. 
     264+ */ 
     265+struct usb_ohci_pdata { 
     266+       unsigned        big_endian_desc:1; 
     267+       unsigned        big_endian_mmio:1; 
     268+       unsigned        no_big_frame_no:1; 
     269+}; 
     270+ 
     271+#endif /* __USB_CORE_OHCI_PDRIVER_H */ 
  • trunk/target/linux/brcm47xx/patches-3.2/181-USB-EHCI-Add-a-generic-platform-device-driver.patch

    r31088 r31089  
    1 From 1be00523336ac484c52681f838dfb8a76e8531cd Mon Sep 17 00:00:00 2001 
    2 From: Hauke Mehrtens <hauke@hauke-m.de> 
    3 Date: Sat, 26 Nov 2011 21:28:56 +0100 
    4 Subject: [PATCH 182/186] USB: EHCI: Add a generic platform device driver 
    5  
    6 This adds a generic driver for platform devices. It works like the PCI 
    7 driver and is based on it. This is for devices which do not have an own 
    8 bus but their EHCI controller works like a PCI controller. It will be 
    9 used for the Broadcom bcma and ssb USB EHCI controller. 
    10  
    11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
    12 --- 
    13  drivers/usb/host/Kconfig         |   10 ++ 
    14  drivers/usb/host/ehci-hcd.c      |    5 + 
    15  drivers/usb/host/ehci-platform.c |  199 ++++++++++++++++++++++++++++++++++++++ 
    16  3 files changed, 214 insertions(+), 0 deletions(-) 
    17  create mode 100644 drivers/usb/host/ehci-platform.c 
    18  
    191--- a/drivers/usb/host/Kconfig 
    202+++ b/drivers/usb/host/Kconfig 
     
    5234--- /dev/null 
    5335+++ b/drivers/usb/host/ehci-platform.c 
    54 @@ -0,0 +1,199 @@ 
     36@@ -0,0 +1,198 @@ 
    5537+/* 
    5638+ * Generic platform ehci driver 
     
    7456+ */ 
    7557+#include <linux/platform_device.h> 
    76 +#include <linux/usb/hci_driver.h> 
     58+#include <linux/usb/ehci_pdriver.h> 
    7759+ 
    7860+static int ehci_platform_reset(struct usb_hcd *hcd) 
    7961+{ 
    8062+       struct platform_device *pdev = to_platform_device(hcd->self.controller); 
    81 +       struct usb_hci_pdata *pdata = pdev->dev.platform_data; 
     63+       struct usb_ehci_pdata *pdata = pdev->dev.platform_data; 
    8264+       struct ehci_hcd *ehci = hcd_to_ehci(hcd); 
    83 +       int caps_offset = 0; 
    84 +       int flags = 0; 
    8565+       int retval; 
    8666+ 
    87 +       if (pdata) { 
    88 +               caps_offset = pdata->caps_offset; 
    89 +               flags = pdata->flags; 
    90 +       } 
    91 + 
    92 +       if (flags & USB_HCI_PDATA_HAS_TT_SET) 
    93 +               hcd->has_tt = pdata->has_tt; 
    94 + 
    95 +       ehci->caps = hcd->regs + caps_offset; 
     67+       hcd->has_tt = pdata->has_tt; 
     68+       ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug; 
     69+       ehci->big_endian_desc = pdata->big_endian_desc; 
     70+       ehci->big_endian_mmio = pdata->big_endian_mmio; 
     71+ 
     72+       ehci->caps = hcd->regs + pdata->caps_offset; 
    9673+       retval = ehci_setup(hcd); 
    9774+       if (retval) 
    9875+               return retval; 
    9976+ 
    100 +       if (flags & USB_HCI_PDATA_PORT_POWER_SET) 
    101 +               ehci_port_power(ehci, pdata->power_set_is_on); 
     77+       if (pdata->port_power_on) 
     78+               ehci_port_power(ehci, 1); 
     79+       if (pdata->port_power_off) 
     80+               ehci_port_power(ehci, 0); 
    10281+ 
    10382+       return 0; 
     
    144123+       int irq; 
    145124+       int err = -ENOMEM; 
     125+ 
     126+       BUG_ON(!dev->dev.platform_data); 
    146127+ 
    147128+       if (usb_disabled()) 
     
    252233+       } 
    253234+}; 
     235--- /dev/null 
     236+++ b/include/linux/usb/ehci_pdriver.h 
     237@@ -0,0 +1,46 @@ 
     238+/* 
     239+ * Copyright (C) 2012 Hauke Mehrtens <hauke@hauke-m.de> 
     240+ * 
     241+ * This program is free software; you can redistribute it and/or modify it 
     242+ * under the terms of the GNU General Public License as published by the 
     243+ * Free Software Foundation; either version 2 of the License, or (at your 
     244+ * option) any later version. 
     245+ * 
     246+ * This program is distributed in the hope that it will be useful, but 
     247+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
     248+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
     249+ * for more details. 
     250+ * 
     251+ * You should have received a copy of the GNU General Public License 
     252+ * along with this program; if not, write to the Free Software Foundation, 
     253+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
     254+ */ 
     255+ 
     256+#ifndef __USB_CORE_EHCI_PDRIVER_H 
     257+#define __USB_CORE_EHCI_PDRIVER_H 
     258+ 
     259+/** 
     260+ * struct usb_ehci_pdata - platform_data for generic ehci driver 
     261+ * 
     262+ * @caps_offset:       offset of the EHCI Capability Registers to the start of 
     263+ *                     the io memory region provided to the driver. 
     264+ * @has_tt:            set to 1 if TT is integrated in root hub. 
     265+ * @port_power_on:     set to 1 if the controller needs a power up after 
     266+ *                     initialization. 
     267+ * @port_power_off:    set to 1 if the controller needs to be powered down 
     268+ *                     after initialization. 
     269+ * 
     270+ * These are general configuration options for the EHCI controller. All of 
     271+ * these options are activating more or less workarounds for some hardware. 
     272+ */ 
     273+struct usb_ehci_pdata { 
     274+       int             caps_offset; 
     275+       unsigned        has_tt:1; 
     276+       unsigned        has_synopsys_hc_bug:1; 
     277+       unsigned        big_endian_desc:1; 
     278+       unsigned        big_endian_mmio:1; 
     279+       unsigned        port_power_on:1; 
     280+       unsigned        port_power_off:1; 
     281+}; 
     282+ 
     283+#endif /* __USB_CORE_EHCI_PDRIVER_H */ 
  • trunk/target/linux/brcm47xx/patches-3.2/182-bcma-scan-for-extra-address-space.patch

    r31088 r31089  
    1 From adebff2358c2b631fc04e31ba87eee48e546c655 Mon Sep 17 00:00:00 2001 
    2 From: Hauke Mehrtens <hauke@hauke-m.de> 
    3 Date: Sun, 20 Nov 2011 18:22:35 +0100 
    4 Subject: [PATCH 183/186] bcma: scan for extra address space 
    5  
    6 Some cores like the USB core have two address spaces. In the USB host 
    7 controller one address space is used for the OHCI and the other for the 
    8 EHCI controller interface. The USB controller is the only core I found 
    9 with two address spaces. This code is based on the AI scan function 
    10 ai_scan() in shared/aiutils.c i the Broadcom SDK. 
    11  
    12 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
    13 --- 
    14  drivers/bcma/scan.c       |   18 +++++++++++++++++- 
    15  include/linux/bcma/bcma.h |    1 + 
    16  2 files changed, 18 insertions(+), 1 deletions(-) 
    17  
    181--- a/drivers/bcma/scan.c 
    192+++ b/drivers/bcma/scan.c 
    20 @@ -297,6 +297,22 @@ static int bcma_get_next_core(struct bcm 
     3@@ -297,6 +297,23 @@ static int bcma_get_next_core(struct bcm 
    214                        return -EILSEQ; 
    225        } 
    236  
    24 + 
    257+       /* First Slave Address Descriptor should be port 0: 
    268+        * the main register space for the core 
     
    3113+               tmp = bcma_erom_get_addr_desc(bus, eromptr, 
    3214+                                             SCAN_ADDR_TYPE_BRIDGE, 0); 
    33 +               if (tmp > 0) { 
    34 +                       pr_info("found bridge"); 
     15+               if (tmp <= 0) { 
     16+                       return -EILSEQ; 
     17+               } else { 
     18+                       pr_info("Bridge found\n"); 
    3519+                       return -ENXIO; 
    3620+               } 
     
    4125        for (i = 0; i < ports[1]; i++) { 
    4226                for (j = 0; ; j++) { 
    43 @@ -309,7 +325,7 @@ static int bcma_get_next_core(struct bcm 
     27@@ -309,7 +326,7 @@ static int bcma_get_next_core(struct bcm 
    4428                                break; 
    4529                        } else { 
  • trunk/target/linux/brcm47xx/patches-3.2/183-USB-Add-driver-for-the-bcma-bus.patch

    r31088 r31089  
    1 From 70fc4b2a6200ef7a1b99a6aa28234b919f23b43c Mon Sep 17 00:00:00 2001 
    2 From: Hauke Mehrtens <hauke@hauke-m.de> 
    3 Date: Sat, 26 Nov 2011 21:33:41 +0100 
    4 Subject: [PATCH 184/186] USB: Add driver for the bcma bus 
    5  
    6 This adds a USB driver using the generic platform device driver for the 
    7 USB controller found on the Broadcom bcma bus. The bcma bus just 
    8 exposes one device which serves the OHCI and the EHCI controller at the 
    9 same time. This driver probes for this USB controller and creates and 
    10 registers two new platform devices which will be probed by the new 
    11 generic platform device driver. This makes it possible to use the EHCI 
    12 and the OCHI controller on the bcma bus at the same time. 
    13  
    14 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
    15 --- 
    16  drivers/usb/host/Kconfig    |   12 ++ 
    17  drivers/usb/host/Makefile   |    1 + 
    18  drivers/usb/host/bcma-hcd.c |  328 +++++++++++++++++++++++++++++++++++++++++++ 
    19  3 files changed, 341 insertions(+), 0 deletions(-) 
    20  create mode 100644 drivers/usb/host/bcma-hcd.c 
    21  
    221--- a/drivers/usb/host/Kconfig 
    232+++ b/drivers/usb/host/Kconfig 
     
    4726--- /dev/null 
    4827+++ b/drivers/usb/host/bcma-hcd.c 
    49 @@ -0,0 +1,328 @@ 
     28@@ -0,0 +1,334 @@ 
    5029+/* 
    5130+ * Broadcom specific Advanced Microcontroller Bus 
    5231+ * Broadcom USB-core driver (BCMA bus glue) 
    5332+ * 
    54 + * Copyright 2011 Hauke Mehrtens <hauke@hauke-m.de> 
     33+ * Copyright 2011-2012 Hauke Mehrtens <hauke@hauke-m.de> 
    5534+ * 
    5635+ * Based on ssb-ohci driver 
     
    7251+#include <linux/platform_device.h> 
    7352+#include <linux/module.h> 
    74 +#include <linux/usb/hci_driver.h> 
     53+#include <linux/usb/ehci_pdriver.h> 
     54+#include <linux/usb/ohci_pdriver.h> 
    7555+ 
    7656+MODULE_AUTHOR("Hauke Mehrtens"); 
     
    207187+} 
    208188+ 
    209 +static const struct usb_hci_pdata p_data = { 
    210 +       .flags = USB_HCI_PDATA_PORT_POWER_SET, 
    211 +       .power_set_is_on = 1, 
     189+static const struct usb_ehci_pdata ehci_pdata = { 
     190+}; 
     191+ 
     192+static const struct usb_ohci_pdata ohci_pdata = { 
    212193+}; 
    213194+ 
    214195+static struct platform_device * __devinit 
    215 +bcma_hcd_create_pdev(struct bcma_device *dev, char *name, u32 addr) 
     196+bcma_hcd_create_pdev(struct bcma_device *dev, bool ohci, u32 addr) 
    216197+{ 
    217198+       struct platform_device *hci_dev; 
     
    228209+       hci_res[1].flags = IORESOURCE_IRQ; 
    229210+ 
    230 +       hci_dev = platform_device_alloc(name, 0); 
     211+       hci_dev = platform_device_alloc(ohci ? "ohci-platform" : 
     212+                                       "ehci-platform" , 0); 
    231213+       if (!hci_dev) 
    232214+               return NULL; 
     
    239221+       if (ret) 
    240222+               goto err_alloc; 
    241 +       ret = platform_device_add_data(hci_dev, &p_data, sizeof(p_data)); 
     223+       if (ohci) 
     224+               ret = platform_device_add_data(hci_dev, &ohci_pdata, 
     225+                                              sizeof(ohci_pdata)); 
     226+       else 
     227+               ret = platform_device_add_data(hci_dev, &ehci_pdata, 
     228+                                              sizeof(ehci_pdata)); 
    242229+       if (ret) 
    243230+               goto err_alloc; 
     
    285272+               ohci_addr = 0x18009000; 
    286273+ 
    287 +       usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, "ohci-platform", 
    288 +                                                ohci_addr); 
     274+       usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, true, ohci_addr); 
    289275+       if (IS_ERR(usb_dev->ohci_dev)) { 
    290276+               err = PTR_ERR(usb_dev->ohci_dev); 
     
    292278+       } 
    293279+ 
    294 +       usb_dev->ehci_dev = bcma_hcd_create_pdev(dev, "ehci-platform", 
    295 +                                                dev->addr); 
     280+       usb_dev->ehci_dev = bcma_hcd_create_pdev(dev, false, dev->addr); 
    296281+       if (IS_ERR(usb_dev->ehci_dev)) { 
    297282+               err = PTR_ERR(usb_dev->ehci_dev); 
  • trunk/target/linux/brcm47xx/patches-3.2/184-USB-Add-driver-for-the-ssb-bus.patch

    r31088 r31089  
    1 From 1840ddf07a452e640549fbd82e2f570da28e377f Mon Sep 17 00:00:00 2001 
    2 From: Hauke Mehrtens <hauke@hauke-m.de> 
    3 Date: Sat, 26 Nov 2011 21:35:17 +0100 
    4 Subject: [PATCH 185/186] USB: Add driver for the ssb bus 
    5  
    6 This adds a USB driver using the generic platform device driver for the 
    7 USB controller found on the Broadcom ssb bus. The ssb bus just 
    8 exposes one device which serves the OHCI and the EHCI controller at the 
    9 same time. This driver probes for this USB controller and creates and 
    10 registers two new platform devices which will be probed by the new 
    11 generic platform device driver. This makes it possible to use the EHCI 
    12 and the OCHI controller on the ssb bus at the same time. 
    13  
    14 The old ssb OHCI USB driver will be removed in the next step as this 
    15 driver also provide an OHCI driver and an EHCI for the cores supporting 
    16 it. 
    17  
    18 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
    19 --- 
    20  drivers/usb/host/Kconfig   |   12 ++ 
    21  drivers/usb/host/Makefile  |    1 + 
    22  drivers/usb/host/ssb-hcd.c |  273 ++++++++++++++++++++++++++++++++++++++++++++ 
    23  3 files changed, 286 insertions(+), 0 deletions(-) 
    24  create mode 100644 drivers/usb/host/ssb-hcd.c 
    251 
    262--- a/drivers/usb/host/Kconfig 
     
    5127--- /dev/null 
    5228+++ b/drivers/usb/host/ssb-hcd.c 
    53 @@ -0,0 +1,273 @@ 
     29@@ -0,0 +1,279 @@ 
    5430+/* 
    5531+ * Sonics Silicon Backplane 
    5632+ * Broadcom USB-core driver  (SSB bus glue) 
    5733+ * 
    58 + * Copyright 2011 Hauke Mehrtens <hauke@hauke-m.de> 
     34+ * Copyright 2011-2012 Hauke Mehrtens <hauke@hauke-m.de> 
    5935+ * 
    6036+ * Based on ssb-ohci driver 
     
    7652+#include <linux/platform_device.h> 
    7753+#include <linux/module.h> 
    78 +#include <linux/usb/hci_driver.h> 
     54+#include <linux/usb/ehci_pdriver.h> 
     55+#include <linux/usb/ohci_pdriver.h> 
    7956+ 
    8057+MODULE_AUTHOR("Hauke Mehrtens"); 
     
    147124+} 
    148125+ 
    149 +static const struct usb_hci_pdata p_data = { 
    150 +       .flags = USB_HCI_PDATA_PORT_POWER_SET, 
    151 +       .power_set_is_on = 1, 
     126+static const struct usb_ehci_pdata ehci_pdata = { 
     127+}; 
     128+ 
     129+static const struct usb_ohci_pdata ohci_pdata = { 
    152130+}; 
    153131+ 
    154132+static struct platform_device * __devinit 
    155 +ssb_hcd_create_pdev(struct ssb_device *dev, char *name, u32 addr, u32 len) 
     133+ssb_hcd_create_pdev(struct ssb_device *dev, bool ohci, u32 addr, u32 len) 
    156134+{ 
    157135+       struct platform_device *hci_dev; 
     
    168146+       hci_res[1].flags = IORESOURCE_IRQ; 
    169147+ 
    170 +       hci_dev = platform_device_alloc(name, 0); 
     148+       hci_dev = platform_device_alloc(ohci ? "ohci-platform" : 
     149+                                       "ehci-platform" , 0); 
    171150+       if (!hci_dev) 
    172151+               return NULL; 
     
    179158+       if (ret) 
    180159+               goto err_alloc; 
    181 +       ret = platform_device_add_data(hci_dev, &p_data, sizeof(p_data)); 
     160+       if (ohci) 
     161+               ret = platform_device_add_data(hci_dev, &ohci_pdata, 
     162+                                              sizeof(ohci_pdata)); 
     163+       else 
     164+               ret = platform_device_add_data(hci_dev, &ehci_pdata, 
     165+                                              sizeof(ehci_pdata)); 
    182166+       if (ret) 
    183167+               goto err_alloc; 
     
    227211+       start = ssb_admatch_base(tmp); 
    228212+       len = (coreid == SSB_DEV_USB20_HOST) ? 0x800 : ssb_admatch_size(tmp); 
    229 +       usb_dev->ohci_dev = ssb_hcd_create_pdev(dev, "ohci-platform", start, 
    230 +                                               len); 
     213+       usb_dev->ohci_dev = ssb_hcd_create_pdev(dev, true, start, len); 
    231214+       if (IS_ERR(usb_dev->ohci_dev)) { 
    232215+               err = PTR_ERR(usb_dev->ohci_dev); 
     
    236219+       if (coreid == SSB_DEV_USB20_HOST) { 
    237220+               start = ssb_admatch_base(tmp) + 0x800; /* ehci core offset */ 
    238 +               usb_dev->ehci_dev = ssb_hcd_create_pdev(dev, "ehci-platform", 
    239 +                                                       start, len); 
     221+               usb_dev->ehci_dev = ssb_hcd_create_pdev(dev, false, start, len); 
    240222+               if (IS_ERR(usb_dev->ehci_dev)) { 
    241223+                       err = PTR_ERR(usb_dev->ehci_dev); 
  • trunk/target/linux/brcm47xx/patches-3.2/185-USB-OHCI-remove-old-SSB-OHCI-driver.patch

    r31088 r31089  
    1 From 57857d7df6c22eaf11e3c67042d55a9546415059 Mon Sep 17 00:00:00 2001 
    2 From: Hauke Mehrtens <hauke@hauke-m.de> 
    3 Date: Sat, 26 Nov 2011 21:36:50 +0100 
    4 Subject: [PATCH 186/186] USB: OHCI: remove old SSB OHCI driver 
    5  
    6 This is now replaced by the new ssb USB driver, which also supports 
    7 devices with an EHCI controller. 
    8  
    9 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
    10 --- 
    11  drivers/usb/host/Kconfig    |   13 -- 
    12  drivers/usb/host/ohci-hcd.c |   21 +---- 
    13  drivers/usb/host/ohci-ssb.c |  260 ------------------------------------------- 
    14  3 files changed, 1 insertions(+), 293 deletions(-) 
    15  delete mode 100644 drivers/usb/host/ohci-ssb.c 
    16  
    171--- a/drivers/usb/host/Kconfig 
    182+++ b/drivers/usb/host/Kconfig 
    19 @@ -351,19 +351,6 @@ config USB_OHCI_HCD_PCI 
    20           Enables support for PCI-bus plug-in USB controller cards. 
     3@@ -352,10 +352,15 @@ config USB_OHCI_HCD_PCI 
    214          If unsure, say Y. 
    225  
    23 -config USB_OHCI_HCD_SSB 
     6 config USB_OHCI_HCD_SSB 
    247-       bool "OHCI support for Broadcom SSB OHCI core" 
    25 -       depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD) && EXPERIMENTAL 
    26 -       default n 
    27 -       ---help--- 
    28 -         Support for the Sonics Silicon Backplane (SSB) attached 
    29 -         Broadcom USB OHCI core. 
    30 - 
    31 -         This device is present in some embedded devices with 
    32 -         Broadcom based SSB bus. 
    33 - 
    34 -         If unsure, say N. 
    35 - 
    36  config USB_OHCI_SH 
    37         bool "OHCI support for SuperH USB controller" 
    38         depends on USB_OHCI_HCD && SUPERH 
     8+       bool "OHCI support for Broadcom SSB OHCI core (DEPRECATED)" 
     9        depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD) && EXPERIMENTAL 
     10+       select USB_HCD_SSB 
     11+       select USB_OHCI_HCD_PLATFORM 
     12        default n 
     13        ---help--- 
     14+         This option is deprecated now and the driver was removed, use 
     15+         USB_HCD_SSB and USB_OHCI_HCD_PLATFORM instead. 
     16+ 
     17          Support for the Sonics Silicon Backplane (SSB) attached 
     18          Broadcom USB OHCI core. 
     19  
    3920--- a/drivers/usb/host/ohci-hcd.c 
    4021+++ b/drivers/usb/host/ohci-hcd.c 
Note: See TracChangeset for help on using the changeset viewer.