diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-02-14 15:33:18 +0300 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-03-16 16:33:33 +0800 |
| commit | ef8b3cc68a1df83717bc8f9e7737084246a56ce2 (patch) | |
| tree | 077050c1719e0bab31fdc4f005b1841f89b2e6b9 /arch/arm/mach-pxa/tosa.c | |
| parent | d19f4cbd4ba08d32d5e5d0cbc98f920fcc225448 (diff) | |
| download | linux-stable-ef8b3cc68a1df83717bc8f9e7737084246a56ce2.tar.gz linux-stable-ef8b3cc68a1df83717bc8f9e7737084246a56ce2.tar.bz2 linux-stable-ef8b3cc68a1df83717bc8f9e7737084246a56ce2.zip | |
ARM: pxa/tosa: switch to using gpio-vbus transceiver
Switch from handling gpio-vbus in pxa25x_udc to using standard gpio-vbus
tranceiver.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index f2582ec300d9..93a8903c3fed 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -34,6 +34,7 @@ #include <linux/spi/spi.h> #include <linux/spi/pxa2xx_spi.h> #include <linux/input/matrix_keypad.h> +#include <linux/usb/gpio_vbus.h> #include <asm/setup.h> #include <asm/mach-types.h> @@ -240,12 +241,20 @@ static struct scoop_pcmcia_config tosa_pcmcia_config = { /* * USB Device Controller */ -static struct pxa2xx_udc_mach_info udc_info __initdata = { +static struct gpio_vbus_mach_info tosa_udc_info = { .gpio_pullup = TOSA_GPIO_USB_PULLUP, .gpio_vbus = TOSA_GPIO_USB_IN, .gpio_vbus_inverted = 1, }; +static struct platform_device tosa_gpio_vbus = { + .name = "gpio-vbus", + .id = -1, + .dev = { + .platform_data = &tosa_udc_info, + }, +}; + /* * MMC/SD Device */ @@ -891,6 +900,7 @@ static struct platform_device *devices[] __initdata = { &tosa_bt_device, &sharpsl_rom_device, &wm9712_device, + &tosa_gpio_vbus, }; static void tosa_poweroff(void) @@ -937,7 +947,6 @@ static void __init tosa_init(void) dummy = gpiochip_reserve(TOSA_TC6393XB_GPIO_BASE, 16); pxa_set_mci_info(&tosa_mci_platform_data); - pxa_set_udc_info(&udc_info); pxa_set_ficp_info(&tosa_ficp_platform_data); pxa_set_i2c_info(NULL); pxa_set_ac97_info(NULL); |