From 4c12bac6c05faf22358af0f708e2052d2bc5fb5f Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Fri, 5 Sep 2008 16:21:48 +0800 Subject: [PATCH] --- yaml --- r: 112415 b: refs/heads/master c: 2d91f94174ce42378aafc7bedda2588a913d3eab h: refs/heads/master i: 112413: 44b246f822e6669b16a981f9abbf97627abeadeb 112411: 6bd1bb4b32c8cb4c5db2ab9ba3143016bc895253 112407: 65086421f69079643347ca7c23268385744a0ab9 112399: 2bb9af84f025e323a5f10b43750a2b33c53fbebc 112383: 4eb0d3933b3a4281b4c8246c765754838664ea7b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/include/mach/poodle.h | 8 ++++++++ trunk/arch/arm/mach-pxa/poodle.c | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c12c913f64ca..4f5c92672db5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24ff4cdde79a88720c3eadda3b565f2e4ea07fd2 +refs/heads/master: 2d91f94174ce42378aafc7bedda2588a913d3eab diff --git a/trunk/arch/arm/mach-pxa/include/mach/poodle.h b/trunk/arch/arm/mach-pxa/include/mach/poodle.h index ecdd7f693c4c..0b3e6d051c64 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/poodle.h +++ b/trunk/arch/arm/mach-pxa/include/mach/poodle.h @@ -71,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) diff --git a/trunk/arch/arm/mach-pxa/poodle.c b/trunk/arch/arm/mach-pxa/poodle.c index d39cbf3e9d28..bd3a70f47702 100644 --- a/trunk/arch/arm/mach-pxa/poodle.c +++ b/trunk/arch/arm/mach-pxa/poodle.c @@ -148,6 +148,7 @@ static struct resource poodle_scoop_resources[] = { static struct scoop_config poodle_scoop_setup = { .io_dir = POODLE_SCOOP_IO_DIR, .io_out = POODLE_SCOOP_IO_OUT, + .gpio_base = POODLE_SCOOP_GPIO_BASE, }; struct platform_device poodle_scoop_device = {