diff options
-rw-r--r-- | arch/sh/Kconfig | 5 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 35 | ||||
-rw-r--r-- | drivers/usb/Kconfig | 5 | ||||
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 5 | ||||
-rw-r--r-- | drivers/usb/host/ehci-sh.c | 243 | ||||
-rw-r--r-- | drivers/usb/host/ohci-sh.c | 2 |
6 files changed, 285 insertions, 10 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 5c075f562eba..e0e2234341f2 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -344,6 +344,7 @@ config CPU_SUBTYPE_SH7720 | |||
344 | select CPU_SH3 | 344 | select CPU_SH3 |
345 | select CPU_HAS_DSP | 345 | select CPU_HAS_DSP |
346 | select SYS_SUPPORTS_CMT | 346 | select SYS_SUPPORTS_CMT |
347 | select USB_ARCH_HAS_OHCI | ||
347 | help | 348 | help |
348 | Select SH7720 if you have a SH3-DSP SH7720 CPU. | 349 | Select SH7720 if you have a SH3-DSP SH7720 CPU. |
349 | 350 | ||
@@ -352,6 +353,7 @@ config CPU_SUBTYPE_SH7721 | |||
352 | select CPU_SH3 | 353 | select CPU_SH3 |
353 | select CPU_HAS_DSP | 354 | select CPU_HAS_DSP |
354 | select SYS_SUPPORTS_CMT | 355 | select SYS_SUPPORTS_CMT |
356 | select USB_ARCH_HAS_OHCI | ||
355 | help | 357 | help |
356 | Select SH7721 if you have a SH3-DSP SH7721 CPU. | 358 | Select SH7721 if you have a SH3-DSP SH7721 CPU. |
357 | 359 | ||
@@ -429,6 +431,7 @@ config CPU_SUBTYPE_SH7757 | |||
429 | config CPU_SUBTYPE_SH7763 | 431 | config CPU_SUBTYPE_SH7763 |
430 | bool "Support SH7763 processor" | 432 | bool "Support SH7763 processor" |
431 | select CPU_SH4A | 433 | select CPU_SH4A |
434 | select USB_ARCH_HAS_OHCI | ||
432 | help | 435 | help |
433 | Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. | 436 | Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. |
434 | 437 | ||
@@ -453,6 +456,8 @@ config CPU_SUBTYPE_SH7786 | |||
453 | select CPU_SHX3 | 456 | select CPU_SHX3 |
454 | select CPU_HAS_PTEAEX | 457 | select CPU_HAS_PTEAEX |
455 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP | 458 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP |
459 | select USB_ARCH_HAS_OHCI | ||
460 | select USB_ARCH_HAS_EHCI | ||
456 | 461 | ||
457 | config CPU_SUBTYPE_SHX3 | 462 | config CPU_SUBTYPE_SHX3 |
458 | bool "Support SH-X3 processor" | 463 | bool "Support SH-X3 processor" |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c index c016c0004714..0170dbda1d00 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7786.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7786.c | |||
@@ -522,10 +522,37 @@ static struct platform_device dma0_device = { | |||
522 | }, | 522 | }, |
523 | }; | 523 | }; |
524 | 524 | ||
525 | #define USB_EHCI_START 0xffe70000 | ||
526 | #define USB_OHCI_START 0xffe70400 | ||
527 | |||
528 | static struct resource usb_ehci_resources[] = { | ||
529 | [0] = { | ||
530 | .start = USB_EHCI_START, | ||
531 | .end = USB_EHCI_START + 0x3ff, | ||
532 | .flags = IORESOURCE_MEM, | ||
533 | }, | ||
534 | [1] = { | ||
535 | .start = 77, | ||
536 | .end = 77, | ||
537 | .flags = IORESOURCE_IRQ, | ||
538 | }, | ||
539 | }; | ||
540 | |||
541 | static struct platform_device usb_ehci_device = { | ||
542 | .name = "sh_ehci", | ||
543 | .id = -1, | ||
544 | .dev = { | ||
545 | .dma_mask = &usb_ehci_device.dev.coherent_dma_mask, | ||
546 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
547 | }, | ||
548 | .num_resources = ARRAY_SIZE(usb_ehci_resources), | ||
549 | .resource = usb_ehci_resources, | ||
550 | }; | ||
551 | |||
525 | static struct resource usb_ohci_resources[] = { | 552 | static struct resource usb_ohci_resources[] = { |
526 | [0] = { | 553 | [0] = { |
527 | .start = 0xffe70400, | 554 | .start = USB_OHCI_START, |
528 | .end = 0xffe704ff, | 555 | .end = USB_OHCI_START + 0x3ff, |
529 | .flags = IORESOURCE_MEM, | 556 | .flags = IORESOURCE_MEM, |
530 | }, | 557 | }, |
531 | [1] = { | 558 | [1] = { |
@@ -535,12 +562,11 @@ static struct resource usb_ohci_resources[] = { | |||
535 | }, | 562 | }, |
536 | }; | 563 | }; |
537 | 564 | ||
538 | static u64 usb_ohci_dma_mask = DMA_BIT_MASK(32); | ||
539 | static struct platform_device usb_ohci_device = { | 565 | static struct platform_device usb_ohci_device = { |
540 | .name = "sh_ohci", | 566 | .name = "sh_ohci", |
541 | .id = -1, | 567 | .id = -1, |
542 | .dev = { | 568 | .dev = { |
543 | .dma_mask = &usb_ohci_dma_mask, | 569 | .dma_mask = &usb_ohci_device.dev.coherent_dma_mask, |
544 | .coherent_dma_mask = DMA_BIT_MASK(32), | 570 | .coherent_dma_mask = DMA_BIT_MASK(32), |
545 | }, | 571 | }, |
546 | .num_resources = ARRAY_SIZE(usb_ohci_resources), | 572 | .num_resources = ARRAY_SIZE(usb_ohci_resources), |
@@ -570,6 +596,7 @@ static struct platform_device *sh7786_early_devices[] __initdata = { | |||
570 | 596 | ||
571 | static struct platform_device *sh7786_devices[] __initdata = { | 597 | static struct platform_device *sh7786_devices[] __initdata = { |
572 | &dma0_device, | 598 | &dma0_device, |
599 | &usb_ehci_device, | ||
573 | &usb_ohci_device, | 600 | &usb_ohci_device, |
574 | }; | 601 | }; |
575 | 602 | ||
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 0f81b606cb13..6585f0b67801 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
@@ -48,11 +48,6 @@ config USB_ARCH_HAS_OHCI | |||
48 | # MIPS: | 48 | # MIPS: |
49 | default y if MIPS_ALCHEMY | 49 | default y if MIPS_ALCHEMY |
50 | default y if MACH_JZ4740 | 50 | default y if MACH_JZ4740 |
51 | # SH: | ||
52 | default y if CPU_SUBTYPE_SH7720 | ||
53 | default y if CPU_SUBTYPE_SH7721 | ||
54 | default y if CPU_SUBTYPE_SH7763 | ||
55 | default y if CPU_SUBTYPE_SH7786 | ||
56 | # more: | 51 | # more: |
57 | default PCI | 52 | default PCI |
58 | 53 | ||
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 2f06ba471953..abe8336ebffa 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -1166,6 +1166,11 @@ MODULE_LICENSE ("GPL"); | |||
1166 | #define PLATFORM_DRIVER ehci_mxc_driver | 1166 | #define PLATFORM_DRIVER ehci_mxc_driver |
1167 | #endif | 1167 | #endif |
1168 | 1168 | ||
1169 | #ifdef CONFIG_CPU_SUBTYPE_SH7786 | ||
1170 | #include "ehci-sh.c" | ||
1171 | #define PLATFORM_DRIVER ehci_hcd_sh_driver | ||
1172 | #endif | ||
1173 | |||
1169 | #ifdef CONFIG_SOC_AU1200 | 1174 | #ifdef CONFIG_SOC_AU1200 |
1170 | #include "ehci-au1xxx.c" | 1175 | #include "ehci-au1xxx.c" |
1171 | #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver | 1176 | #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver |
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c new file mode 100644 index 000000000000..595f70f42b52 --- /dev/null +++ b/drivers/usb/host/ehci-sh.c | |||
@@ -0,0 +1,243 @@ | |||
1 | /* | ||
2 | * SuperH EHCI host controller driver | ||
3 | * | ||
4 | * Copyright (C) 2010 Paul Mundt | ||
5 | * | ||
6 | * Based on ohci-sh.c and ehci-atmel.c. | ||
7 | * | ||
8 | * This file is subject to the terms and conditions of the GNU General Public | ||
9 | * License. See the file "COPYING" in the main directory of this archive | ||
10 | * for more details. | ||
11 | */ | ||
12 | #include <linux/platform_device.h> | ||
13 | #include <linux/clk.h> | ||
14 | |||
15 | struct ehci_sh_priv { | ||
16 | struct clk *iclk, *fclk; | ||
17 | struct usb_hcd *hcd; | ||
18 | }; | ||
19 | |||
20 | static int ehci_sh_reset(struct usb_hcd *hcd) | ||
21 | { | ||
22 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | ||
23 | int ret; | ||
24 | |||
25 | ehci->caps = hcd->regs; | ||
26 | ehci->regs = hcd->regs + HC_LENGTH(ehci_readl(ehci, | ||
27 | &ehci->caps->hc_capbase)); | ||
28 | |||
29 | dbg_hcs_params(ehci, "reset"); | ||
30 | dbg_hcc_params(ehci, "reset"); | ||
31 | |||
32 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | ||
33 | |||
34 | ret = ehci_halt(ehci); | ||
35 | if (unlikely(ret)) | ||
36 | return ret; | ||
37 | |||
38 | ret = ehci_init(hcd); | ||
39 | if (unlikely(ret)) | ||
40 | return ret; | ||
41 | |||
42 | ehci->sbrn = 0x20; | ||
43 | |||
44 | ehci_reset(ehci); | ||
45 | ehci_port_power(ehci, 0); | ||
46 | |||
47 | return ret; | ||
48 | } | ||
49 | |||
50 | static const struct hc_driver ehci_sh_hc_driver = { | ||
51 | .description = hcd_name, | ||
52 | .product_desc = "SuperH EHCI", | ||
53 | .hcd_priv_size = sizeof(struct ehci_hcd), | ||
54 | |||
55 | /* | ||
56 | * generic hardware linkage | ||
57 | */ | ||
58 | .irq = ehci_irq, | ||
59 | .flags = HCD_USB2 | HCD_MEMORY, | ||
60 | |||
61 | /* | ||
62 | * basic lifecycle operations | ||
63 | */ | ||
64 | .reset = ehci_sh_reset, | ||
65 | .start = ehci_run, | ||
66 | .stop = ehci_stop, | ||
67 | .shutdown = ehci_shutdown, | ||
68 | |||
69 | /* | ||
70 | * managing i/o requests and associated device resources | ||
71 | */ | ||
72 | .urb_enqueue = ehci_urb_enqueue, | ||
73 | .urb_dequeue = ehci_urb_dequeue, | ||
74 | .endpoint_disable = ehci_endpoint_disable, | ||
75 | .endpoint_reset = ehci_endpoint_reset, | ||
76 | |||
77 | /* | ||
78 | * scheduling support | ||
79 | */ | ||
80 | .get_frame_number = ehci_get_frame, | ||
81 | |||
82 | /* | ||
83 | * root hub support | ||
84 | */ | ||
85 | .hub_status_data = ehci_hub_status_data, | ||
86 | .hub_control = ehci_hub_control, | ||
87 | |||
88 | #ifdef CONFIG_PM | ||
89 | .bus_suspend = ehci_bus_suspend, | ||
90 | .bus_resume = ehci_bus_resume, | ||
91 | #endif | ||
92 | |||
93 | .relinquish_port = ehci_relinquish_port, | ||
94 | .port_handed_over = ehci_port_handed_over, | ||
95 | .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, | ||
96 | }; | ||
97 | |||
98 | static int ehci_hcd_sh_probe(struct platform_device *pdev) | ||
99 | { | ||
100 | const struct hc_driver *driver = &ehci_sh_hc_driver; | ||
101 | struct resource *res; | ||
102 | struct ehci_sh_priv *priv; | ||
103 | struct usb_hcd *hcd; | ||
104 | int irq, ret; | ||
105 | |||
106 | if (usb_disabled()) | ||
107 | return -ENODEV; | ||
108 | |||
109 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
110 | if (!res) { | ||
111 | dev_err(&pdev->dev, | ||
112 | "Found HC with no register addr. Check %s setup!\n", | ||
113 | dev_name(&pdev->dev)); | ||
114 | ret = -ENODEV; | ||
115 | goto fail_create_hcd; | ||
116 | } | ||
117 | |||
118 | irq = platform_get_irq(pdev, 0); | ||
119 | if (irq <= 0) { | ||
120 | dev_err(&pdev->dev, | ||
121 | "Found HC with no IRQ. Check %s setup!\n", | ||
122 | dev_name(&pdev->dev)); | ||
123 | ret = -ENODEV; | ||
124 | goto fail_create_hcd; | ||
125 | } | ||
126 | |||
127 | /* initialize hcd */ | ||
128 | hcd = usb_create_hcd(&ehci_sh_hc_driver, &pdev->dev, | ||
129 | dev_name(&pdev->dev)); | ||
130 | if (!hcd) { | ||
131 | ret = -ENOMEM; | ||
132 | goto fail_create_hcd; | ||
133 | } | ||
134 | |||
135 | hcd->rsrc_start = res->start; | ||
136 | hcd->rsrc_len = resource_size(res); | ||
137 | |||
138 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, | ||
139 | driver->description)) { | ||
140 | dev_dbg(&pdev->dev, "controller already in use\n"); | ||
141 | ret = -EBUSY; | ||
142 | goto fail_request_resource; | ||
143 | } | ||
144 | |||
145 | hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len); | ||
146 | if (hcd->regs == NULL) { | ||
147 | dev_dbg(&pdev->dev, "error mapping memory\n"); | ||
148 | ret = -ENXIO; | ||
149 | goto fail_ioremap; | ||
150 | } | ||
151 | |||
152 | priv = kmalloc(sizeof(struct ehci_sh_priv), GFP_KERNEL); | ||
153 | if (!priv) { | ||
154 | dev_dbg(&pdev->dev, "error allocating priv data\n"); | ||
155 | ret = -ENOMEM; | ||
156 | goto fail_alloc; | ||
157 | } | ||
158 | |||
159 | /* These are optional, we don't care if they fail */ | ||
160 | priv->fclk = clk_get(&pdev->dev, "usb_fck"); | ||
161 | if (IS_ERR(priv->fclk)) | ||
162 | priv->fclk = NULL; | ||
163 | |||
164 | priv->iclk = clk_get(&pdev->dev, "usb_ick"); | ||
165 | if (IS_ERR(priv->iclk)) | ||
166 | priv->iclk = NULL; | ||
167 | |||
168 | clk_enable(priv->fclk); | ||
169 | clk_enable(priv->iclk); | ||
170 | |||
171 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | ||
172 | if (ret != 0) { | ||
173 | dev_err(&pdev->dev, "Failed to add hcd"); | ||
174 | goto fail_add_hcd; | ||
175 | } | ||
176 | |||
177 | priv->hcd = hcd; | ||
178 | platform_set_drvdata(pdev, priv); | ||
179 | |||
180 | return ret; | ||
181 | |||
182 | fail_add_hcd: | ||
183 | clk_disable(priv->iclk); | ||
184 | clk_disable(priv->fclk); | ||
185 | |||
186 | clk_put(priv->iclk); | ||
187 | clk_put(priv->fclk); | ||
188 | |||
189 | kfree(priv); | ||
190 | fail_alloc: | ||
191 | iounmap(hcd->regs); | ||
192 | fail_ioremap: | ||
193 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); | ||
194 | fail_request_resource: | ||
195 | usb_put_hcd(hcd); | ||
196 | fail_create_hcd: | ||
197 | dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), ret); | ||
198 | |||
199 | return ret; | ||
200 | } | ||
201 | |||
202 | static int __exit ehci_hcd_sh_remove(struct platform_device *pdev) | ||
203 | { | ||
204 | struct ehci_sh_priv *priv = platform_get_drvdata(pdev); | ||
205 | struct usb_hcd *hcd = priv->hcd; | ||
206 | |||
207 | usb_remove_hcd(hcd); | ||
208 | iounmap(hcd->regs); | ||
209 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); | ||
210 | usb_put_hcd(hcd); | ||
211 | platform_set_drvdata(pdev, NULL); | ||
212 | |||
213 | clk_disable(priv->fclk); | ||
214 | clk_disable(priv->iclk); | ||
215 | |||
216 | clk_put(priv->fclk); | ||
217 | clk_put(priv->iclk); | ||
218 | |||
219 | kfree(priv); | ||
220 | |||
221 | return 0; | ||
222 | } | ||
223 | |||
224 | static void ehci_hcd_sh_shutdown(struct platform_device *pdev) | ||
225 | { | ||
226 | struct ehci_sh_priv *priv = platform_get_drvdata(pdev); | ||
227 | struct usb_hcd *hcd = priv->hcd; | ||
228 | |||
229 | if (hcd->driver->shutdown) | ||
230 | hcd->driver->shutdown(hcd); | ||
231 | } | ||
232 | |||
233 | static struct platform_driver ehci_hcd_sh_driver = { | ||
234 | .probe = ehci_hcd_sh_probe, | ||
235 | .remove = __exit_p(ehci_hcd_sh_remove), | ||
236 | .shutdown = ehci_hcd_sh_shutdown, | ||
237 | .driver = { | ||
238 | .name = "sh_ehci", | ||
239 | .owner = THIS_MODULE, | ||
240 | }, | ||
241 | }; | ||
242 | |||
243 | MODULE_ALIAS("platform:sh_ehci"); | ||
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c index 0b35d22cc70e..f47867ff78c7 100644 --- a/drivers/usb/host/ohci-sh.c +++ b/drivers/usb/host/ohci-sh.c | |||
@@ -109,7 +109,7 @@ static int ohci_hcd_sh_probe(struct platform_device *pdev) | |||
109 | hcd->regs = (void __iomem *)res->start; | 109 | hcd->regs = (void __iomem *)res->start; |
110 | hcd->rsrc_start = res->start; | 110 | hcd->rsrc_start = res->start; |
111 | hcd->rsrc_len = resource_size(res); | 111 | hcd->rsrc_len = resource_size(res); |
112 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 112 | ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); |
113 | if (ret != 0) { | 113 | if (ret != 0) { |
114 | err("Failed to add hcd"); | 114 | err("Failed to add hcd"); |
115 | usb_put_hcd(hcd); | 115 | usb_put_hcd(hcd); |