Commit efb12cd2 authored by Marek Vasut's avatar Marek Vasut Committed by Eric Miao

[ARM] pxa: PalmTX and PalmT5 USB fixes

Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 918c71c0
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
/* USB */ /* USB */
#define GPIO_NR_PALMT5_USB_DETECT_N 15 #define GPIO_NR_PALMT5_USB_DETECT_N 15
#define GPIO_NR_PALMT5_USB_POWER 95
#define GPIO_NR_PALMT5_USB_PULLUP 93 #define GPIO_NR_PALMT5_USB_PULLUP 93
/* LCD/BACKLIGHT */ /* LCD/BACKLIGHT */
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
/* USB */ /* USB */
#define GPIO_NR_PALMTX_USB_DETECT_N 13 #define GPIO_NR_PALMTX_USB_DETECT_N 13
#define GPIO_NR_PALMTX_USB_POWER 95
#define GPIO_NR_PALMTX_USB_PULLUP 93 #define GPIO_NR_PALMTX_USB_PULLUP 93
/* LCD/BACKLIGHT */ /* LCD/BACKLIGHT */
......
...@@ -64,6 +64,7 @@ static unsigned long palmt5_pin_config[] __initdata = { ...@@ -64,6 +64,7 @@ static unsigned long palmt5_pin_config[] __initdata = {
GPIO29_AC97_SDATA_IN_0, GPIO29_AC97_SDATA_IN_0,
GPIO30_AC97_SDATA_OUT, GPIO30_AC97_SDATA_OUT,
GPIO31_AC97_SYNC, GPIO31_AC97_SYNC,
GPIO95_AC97_nRESET,
/* IrDA */ /* IrDA */
GPIO40_GPIO, /* ir disable */ GPIO40_GPIO, /* ir disable */
...@@ -72,7 +73,7 @@ static unsigned long palmt5_pin_config[] __initdata = { ...@@ -72,7 +73,7 @@ static unsigned long palmt5_pin_config[] __initdata = {
/* USB */ /* USB */
GPIO15_GPIO, /* usb detect */ GPIO15_GPIO, /* usb detect */
GPIO95_GPIO, /* usb power */ GPIO93_GPIO, /* usb power */
/* MATRIX KEYPAD */ /* MATRIX KEYPAD */
GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH, GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH,
...@@ -344,7 +345,7 @@ static struct pxaficp_platform_data palmt5_ficp_platform_data = { ...@@ -344,7 +345,7 @@ static struct pxaficp_platform_data palmt5_ficp_platform_data = {
static struct pxa2xx_udc_mach_info palmt5_udc_info __initdata = { static struct pxa2xx_udc_mach_info palmt5_udc_info __initdata = {
.gpio_vbus = GPIO_NR_PALMT5_USB_DETECT_N, .gpio_vbus = GPIO_NR_PALMT5_USB_DETECT_N,
.gpio_vbus_inverted = 1, .gpio_vbus_inverted = 1,
.gpio_pullup = GPIO_NR_PALMT5_USB_POWER, .gpio_pullup = GPIO_NR_PALMT5_USB_PULLUP,
.gpio_pullup_inverted = 0, .gpio_pullup_inverted = 0,
}; };
...@@ -490,9 +491,9 @@ static struct platform_device *devices[] __initdata = { ...@@ -490,9 +491,9 @@ static struct platform_device *devices[] __initdata = {
/* setup udc GPIOs initial state */ /* setup udc GPIOs initial state */
static void __init palmt5_udc_init(void) static void __init palmt5_udc_init(void)
{ {
if (!gpio_request(GPIO_NR_PALMT5_USB_POWER, "UDC Vbus")) { if (!gpio_request(GPIO_NR_PALMT5_USB_PULLUP, "UDC Vbus")) {
gpio_direction_output(GPIO_NR_PALMT5_USB_POWER, 1); gpio_direction_output(GPIO_NR_PALMT5_USB_PULLUP, 1);
gpio_free(GPIO_NR_PALMT5_USB_POWER); gpio_free(GPIO_NR_PALMT5_USB_PULLUP);
} }
} }
......
...@@ -64,6 +64,7 @@ static unsigned long palmtx_pin_config[] __initdata = { ...@@ -64,6 +64,7 @@ static unsigned long palmtx_pin_config[] __initdata = {
GPIO29_AC97_SDATA_IN_0, GPIO29_AC97_SDATA_IN_0,
GPIO30_AC97_SDATA_OUT, GPIO30_AC97_SDATA_OUT,
GPIO31_AC97_SYNC, GPIO31_AC97_SYNC,
GPIO95_AC97_nRESET,
/* IrDA */ /* IrDA */
GPIO40_GPIO, /* ir disable */ GPIO40_GPIO, /* ir disable */
...@@ -75,7 +76,7 @@ static unsigned long palmtx_pin_config[] __initdata = { ...@@ -75,7 +76,7 @@ static unsigned long palmtx_pin_config[] __initdata = {
/* USB */ /* USB */
GPIO13_GPIO, /* usb detect */ GPIO13_GPIO, /* usb detect */
GPIO95_GPIO, /* usb power */ GPIO93_GPIO, /* usb power */
/* PCMCIA */ /* PCMCIA */
GPIO48_nPOE, GPIO48_nPOE,
...@@ -359,7 +360,7 @@ static struct pxaficp_platform_data palmtx_ficp_platform_data = { ...@@ -359,7 +360,7 @@ static struct pxaficp_platform_data palmtx_ficp_platform_data = {
static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = { static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = {
.gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N, .gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N,
.gpio_vbus_inverted = 1, .gpio_vbus_inverted = 1,
.gpio_pullup = GPIO_NR_PALMTX_USB_POWER, .gpio_pullup = GPIO_NR_PALMTX_USB_PULLUP,
.gpio_pullup_inverted = 0, .gpio_pullup_inverted = 0,
}; };
...@@ -514,9 +515,9 @@ static void __init palmtx_map_io(void) ...@@ -514,9 +515,9 @@ static void __init palmtx_map_io(void)
/* setup udc GPIOs initial state */ /* setup udc GPIOs initial state */
static void __init palmtx_udc_init(void) static void __init palmtx_udc_init(void)
{ {
if (!gpio_request(GPIO_NR_PALMTX_USB_POWER, "UDC Vbus")) { if (!gpio_request(GPIO_NR_PALMTX_USB_PULLUP, "UDC Vbus")) {
gpio_direction_output(GPIO_NR_PALMTX_USB_POWER, 1); gpio_direction_output(GPIO_NR_PALMTX_USB_PULLUP, 1);
gpio_free(GPIO_NR_PALMTX_USB_POWER); gpio_free(GPIO_NR_PALMTX_USB_PULLUP);
} }
} }
......
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