Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[ARM] pxa/colibri320: Add UDC support

Add support for PXA UDC.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

authored by

Marek Vasut and committed by
Eric Miao
11dd2d9a 320bbb86

+40
+40
arch/arm/mach-pxa/colibri-pxa320.c
··· 16 16 #include <linux/platform_device.h> 17 17 #include <linux/gpio.h> 18 18 #include <linux/interrupt.h> 19 + #include <linux/usb/gpio_vbus.h> 19 20 20 21 #include <asm/mach-types.h> 21 22 #include <asm/sizes.h> ··· 29 28 #include <mach/pxafb.h> 30 29 #include <mach/ohci.h> 31 30 #include <mach/audio.h> 31 + #include <mach/pxa27x-udc.h> 32 + #include <mach/udc.h> 32 33 33 34 #include "generic.h" 34 35 #include "devices.h" ··· 103 100 #else 104 101 static inline void colibri_pxa320_init_ohci(void) {} 105 102 #endif /* CONFIG_USB_OHCI_HCD || CONFIG_USB_OHCI_HCD_MODULE */ 103 + 104 + #if defined(CONFIG_USB_GADGET_PXA27X)||defined(CONFIG_USB_GADGET_PXA27X_MODULE) 105 + static struct gpio_vbus_mach_info colibri_pxa320_gpio_vbus_info = { 106 + .gpio_vbus = mfp_to_gpio(MFP_PIN_GPIO96), 107 + .gpio_pullup = -1, 108 + }; 109 + 110 + static struct platform_device colibri_pxa320_gpio_vbus = { 111 + .name = "gpio-vbus", 112 + .id = -1, 113 + .dev = { 114 + .platform_data = &colibri_pxa320_gpio_vbus_info, 115 + }, 116 + }; 117 + 118 + static void colibri_pxa320_udc_command(int cmd) 119 + { 120 + if (cmd == PXA2XX_UDC_CMD_CONNECT) 121 + UP2OCR = UP2OCR_HXOE | UP2OCR_DPPUE; 122 + else if (cmd == PXA2XX_UDC_CMD_DISCONNECT) 123 + UP2OCR = UP2OCR_HXOE; 124 + } 125 + 126 + static struct pxa2xx_udc_mach_info colibri_pxa320_udc_info __initdata = { 127 + .udc_command = colibri_pxa320_udc_command, 128 + .gpio_pullup = -1, 129 + }; 130 + 131 + static void __init colibri_pxa320_init_udc(void) 132 + { 133 + pxa_set_udc_info(&colibri_pxa320_udc_info); 134 + platform_device_register(&colibri_pxa320_gpio_vbus); 135 + } 136 + #else 137 + static inline void colibri_pxa320_init_udc(void) {} 138 + #endif 106 139 107 140 static mfp_cfg_t colibri_pxa320_mmc_pin_config[] __initdata = { 108 141 GPIO22_MMC1_CLK, ··· 251 212 colibri_pxa3xx_init_mmc(ARRAY_AND_SIZE(colibri_pxa320_mmc_pin_config), 252 213 mfp_to_gpio(MFP_PIN_GPIO28)); 253 214 colibri_pxa320_init_uart(); 215 + colibri_pxa320_init_udc(); 254 216 } 255 217 256 218 MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")