Merge branch 'for-rmk' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / include / mach / mioa701.h

diff --git a/arch/arm/mach-pxa/include/mach/mioa701.h b/arch/arm/mach-pxa/include/mach/mioa701.h
index 8483cb511831f47659c744000349905fddce9491..02868447b0b135d56b4e9c687233358280da77b3 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/mioa701.h
+++ b/arch/arm/mach-pxa/include/mach/mioa701.h
@@ -10,12 +10,14 @@
         (MFP_PIN(pin) | MFP_##af | MFP_DIR_OUT | MFP_LPM_##state))
 
 /* Global GPIOs */
-#define GPIO9_CHARGE_nEN                       9
+#define GPIO9_CHARGE_EN                                9
 #define GPIO18_POWEROFF                                18
 #define GPIO87_LCD_POWER                       87
+#define GPIO96_AC_DETECT                       96
+#define GPIO80_MAYBE_CHARGE_VDROP              80      /* Drop of 88mV */
 
 /* USB */
-#define GPIO13_USB_DETECT                      13
+#define GPIO13_nUSB_DETECT                     13
 #define GPIO22_USB_ENABLE                      22
 
 /* SDIO bits */
@@ -24,7 +26,10 @@
 #define GPIO91_SDIO_EN                         91
 
 /* Bluetooth */
+#define GPIO14_BT_nACTIVITY                    14
 #define GPIO83_BT_ON                           83
+#define GPIO77_BT_UNKNOWN1                     77
+#define GPIO86_BT_MAYBE_nRESET                 86
 
 /* GPS */
 #define GPIO23_GPS_UNKNOWN1                    23