summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include
diff options
context:
space:
mode:
authorMarek Vasut2009-06-01 22:34:14 +0200
committerEric Miao2009-06-16 10:55:24 +0200
commiteb73e6221c5013b32647bcf44bcc570232ba2804 (patch)
treed960bcbaa53a241ca5e95950984ddf1392140a29 /arch/arm/mach-pxa/include
parentMAINTAINERS: update Eric Miao's email address and status (diff)
downloadkernel-qcow2-linux-eb73e6221c5013b32647bcf44bcc570232ba2804.tar.gz
kernel-qcow2-linux-eb73e6221c5013b32647bcf44bcc570232ba2804.tar.xz
kernel-qcow2-linux-eb73e6221c5013b32647bcf44bcc570232ba2804.zip
[ARM] pxa/palm: various fixes for PalmZ72 (mostly audio asoc and usb)
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/include')
-rw-r--r--arch/arm/mach-pxa/include/mach/palmz72.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/palmz72.h b/arch/arm/mach-pxa/include/mach/palmz72.h
index 5032307ebf7d..2806ef69ba5a 100644
--- a/arch/arm/mach-pxa/include/mach/palmz72.h
+++ b/arch/arm/mach-pxa/include/mach/palmz72.h
@@ -21,7 +21,7 @@
/* SD/MMC */
#define GPIO_NR_PALMZ72_SD_DETECT_N 14
#define GPIO_NR_PALMZ72_SD_POWER_N 98
-#define GPIO_NR_PALMZ72_SD_RO 115
+#define GPIO_NR_PALMZ72_SD_RO 115
/* Touchscreen */
#define GPIO_NR_PALMZ72_WM9712_IRQ 27
@@ -31,8 +31,7 @@
/* USB */
#define GPIO_NR_PALMZ72_USB_DETECT_N 15
-#define GPIO_NR_PALMZ72_USB_POWER 95
-#define GPIO_NR_PALMZ72_USB_PULLUP 12
+#define GPIO_NR_PALMZ72_USB_PULLUP 95
/* LCD/Backlight */
#define GPIO_NR_PALMZ72_BL_POWER 20