Commit ef8b3cc6 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Eric Miao

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: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent d19f4cbd
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/pxa2xx_spi.h> #include <linux/spi/pxa2xx_spi.h>
#include <linux/input/matrix_keypad.h> #include <linux/input/matrix_keypad.h>
#include <linux/usb/gpio_vbus.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -240,12 +241,20 @@ static struct scoop_pcmcia_config tosa_pcmcia_config = { ...@@ -240,12 +241,20 @@ static struct scoop_pcmcia_config tosa_pcmcia_config = {
/* /*
* USB Device Controller * 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_pullup = TOSA_GPIO_USB_PULLUP,
.gpio_vbus = TOSA_GPIO_USB_IN, .gpio_vbus = TOSA_GPIO_USB_IN,
.gpio_vbus_inverted = 1, .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 * MMC/SD Device
*/ */
...@@ -891,6 +900,7 @@ static struct platform_device *devices[] __initdata = { ...@@ -891,6 +900,7 @@ static struct platform_device *devices[] __initdata = {
&tosa_bt_device, &tosa_bt_device,
&sharpsl_rom_device, &sharpsl_rom_device,
&wm9712_device, &wm9712_device,
&tosa_gpio_vbus,
}; };
static void tosa_poweroff(void) static void tosa_poweroff(void)
...@@ -937,7 +947,6 @@ static void __init tosa_init(void) ...@@ -937,7 +947,6 @@ static void __init tosa_init(void)
dummy = gpiochip_reserve(TOSA_TC6393XB_GPIO_BASE, 16); dummy = gpiochip_reserve(TOSA_TC6393XB_GPIO_BASE, 16);
pxa_set_mci_info(&tosa_mci_platform_data); pxa_set_mci_info(&tosa_mci_platform_data);
pxa_set_udc_info(&udc_info);
pxa_set_ficp_info(&tosa_ficp_platform_data); pxa_set_ficp_info(&tosa_ficp_platform_data);
pxa_set_i2c_info(NULL); pxa_set_i2c_info(NULL);
pxa_set_ac97_info(NULL); pxa_set_ac97_info(NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment