Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 311c736c authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

[ARM] 4973/1: Tosa: use leds-gpio driver. 



Now as the scoop pins are covered by the generic gpio API,
we can use leds-gpio driver instead of special leds-tosa.

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d4e7d09f

arch/arm/mach-pxa/tosa.c

+23 −2
Original line number Original line Diff line number Diff line
@@ -421,9 +421,30 @@ static struct platform_device tosa_gpio_keys_device = { 
/*

/*

 * Tosa LEDs

 * Tosa LEDs

 */

 */

struct gpio_led tosa_gpio_leds[] = {

	{

		.name			= "tosa:amber:charge",

		.default_trigger	= "main-battery-charging",

		.gpio			= TOSA_GPIO_CHRG_ERR_LED,

	},

	{

		.name			= "tosa:green:mail",

		.default_trigger	= "nand-disk",

		.gpio			= TOSA_GPIO_NOTE_LED,

	},

};



struct gpio_led_platform_data tosa_gpio_leds_platform_data = {

	.leds		= tosa_gpio_leds,

	.num_leds	= ARRAY_SIZE(tosa_gpio_leds),

};



static struct platform_device tosaled_device = {

static struct platform_device tosaled_device = {

    .name   = "tosa-led",

	.name	= "leds-gpio",

	.id	= -1,

	.id	= -1,

	.dev	= {

		.platform_data	= &tosa_gpio_leds_platform_data,

	},

};

};





static struct platform_device *devices[] __initdata = {

static struct platform_device *devices[] __initdata = {

include/asm-arm/arch-pxa/tosa.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -46,8 +46,8 @@ 
 */

 */

#define TOSA_SCOOP_JC_GPIO_BASE		(NR_BUILTIN_GPIO + 12)

#define TOSA_SCOOP_JC_GPIO_BASE		(NR_BUILTIN_GPIO + 12)

#define TOSA_SCOOP_JC_BT_LED		SCOOP_GPCR_PA11

#define TOSA_SCOOP_JC_BT_LED		SCOOP_GPCR_PA11

#define TOSA_SCOOP_JC_NOTE_LED		SCOOP_GPCR_PA12

#define TOSA_GPIO_NOTE_LED		(TOSA_SCOOP_JC_GPIO_BASE + 1)

#define TOSA_SCOOP_JC_CHRG_ERR_LED	SCOOP_GPCR_PA13

#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_GPIO_USB_PULLUP		(TOSA_SCOOP_JC_GPIO_BASE + 3)

#define TOSA_SCOOP_JC_TC6393_SUSPEND	SCOOP_GPCR_PA15

#define TOSA_SCOOP_JC_TC6393_SUSPEND	SCOOP_GPCR_PA15

#define TOSA_SCOOP_JC_TC3693_L3V_ON	SCOOP_GPCR_PA16

#define TOSA_SCOOP_JC_TC3693_L3V_ON	SCOOP_GPCR_PA16
@@ -56,8 +56,7 @@ 
#define TOSA_SCOOP_JC_CARD_LIMIT_SEL	SCOOP_GPCR_PA19

#define TOSA_SCOOP_JC_CARD_LIMIT_SEL	SCOOP_GPCR_PA19





/* GPIO Direction   1 : output mode / 0:input mode */

/* GPIO Direction   1 : output mode / 0:input mode */

#define TOSA_SCOOP_JC_IO_DIR ( TOSA_SCOOP_JC_BT_LED | TOSA_SCOOP_JC_NOTE_LED | \

#define TOSA_SCOOP_JC_IO_DIR ( TOSA_SCOOP_JC_BT_LED | \

		TOSA_SCOOP_JC_CHRG_ERR_LED | \

		TOSA_SCOOP_JC_TC6393_SUSPEND | TOSA_SCOOP_JC_TC3693_L3V_ON | \

		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_WLAN_LED | TOSA_SCOOP_JC_CARD_LIMIT_SEL )