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

Commit a1eacd79 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Ryan Mallon
Browse files

arm: ep93xx: use gpio_led_register_device 



Use gpio_led_register_device to register the two leds
connected to the ep93xx.

Since this is a common feature for all ep93xx based boards,
create a new Kconfig option, EP93XX_SOC_COMMON, to select
the LEDS_GPIO_REGISTER feature.

The struct gpio_led and struct gpio_led_platform_data variables
have been changed to const struct because of:

commit 9517f925
	leds: make *struct gpio_led_platform_data.leds const

They have also been marked as __initconst because the helper
function gpio_led_register_device makes a deep copy of the
platform data to allow it to live in init memory:

commit 4440673a
	leds: provide helper to register "leds-gpio" devices

Signed-off-by: default avatarHartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarRyan Mallon <rmallon@gmail.com>
parent 011b2e84

arch/arm/mach-ep93xx/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ if ARCH_EP93XX 


menu "Cirrus EP93xx Implementation Options"



config EP93XX_SOC_COMMON

	bool

	default y

	select LEDS_GPIO_REGISTER



config CRUNCH

	bool "Support for MaverickCrunch"

	help

arch/arm/mach-ep93xx/core.c

+4 −12
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ void __init ep93xx_register_spi(struct ep93xx_spi_info *info, 
/*************************************************************************

 * EP93xx LEDs

 *************************************************************************/

static struct gpio_led ep93xx_led_pins[] = {

static const struct gpio_led ep93xx_led_pins[] __initconst = {

	{

		.name	= "platform:grled",

		.gpio	= EP93XX_GPIO_LINE_GRLED,
@@ -492,20 +492,11 @@ static struct gpio_led ep93xx_led_pins[] = { 
	},

};



static struct gpio_led_platform_data ep93xx_led_data = {

static const struct gpio_led_platform_data ep93xx_led_data __initconst = {

	.num_leds	= ARRAY_SIZE(ep93xx_led_pins),

	.leds		= ep93xx_led_pins,

};



static struct platform_device ep93xx_leds = {

	.name		= "leds-gpio",

	.id		= -1,

	.dev		= {

		.platform_data	= &ep93xx_led_data,

	},

};





/*************************************************************************

 * EP93xx pwm peripheral handling

 *************************************************************************/
@@ -827,8 +818,9 @@ void __init ep93xx_init_devices(void) 


	platform_device_register(&ep93xx_rtc_device);

	platform_device_register(&ep93xx_ohci_device);

	platform_device_register(&ep93xx_leds);

	platform_device_register(&ep93xx_wdt_device);



	gpio_led_register_device(-1, &ep93xx_led_data);

}



void ep93xx_restart(char mode, const char *cmd)