summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/include/mach/mioa701.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-03 01:07:40 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-03 01:07:40 +0300
commitc5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch)
treebd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /arch/arm/mach-pxa/include/mach/mioa701.h
parentd281bc9d8a22419abc254f86a7fc268bb99914e1 (diff)
parentbc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff)
downloadlinux-c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea.tar.xz
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts: arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/mioa701.h')
-rw-r--r--arch/arm/mach-pxa/include/mach/mioa701.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/mioa701.h b/arch/arm/mach-pxa/include/mach/mioa701.h
index 8483cb511831..02868447b0b1 100644
--- 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