diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-16 03:02:34 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-16 03:02:34 +0000 |
commit | b07c4c56e17999d26811b21cd26895e74bd93b40 (patch) | |
tree | d5dc3868bad7098a4057fb0e80675e6aff84a589 /packages/linux/gumstix-kernel-2.6.21/pxa2xx_udc.patch | |
parent | f53ea006bcf4e938ed1c569080472dd05dc84b4d (diff) | |
parent | 4ad71912603efd65137867c9767428a9ff8b239a (diff) |
merge of '6453c1938bbcd0ab830b8bc186e501a3ec4ebb10'
and 'a635d59f6f07065e2f3d4b3de4e72a4a2e442be3'
Diffstat (limited to 'packages/linux/gumstix-kernel-2.6.21/pxa2xx_udc.patch')
-rw-r--r-- | packages/linux/gumstix-kernel-2.6.21/pxa2xx_udc.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/packages/linux/gumstix-kernel-2.6.21/pxa2xx_udc.patch b/packages/linux/gumstix-kernel-2.6.21/pxa2xx_udc.patch new file mode 100644 index 0000000000..4489e701bf --- /dev/null +++ b/packages/linux/gumstix-kernel-2.6.21/pxa2xx_udc.patch @@ -0,0 +1,65 @@ +Index: linux-2.6.21gum/drivers/usb/gadget/pxa2xx_udc.c +=================================================================== +--- linux-2.6.21gum.orig/drivers/usb/gadget/pxa2xx_udc.c ++++ linux-2.6.21gum/drivers/usb/gadget/pxa2xx_udc.c +@@ -51,6 +51,7 @@ + #include <asm/mach-types.h> + #include <asm/unaligned.h> + #include <asm/hardware.h> ++#include <asm/mach/irq.h> + #ifdef CONFIG_ARCH_PXA + #include <asm/arch/pxa-regs.h> + #endif +@@ -101,6 +102,10 @@ static const char ep0name [] = "ep0"; + + #endif + ++#ifdef CONFIG_ARCH_GUMSTIX ++#undef CONFIG_USB_PXA2XX_SMALL ++#endif ++ + #include "pxa2xx_udc.h" + + +@@ -2541,6 +2546,41 @@ static int __init pxa2xx_udc_probe(struc + } + #endif + ++ /* Reset UDCCS register to be able to recover from whatever ++ * state UDC was previously in. */ ++ *dev->ep[ 2].reg_udccs = UDCCS_BO_RPC | UDCCS_BO_SST; ++#ifndef CONFIG_USB_PXA2XX_SMALL ++ *dev->ep[ 7].reg_udccs = UDCCS_BO_RPC | UDCCS_BO_SST; ++ *dev->ep[12].reg_udccs = UDCCS_BO_RPC | UDCCS_BO_SST; ++#endif ++ ++ *dev->ep[ 1].reg_udccs = UDCCS_BI_TPC | UDCCS_BI_FTF | ++ UDCCS_BI_TUR | UDCCS_BI_SST | UDCCS_BI_TSP; ++#ifndef CONFIG_USB_PXA2XX_SMALL ++ *dev->ep[ 6].reg_udccs = UDCCS_BI_TPC | UDCCS_BI_FTF | ++ UDCCS_BI_TUR | UDCCS_BI_SST | UDCCS_BI_TSP; ++ *dev->ep[11].reg_udccs = UDCCS_BI_TPC | UDCCS_BI_FTF | ++ UDCCS_BI_TUR | UDCCS_BI_SST | UDCCS_BI_TSP; ++ ++ *dev->ep[ 3].reg_udccs = UDCCS_II_TPC | UDCCS_II_FTF | ++ UDCCS_II_TUR | UDCCS_II_TSP; ++ *dev->ep[ 8].reg_udccs = UDCCS_II_TPC | UDCCS_II_FTF | ++ UDCCS_II_TUR | UDCCS_II_TSP; ++ *dev->ep[13].reg_udccs = UDCCS_II_TPC | UDCCS_II_FTF | ++ UDCCS_II_TUR | UDCCS_II_TSP; ++ ++ *dev->ep[ 4].reg_udccs = UDCCS_IO_RPC | UDCCS_IO_ROF; ++ *dev->ep[ 9].reg_udccs = UDCCS_IO_RPC | UDCCS_IO_ROF; ++ *dev->ep[11].reg_udccs = UDCCS_IO_RPC | UDCCS_IO_ROF; ++ ++ *dev->ep[ 5].reg_udccs = UDCCS_INT_TPC | UDCCS_INT_FTF | ++ UDCCS_INT_TUR | UDCCS_INT_SST; ++ *dev->ep[10].reg_udccs = UDCCS_INT_TPC | UDCCS_INT_FTF | ++ UDCCS_INT_TUR | UDCCS_INT_SST; ++ *dev->ep[15].reg_udccs = UDCCS_INT_TPC | UDCCS_INT_FTF | ++ UDCCS_INT_TUR | UDCCS_INT_SST; ++#endif ++ + /* other non-static parts of init */ + dev->dev = &pdev->dev; + dev->mach = pdev->dev.platform_data; |