luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: modifications for at91sam9g10

Browse Source 
Modify both host and gadget USB drivers for at91sam9g10.
This add a clock management equivalent to at91sam9261 on usb drivers.
It also add the way of handling gadget pull-ups (like the at91sam9261).

Signed-off-by: Hong Xu <hong.xu@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Hong Xu 2009-09-25 12:24:12 +02:00 committed by Greg Kroah-Hartman
parent 0ad72524ef
commit 23f6d914c3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/gadget/at91_udc.c
View File

@ -892,7 +892,7 @@ static void pullup(struct at91_udc *udc, int is_on)
txvc |= AT91_UDP_TXVC_PUON; txvc |= AT91_UDP_TXVC_PUON;
at91_udp_write(udc, AT91_UDP_TXVC, txvc); at91_udp_write(udc, AT91_UDP_TXVC, txvc);
} else if (cpu_is_at91sam9261()) { } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
u32 usbpucr; u32 usbpucr;
usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR); usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR);
@ -910,7 +910,7 @@ static void pullup(struct at91_udc *udc, int is_on)
txvc &= ~AT91_UDP_TXVC_PUON; txvc &= ~AT91_UDP_TXVC_PUON;
at91_udp_write(udc, AT91_UDP_TXVC, txvc); at91_udp_write(udc, AT91_UDP_TXVC, txvc);
} else if (cpu_is_at91sam9261()) { } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
u32 usbpucr; u32 usbpucr;
usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR); usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR);
@ -1692,7 +1692,7 @@ static int __init at91udc_probe(struct platform_device *pdev)
udc->ep[3].maxpacket = 64; udc->ep[3].maxpacket = 64;
udc->ep[4].maxpacket = 512; udc->ep[4].maxpacket = 512;
udc->ep[5].maxpacket = 512; udc->ep[5].maxpacket = 512;
} else if (cpu_is_at91sam9261()) { } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
udc->ep[3].maxpacket = 64; udc->ep[3].maxpacket = 64;
} else if (cpu_is_at91sam9263()) { } else if (cpu_is_at91sam9263()) {
udc->ep[0].maxpacket = 64; udc->ep[0].maxpacket = 64;

10
drivers/usb/host/ohci-at91.c
View File

@ -35,7 +35,7 @@ extern int usb_disabled(void);
static void at91_start_clock(void) static void at91_start_clock(void)
{ {
if (cpu_is_at91sam9261()) if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
clk_enable(hclk); clk_enable(hclk);
clk_enable(iclk); clk_enable(iclk);
clk_enable(fclk); clk_enable(fclk);
@ -46,7 +46,7 @@ static void at91_stop_clock(void)
{ {
clk_disable(fclk); clk_disable(fclk);
clk_disable(iclk); clk_disable(iclk);
if (cpu_is_at91sam9261()) if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
clk_disable(hclk); clk_disable(hclk);
clocked = 0; clocked = 0;
} }
@ -142,7 +142,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
iclk = clk_get(&pdev->dev, "ohci_clk"); iclk = clk_get(&pdev->dev, "ohci_clk");
fclk = clk_get(&pdev->dev, "uhpck"); fclk = clk_get(&pdev->dev, "uhpck");
if (cpu_is_at91sam9261()) if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
hclk = clk_get(&pdev->dev, "hck0"); hclk = clk_get(&pdev->dev, "hck0");
at91_start_hc(pdev); at91_start_hc(pdev);
@ -155,7 +155,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
/* Error handling */ /* Error handling */
at91_stop_hc(pdev); at91_stop_hc(pdev);
if (cpu_is_at91sam9261()) if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
clk_put(hclk); clk_put(hclk);
clk_put(fclk); clk_put(fclk);
clk_put(iclk); clk_put(iclk);
@ -192,7 +192,7 @@ static void usb_hcd_at91_remove(struct usb_hcd *hcd,
release_mem_region(hcd->rsrc_start, hcd->rsrc_len); release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd); usb_put_hcd(hcd);
if (cpu_is_at91sam9261()) if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
clk_put(hclk); clk_put(hclk);
clk_put(fclk); clk_put(fclk);
clk_put(iclk); clk_put(iclk);