From: Eric Miao <eric.miao@marvell.com>
Date: Fri, 18 Jul 2008 00:51:07 +0000 (+0800)
Subject: [ARM] pxa/poodle: use .gpio_pullup in USB device platform data
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1730aadffb6ec3c4fe4d69a68f2f9445fd1b1264;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[ARM] pxa/poodle: use .gpio_pullup in USB device platform data

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index e85eba3e362d..cbcf394d84d1 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -280,21 +280,9 @@ static struct pxaficp_platform_data poodle_ficp_platform_data = {
 /*
  * USB Device Controller
  */
-static void poodle_udc_command(int cmd)
-{
-	switch(cmd)	{
-	case PXA2XX_UDC_CMD_CONNECT:
-		GPSR(POODLE_GPIO_USB_PULLUP) = GPIO_bit(POODLE_GPIO_USB_PULLUP);
-		break;
-	case PXA2XX_UDC_CMD_DISCONNECT:
-		GPCR(POODLE_GPIO_USB_PULLUP) = GPIO_bit(POODLE_GPIO_USB_PULLUP);
-		break;
-	}
-}
-
 static struct pxa2xx_udc_mach_info udc_info __initdata = {
 	/* no connect GPIO; poodle can't tell connection status */
-	.udc_command		= poodle_udc_command,
+	.gpio_pullup	= POODLE_GPIO_USB_PULLUP,
 };