lkml.org 
[lkml]   [2009]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 4/5] at91/USB: USB drivers modifications for at91sam9g10
    Greg,

    Please, can you consider the inclusion of this patch. I have no news
    about it for a long time...

    Here is a link to its patchwork entry:
    http://patchwork.kernel.org/patch/31173/

    Thanks for your help.

    Nicolas Ferre :
    > Hi,
    >
    > Here is a little "ping" about integration of this patch.
    >
    > Nicolas Ferre :
    >> From: Hong Xu <hong.xu@atmel.com>
    >>
    >> 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).
    >
    > I wonder if we can consider its inclusion as at91sam9g10 is now
    > integrated in mainline.
    > Do you want me to split this in several pieces for host/gadget split.
    >
    > Thanks.
    >
    >> Signed-off-by: Hong Xu <hong.xu@atmel.com>
    >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    >> ---
    >> drivers/usb/gadget/at91_udc.c | 6 +++---
    >> drivers/usb/host/ohci-at91.c | 10 +++++-----
    >> 2 files changed, 8 insertions(+), 8 deletions(-)
    >>
    >> diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
    >> index 0b2bb8f..bfed3d9 100644
    >> --- a/drivers/usb/gadget/at91_udc.c
    >> +++ b/drivers/usb/gadget/at91_udc.c
    >> @@ -892,7 +892,7 @@ static void pullup(struct at91_udc *udc, int is_on)
    >>
    >> txvc |= AT91_UDP_TXVC_PUON;
    >> at91_udp_write(udc, AT91_UDP_TXVC, txvc);
    >> - } else if (cpu_is_at91sam9261()) {
    >> + } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
    >> u32 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;
    >> at91_udp_write(udc, AT91_UDP_TXVC, txvc);
    >> - } else if (cpu_is_at91sam9261()) {
    >> + } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
    >> u32 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[4].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;
    >> } else if (cpu_is_at91sam9263()) {
    >> udc->ep[0].maxpacket = 64;
    >> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
    >> index b29b0fe..fb64def 100644
    >> --- a/drivers/usb/host/ohci-at91.c
    >> +++ b/drivers/usb/host/ohci-at91.c
    >> @@ -35,7 +35,7 @@ extern int usb_disabled(void);
    >>
    >> static void at91_start_clock(void)
    >> {
    >> - if (cpu_is_at91sam9261())
    >> + if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
    >> clk_enable(hclk);
    >> clk_enable(iclk);
    >> clk_enable(fclk);
    >> @@ -46,7 +46,7 @@ static void at91_stop_clock(void)
    >> {
    >> clk_disable(fclk);
    >> clk_disable(iclk);
    >> - if (cpu_is_at91sam9261())
    >> + if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
    >> clk_disable(hclk);
    >> clocked = 0;
    >> }
    >> @@ -142,7 +142,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
    >>
    >> iclk = clk_get(&pdev->dev, "ohci_clk");
    >> fclk = clk_get(&pdev->dev, "uhpck");
    >> - if (cpu_is_at91sam9261())
    >> + if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
    >> hclk = clk_get(&pdev->dev, "hck0");
    >>
    >> at91_start_hc(pdev);
    >> @@ -156,7 +156,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
    >> /* Error handling */
    >> at91_stop_hc(pdev);
    >>
    >> - if (cpu_is_at91sam9261())
    >> + if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
    >> clk_put(hclk);
    >> clk_put(fclk);
    >> clk_put(iclk);
    >> @@ -193,7 +193,7 @@ static void usb_hcd_at91_remove(struct usb_hcd *hcd,
    >> release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
    >> usb_put_hcd(hcd);
    >>
    >> - if (cpu_is_at91sam9261())
    >> + if (cpu_is_at91sam9261() || cpu_is_at91sam9g10())
    >> clk_put(hclk);
    >> clk_put(fclk);
    >> clk_put(iclk);
    >
    >


    --
    Nicolas Ferre



    \
     
     \ /
      Last update: 2009-09-25 12:27    [W:0.037 / U:29.876 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site