Commit 46000065a631c6d21452d533baf086175c384ba4
1 parent
6920b5a791
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
ARM: move udc_pxa2xx.h to linux/platform_data
Move the PXA2xx/IXP4xx UDC header file into linux/platform_data as it only contains a driver platform data structure. Acked-by: Felipe Balbi <balbi@ti.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Krzysztof Halasa <khc@pm.waw.pl> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Showing 5 changed files with 30 additions and 31 deletions Side-by-side Diff
arch/arm/include/asm/mach/udc_pxa2xx.h
| 1 | -/* | |
| 2 | - * arch/arm/include/asm/mach/udc_pxa2xx.h | |
| 3 | - * | |
| 4 | - * This supports machine-specific differences in how the PXA2xx | |
| 5 | - * USB Device Controller (UDC) is wired. | |
| 6 | - * | |
| 7 | - * It is set in linux/arch/arm/mach-pxa/<machine>.c or in | |
| 8 | - * linux/arch/mach-ixp4xx/<machine>.c and used in | |
| 9 | - * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c | |
| 10 | - */ | |
| 11 | - | |
| 12 | -struct pxa2xx_udc_mach_info { | |
| 13 | - int (*udc_is_connected)(void); /* do we see host? */ | |
| 14 | - void (*udc_command)(int cmd); | |
| 15 | -#define PXA2XX_UDC_CMD_CONNECT 0 /* let host see us */ | |
| 16 | -#define PXA2XX_UDC_CMD_DISCONNECT 1 /* so host won't see us */ | |
| 17 | - | |
| 18 | - /* Boards following the design guidelines in the developer's manual, | |
| 19 | - * with on-chip GPIOs not Lubbock's weird hardware, can have a sane | |
| 20 | - * VBUS IRQ and omit the methods above. Store the GPIO number | |
| 21 | - * here. Note that sometimes the signals go through inverters... | |
| 22 | - */ | |
| 23 | - bool gpio_pullup_inverted; | |
| 24 | - int gpio_pullup; /* high == pullup activated */ | |
| 25 | -}; |
arch/arm/mach-ixp4xx/include/mach/udc.h
arch/arm/mach-pxa/include/mach/udc.h
drivers/usb/gadget/pxa25x_udc.c
| ... | ... | @@ -29,6 +29,7 @@ |
| 29 | 29 | #include <linux/list.h> |
| 30 | 30 | #include <linux/interrupt.h> |
| 31 | 31 | #include <linux/mm.h> |
| 32 | +#include <linux/platform_data/pxa2xx_udc.h> | |
| 32 | 33 | #include <linux/platform_device.h> |
| 33 | 34 | #include <linux/dma-mapping.h> |
| 34 | 35 | #include <linux/irq.h> |
| ... | ... | @@ -58,9 +59,6 @@ |
| 58 | 59 | #ifdef CONFIG_ARCH_LUBBOCK |
| 59 | 60 | #include <mach/lubbock.h> |
| 60 | 61 | #endif |
| 61 | - | |
| 62 | -#include <asm/mach/udc_pxa2xx.h> | |
| 63 | - | |
| 64 | 62 | |
| 65 | 63 | /* |
| 66 | 64 | * This driver handles the USB Device Controller (UDC) in Intel's PXA 25x |
include/linux/platform_data/pxa2xx_udc.h
| 1 | +/* | |
| 2 | + * This supports machine-specific differences in how the PXA2xx | |
| 3 | + * USB Device Controller (UDC) is wired. | |
| 4 | + * | |
| 5 | + * It is set in linux/arch/arm/mach-pxa/<machine>.c or in | |
| 6 | + * linux/arch/mach-ixp4xx/<machine>.c and used in | |
| 7 | + * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c | |
| 8 | + */ | |
| 9 | +#ifndef PXA2XX_UDC_H | |
| 10 | +#define PXA2XX_UDC_H | |
| 11 | + | |
| 12 | +struct pxa2xx_udc_mach_info { | |
| 13 | + int (*udc_is_connected)(void); /* do we see host? */ | |
| 14 | + void (*udc_command)(int cmd); | |
| 15 | +#define PXA2XX_UDC_CMD_CONNECT 0 /* let host see us */ | |
| 16 | +#define PXA2XX_UDC_CMD_DISCONNECT 1 /* so host won't see us */ | |
| 17 | + | |
| 18 | + /* Boards following the design guidelines in the developer's manual, | |
| 19 | + * with on-chip GPIOs not Lubbock's weird hardware, can have a sane | |
| 20 | + * VBUS IRQ and omit the methods above. Store the GPIO number | |
| 21 | + * here. Note that sometimes the signals go through inverters... | |
| 22 | + */ | |
| 23 | + bool gpio_pullup_inverted; | |
| 24 | + int gpio_pullup; /* high == pullup activated */ | |
| 25 | +}; | |
| 26 | + | |
| 27 | +#endif |