From ee49cdbe5e9d063e0dde13d5ab7c15a5d2fea611 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 19 Apr 2008 10:42:06 +0100 Subject: [PATCH] --- yaml --- r: 91268 b: refs/heads/master c: c546106cc15d300a5b3eba5a514c9238bb6593e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/tosa.c | 10 ++++++++++ trunk/include/asm-arm/arch-pxa/tosa.h | 8 ++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 68f99b35d489..844dafddb257 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba4eb7e60b11eba1ccd89d448e6d87d98df95da8 +refs/heads/master: c546106cc15d300a5b3eba5a514c9238bb6593e8 diff --git a/trunk/arch/arm/mach-pxa/tosa.c b/trunk/arch/arm/mach-pxa/tosa.c index 1722093cfe51..6458f6d371d9 100644 --- a/trunk/arch/arm/mach-pxa/tosa.c +++ b/trunk/arch/arm/mach-pxa/tosa.c @@ -432,6 +432,16 @@ static struct gpio_led tosa_gpio_leds[] = { .default_trigger = "nand-disk", .gpio = TOSA_GPIO_NOTE_LED, }, + { + .name = "tosa:dual:wlan", + .default_trigger = "none", + .gpio = TOSA_GPIO_WLAN_LED, + }, + { + .name = "tosa:blue:bluetooth", + .default_trigger = "none", + .gpio = TOSA_GPIO_BT_LED, + }, }; static struct gpio_led_platform_data tosa_gpio_leds_platform_data = { diff --git a/trunk/include/asm-arm/arch-pxa/tosa.h b/trunk/include/asm-arm/arch-pxa/tosa.h index bb6e12137dec..c5b6fde6907c 100644 --- a/trunk/include/asm-arm/arch-pxa/tosa.h +++ b/trunk/include/asm-arm/arch-pxa/tosa.h @@ -45,20 +45,20 @@ * SCOOP2 jacket GPIOs */ #define TOSA_SCOOP_JC_GPIO_BASE (NR_BUILTIN_GPIO + 12) -#define TOSA_SCOOP_JC_BT_LED SCOOP_GPCR_PA11 +#define TOSA_GPIO_BT_LED (TOSA_SCOOP_JC_GPIO_BASE + 0) #define TOSA_GPIO_NOTE_LED (TOSA_SCOOP_JC_GPIO_BASE + 1) #define TOSA_GPIO_CHRG_ERR_LED (TOSA_SCOOP_JC_GPIO_BASE + 2) #define TOSA_GPIO_USB_PULLUP (TOSA_SCOOP_JC_GPIO_BASE + 3) #define TOSA_SCOOP_JC_TC6393_SUSPEND SCOOP_GPCR_PA15 #define TOSA_SCOOP_JC_TC3693_L3V_ON SCOOP_GPCR_PA16 #define TOSA_SCOOP_JC_WLAN_DETECT SCOOP_GPCR_PA17 -#define TOSA_SCOOP_JC_WLAN_LED SCOOP_GPCR_PA18 +#define TOSA_GPIO_WLAN_LED (TOSA_SCOOP_JC_GPIO_BASE + 7) #define TOSA_SCOOP_JC_CARD_LIMIT_SEL SCOOP_GPCR_PA19 /* GPIO Direction 1 : output mode / 0:input mode */ -#define TOSA_SCOOP_JC_IO_DIR ( TOSA_SCOOP_JC_BT_LED | \ +#define TOSA_SCOOP_JC_IO_DIR ( \ TOSA_SCOOP_JC_TC6393_SUSPEND | TOSA_SCOOP_JC_TC3693_L3V_ON | \ - TOSA_SCOOP_JC_WLAN_LED | TOSA_SCOOP_JC_CARD_LIMIT_SEL ) + TOSA_SCOOP_JC_CARD_LIMIT_SEL ) /* * Timing Generator