[ARM] pxa: PalmTX and PalmT5 USB fixes

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

diff --git a/arch/arm/mach-pxa/include/mach/palmt5.h b/arch/arm/mach-pxa/include/mach/palmt5.h
index 052bfe788adae87ed0061fea2112e5435fc09bf9..d15662aba008db201121ae92b49da560628eb4eb 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/palmt5.h
+++ b/arch/arm/mach-pxa/include/mach/palmt5.h
@@ -37,7 +37,6 @@
 
 /* USB */
 #define GPIO_NR_PALMT5_USB_DETECT_N            15
-#define GPIO_NR_PALMT5_USB_POWER               95
 #define GPIO_NR_PALMT5_USB_PULLUP              93
 
 /* LCD/BACKLIGHT */

diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h
index 9f7d62fb4cbb5797227ece0856c8d9b0049c7403..e74082c872e11ecd8a569da731bfd2ae8a3c80d8 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/palmtx.h
+++ b/arch/arm/mach-pxa/include/mach/palmtx.h
@@ -38,7 +38,6 @@
 
 /* USB */
 #define GPIO_NR_PALMTX_USB_DETECT_N            13
-#define GPIO_NR_PALMTX_USB_POWER               95
 #define GPIO_NR_PALMTX_USB_PULLUP              93
 
 /* LCD/BACKLIGHT */

diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c
index 0680f1a575a33556e41e40b75ff83da0886dd178..d7f81068c6136ee7562d12f15fd38508f06956b5 100644 (file)
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@ -64,6 +64,7 @@ static unsigned long palmt5_pin_config[] __initdata = {
        GPIO29_AC97_SDATA_IN_0,
        GPIO30_AC97_SDATA_OUT,
        GPIO31_AC97_SYNC,
+       GPIO95_AC97_nRESET,
 
        /* IrDA */
        GPIO40_GPIO,    /* ir disable */
@@ -72,7 +73,7 @@ static unsigned long palmt5_pin_config[] __initdata = {
 
        /* USB */
        GPIO15_GPIO,    /* usb detect */
-       GPIO95_GPIO,    /* usb power */
+       GPIO93_GPIO,    /* usb power */
 
        /* MATRIX KEYPAD */
        GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH,
@@ -344,7 +345,7 @@ static struct pxaficp_platform_data palmt5_ficp_platform_data = {
 static struct pxa2xx_udc_mach_info palmt5_udc_info __initdata = {
        .gpio_vbus              = GPIO_NR_PALMT5_USB_DETECT_N,
        .gpio_vbus_inverted     = 1,
-       .gpio_pullup            = GPIO_NR_PALMT5_USB_POWER,
+       .gpio_pullup            = GPIO_NR_PALMT5_USB_PULLUP,
        .gpio_pullup_inverted   = 0,
 };
 
@@ -490,9 +491,9 @@ static struct platform_device *devices[] __initdata = {
 /* setup udc GPIOs initial state */
 static void __init palmt5_udc_init(void)
 {
-       if (!gpio_request(GPIO_NR_PALMT5_USB_POWER, "UDC Vbus")) {
-               gpio_direction_output(GPIO_NR_PALMT5_USB_POWER, 1);
-               gpio_free(GPIO_NR_PALMT5_USB_POWER);
+       if (!gpio_request(GPIO_NR_PALMT5_USB_PULLUP, "UDC Vbus")) {
+               gpio_direction_output(GPIO_NR_PALMT5_USB_PULLUP, 1);
+               gpio_free(GPIO_NR_PALMT5_USB_PULLUP);
        }
 }
 

diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 59d0c1cba5563940e8ba993300bb444743acc753..14393d0ad8b837d94d8a7f17ad23ccc906f20e25 100644 (file)
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -64,6 +64,7 @@ static unsigned long palmtx_pin_config[] __initdata = {
        GPIO29_AC97_SDATA_IN_0,
        GPIO30_AC97_SDATA_OUT,
        GPIO31_AC97_SYNC,
+       GPIO95_AC97_nRESET,
 
        /* IrDA */
        GPIO40_GPIO,    /* ir disable */
@@ -75,7 +76,7 @@ static unsigned long palmtx_pin_config[] __initdata = {
 
        /* USB */
        GPIO13_GPIO,    /* usb detect */
-       GPIO95_GPIO,    /* usb power */
+       GPIO93_GPIO,    /* usb power */
 
        /* PCMCIA */
        GPIO48_nPOE,
@@ -359,7 +360,7 @@ static struct pxaficp_platform_data palmtx_ficp_platform_data = {
 static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = {
        .gpio_vbus              = GPIO_NR_PALMTX_USB_DETECT_N,
        .gpio_vbus_inverted     = 1,
-       .gpio_pullup            = GPIO_NR_PALMTX_USB_POWER,
+       .gpio_pullup            = GPIO_NR_PALMTX_USB_PULLUP,
        .gpio_pullup_inverted   = 0,
 };
 
@@ -514,9 +515,9 @@ static void __init palmtx_map_io(void)
 /* setup udc GPIOs initial state */
 static void __init palmtx_udc_init(void)
 {
-       if (!gpio_request(GPIO_NR_PALMTX_USB_POWER, "UDC Vbus")) {
-               gpio_direction_output(GPIO_NR_PALMTX_USB_POWER, 1);
-               gpio_free(GPIO_NR_PALMTX_USB_POWER);
+       if (!gpio_request(GPIO_NR_PALMTX_USB_PULLUP, "UDC Vbus")) {
+               gpio_direction_output(GPIO_NR_PALMTX_USB_PULLUP, 1);
+               gpio_free(GPIO_NR_PALMTX_USB_PULLUP);
        }
 }