diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-10-08 09:11:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-22 14:14:24 -0400 |
commit | 6efd0f73cc8d748bfcccb23a5ee0b7e000441940 (patch) | |
tree | 7f7102239f1349c22c278eac144f39d39e58e5f8 /drivers/usb/host | |
parent | 6a41b4d3fe8cd4cc95181516fc6fba7b1747a27c (diff) |
USB: EHCI: remove IXP4xx EHCI driver
This driver is not registered by any in-tree user. If needed it the EHCI
driver can be reinstatied using the ehci-platform driver with caps_offset to
0x100.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 5 | ||||
-rw-r--r-- | drivers/usb/host/ehci-ixp4xx.c | 139 |
2 files changed, 0 insertions, 144 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 61eac96441de..01227000c3e0 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -1249,11 +1249,6 @@ MODULE_LICENSE ("GPL"); | |||
1249 | #define PLATFORM_DRIVER ehci_orion_driver | 1249 | #define PLATFORM_DRIVER ehci_orion_driver |
1250 | #endif | 1250 | #endif |
1251 | 1251 | ||
1252 | #ifdef CONFIG_ARCH_IXP4XX | ||
1253 | #include "ehci-ixp4xx.c" | ||
1254 | #define PLATFORM_DRIVER ixp4xx_ehci_driver | ||
1255 | #endif | ||
1256 | |||
1257 | #ifdef CONFIG_USB_W90X900_EHCI | 1252 | #ifdef CONFIG_USB_W90X900_EHCI |
1258 | #include "ehci-w90x900.c" | 1253 | #include "ehci-w90x900.c" |
1259 | #define PLATFORM_DRIVER ehci_hcd_w90x900_driver | 1254 | #define PLATFORM_DRIVER ehci_hcd_w90x900_driver |
diff --git a/drivers/usb/host/ehci-ixp4xx.c b/drivers/usb/host/ehci-ixp4xx.c deleted file mode 100644 index f224c0a48bed..000000000000 --- a/drivers/usb/host/ehci-ixp4xx.c +++ /dev/null | |||
@@ -1,139 +0,0 @@ | |||
1 | /* | ||
2 | * IXP4XX EHCI Host Controller Driver | ||
3 | * | ||
4 | * Author: Vladimir Barinov <vbarinov@embeddedalley.com> | ||
5 | * | ||
6 | * Based on "ehci-fsl.c" by Randy Vinson <rvinson@mvista.com> | ||
7 | * | ||
8 | * 2007 (c) MontaVista Software, Inc. This file is licensed under | ||
9 | * the terms of the GNU General Public License version 2. This program | ||
10 | * is licensed "as is" without any warranty of any kind, whether express | ||
11 | * or implied. | ||
12 | */ | ||
13 | |||
14 | #include <linux/platform_device.h> | ||
15 | |||
16 | static int ixp4xx_ehci_init(struct usb_hcd *hcd) | ||
17 | { | ||
18 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | ||
19 | int retval = 0; | ||
20 | |||
21 | ehci->big_endian_desc = 1; | ||
22 | ehci->big_endian_mmio = 1; | ||
23 | |||
24 | ehci->caps = hcd->regs + 0x100; | ||
25 | |||
26 | hcd->has_tt = 1; | ||
27 | |||
28 | retval = ehci_setup(hcd); | ||
29 | if (retval) | ||
30 | return retval; | ||
31 | |||
32 | ehci_port_power(ehci, 0); | ||
33 | |||
34 | return retval; | ||
35 | } | ||
36 | |||
37 | static const struct hc_driver ixp4xx_ehci_hc_driver = { | ||
38 | .description = hcd_name, | ||
39 | .product_desc = "IXP4XX EHCI Host Controller", | ||
40 | .hcd_priv_size = sizeof(struct ehci_hcd), | ||
41 | .irq = ehci_irq, | ||
42 | .flags = HCD_MEMORY | HCD_USB2, | ||
43 | .reset = ixp4xx_ehci_init, | ||
44 | .start = ehci_run, | ||
45 | .stop = ehci_stop, | ||
46 | .shutdown = ehci_shutdown, | ||
47 | .urb_enqueue = ehci_urb_enqueue, | ||
48 | .urb_dequeue = ehci_urb_dequeue, | ||
49 | .endpoint_disable = ehci_endpoint_disable, | ||
50 | .endpoint_reset = ehci_endpoint_reset, | ||
51 | .get_frame_number = ehci_get_frame, | ||
52 | .hub_status_data = ehci_hub_status_data, | ||
53 | .hub_control = ehci_hub_control, | ||
54 | #if defined(CONFIG_PM) | ||
55 | .bus_suspend = ehci_bus_suspend, | ||
56 | .bus_resume = ehci_bus_resume, | ||
57 | #endif | ||
58 | .relinquish_port = ehci_relinquish_port, | ||
59 | .port_handed_over = ehci_port_handed_over, | ||
60 | |||
61 | .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, | ||
62 | }; | ||
63 | |||
64 | static int ixp4xx_ehci_probe(struct platform_device *pdev) | ||
65 | { | ||
66 | struct usb_hcd *hcd; | ||
67 | const struct hc_driver *driver = &ixp4xx_ehci_hc_driver; | ||
68 | struct resource *res; | ||
69 | int irq; | ||
70 | int retval; | ||
71 | |||
72 | if (usb_disabled()) | ||
73 | return -ENODEV; | ||
74 | |||
75 | res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); | ||
76 | if (!res) { | ||
77 | dev_err(&pdev->dev, | ||
78 | "Found HC with no IRQ. Check %s setup!\n", | ||
79 | dev_name(&pdev->dev)); | ||
80 | return -ENODEV; | ||
81 | } | ||
82 | irq = res->start; | ||
83 | |||
84 | hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev)); | ||
85 | if (!hcd) { | ||
86 | retval = -ENOMEM; | ||
87 | goto fail_create_hcd; | ||
88 | } | ||
89 | |||
90 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
91 | if (!res) { | ||
92 | dev_err(&pdev->dev, | ||
93 | "Found HC with no register addr. Check %s setup!\n", | ||
94 | dev_name(&pdev->dev)); | ||
95 | retval = -ENODEV; | ||
96 | goto fail_request_resource; | ||
97 | } | ||
98 | hcd->rsrc_start = res->start; | ||
99 | hcd->rsrc_len = resource_size(res); | ||
100 | |||
101 | hcd->regs = devm_request_and_ioremap(&pdev->dev, res); | ||
102 | if (hcd->regs == NULL) { | ||
103 | dev_dbg(&pdev->dev, "error mapping memory\n"); | ||
104 | retval = -EFAULT; | ||
105 | goto fail_request_resource; | ||
106 | } | ||
107 | |||
108 | retval = usb_add_hcd(hcd, irq, IRQF_SHARED); | ||
109 | if (retval) | ||
110 | goto fail_request_resource; | ||
111 | |||
112 | return retval; | ||
113 | |||
114 | fail_request_resource: | ||
115 | usb_put_hcd(hcd); | ||
116 | fail_create_hcd: | ||
117 | dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), retval); | ||
118 | return retval; | ||
119 | } | ||
120 | |||
121 | static int ixp4xx_ehci_remove(struct platform_device *pdev) | ||
122 | { | ||
123 | struct usb_hcd *hcd = platform_get_drvdata(pdev); | ||
124 | |||
125 | usb_remove_hcd(hcd); | ||
126 | usb_put_hcd(hcd); | ||
127 | |||
128 | return 0; | ||
129 | } | ||
130 | |||
131 | MODULE_ALIAS("platform:ixp4xx-ehci"); | ||
132 | |||
133 | static struct platform_driver ixp4xx_ehci_driver = { | ||
134 | .probe = ixp4xx_ehci_probe, | ||
135 | .remove = ixp4xx_ehci_remove, | ||
136 | .driver = { | ||
137 | .name = "ixp4xx-ehci", | ||
138 | }, | ||
139 | }; | ||