From mboxrd@z Thu Jan 1 00:00:00 1970 From: dbaryshkov@gmail.com (Dmitry Eremin-Solenikov) Date: Wed, 2 Feb 2011 20:00:00 +0300 Subject: [PATCH 3/6] PalmTC: switch to using gpio-vbus transceiver In-Reply-To: <1296666003-31647-1-git-send-email-dbaryshkov@gmail.com> References: <1296666003-31647-1-git-send-email-dbaryshkov@gmail.com> Message-ID: <1296666003-31647-4-git-send-email-dbaryshkov@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Switch from handling gpio-vbus in pxa25x_udc to using standard gpio-vbus tranceiver. Signed-off-by: Dmitry Eremin-Solenikov Cc: Marek Vasut --- arch/arm/mach-pxa/palmtc.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c index 2131d58..fcc4490 100644 --- a/arch/arm/mach-pxa/palmtc.c +++ b/arch/arm/mach-pxa/palmtc.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -294,12 +295,21 @@ static struct platform_device palmtc_keyboard = { /****************************************************************************** * UDC ******************************************************************************/ -static struct pxa2xx_udc_mach_info palmtc_udc_info __initdata = { +static struct gpio_vbus_mach_info palmtc_udc_info = { .gpio_vbus = GPIO_NR_PALMTC_USB_DETECT_N, .gpio_vbus_inverted = 1, .gpio_pullup = GPIO_NR_PALMTC_USB_POWER, }; +static struct platform_device palmtc_gpio_vbus = { + .name = "gpio-vbus", + .id = -1, + .dev = { + .platform_data = &palmtc_udc_info, + }, +}; + + /****************************************************************************** * Touchscreen / Battery / GPIO-extender ******************************************************************************/ @@ -391,6 +401,7 @@ static struct platform_device *devices[] __initdata = { &palmtc_keyboard, &palmtc_pxa_keys, &palmtc_flash, + &palmtc_gpio_vbus, }; static void __init palmtc_init(void) @@ -404,7 +415,6 @@ static void __init palmtc_init(void) set_pxa_fb_info(&palmtc_lcd_screen); pxa_set_mci_info(&palmtc_mci_platform_data); - pxa_set_udc_info(&palmtc_udc_info); pxa_set_ac97_info(NULL); pxa_set_ficp_info(&palmtc_ficp_platform_data); -- 1.7.2.3