Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

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

diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h
index 67debc47e8c6ec6ff7008aab53997b73444dbe37..0b3e6d051c6425d86238473ab31f25702cd29c92 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/poodle.h
+++ b/arch/arm/mach-pxa/include/mach/poodle.h
@@ -23,6 +23,7 @@
 #define POODLE_GPIO_AC_IN              (1)
 #define POODLE_GPIO_CO                 16
 #define POODLE_GPIO_TP_INT             (5)
+#define POODLE_GPIO_TP_CS              (24)
 #define POODLE_GPIO_WAKEUP             (11)    /* change battery */
 #define POODLE_GPIO_GA_INT             (10)
 #define POODLE_GPIO_IR_ON              (22)
@@ -70,6 +71,14 @@
 #define POODLE_SCOOP_IO_DIR    ( POODLE_SCOOP_VPEN | POODLE_SCOOP_HS_OUT )
 #define POODLE_SCOOP_IO_OUT    ( 0 )
 
+#define POODLE_SCOOP_GPIO_BASE (NR_BUILTIN_GPIO)
+#define POODLE_GPIO_CHARGE_ON  (POODLE_SCOOP_GPIO_BASE + 0)
+#define POODLE_GPIO_CP401      (POODLE_SCOOP_GPIO_BASE + 2)
+#define POODLE_GPIO_VPEN       (POODLE_SCOOP_GPIO_BASE + 7)
+#define POODLE_GPIO_L_PCLK     (POODLE_SCOOP_GPIO_BASE + 9)
+#define POODLE_GPIO_L_LCLK     (POODLE_SCOOP_GPIO_BASE + 10)
+#define POODLE_GPIO_HS_OUT     (POODLE_SCOOP_GPIO_BASE + 11)
+
 #define POODLE_LOCOMO_GPIO_AMP_ON      LOCOMO_GPIO(8)
 #define POODLE_LOCOMO_GPIO_MUTE_L      LOCOMO_GPIO(10)
 #define POODLE_LOCOMO_GPIO_MUTE_R      LOCOMO_GPIO(11)