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

Commit d056f5a8 authored by Jochen Friedrich's avatar Jochen Friedrich Committed by Russell King
Browse files

ARM: 7026/1: simpad: replace ARM specific LED code 



Remove the legacy ARM LED code for simpad devices and
register a stadard LED platform device using GPIO line
instead.

Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent dbd406f9

arch/arm/mach-sa1100/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ obj-$(CONFIG_SA1100_PLEB) += pleb.o 
obj-$(CONFIG_SA1100_SHANNON)		+= shannon.o



obj-$(CONFIG_SA1100_SIMPAD)		+= simpad.o

led-$(CONFIG_SA1100_SIMPAD)		+= leds-simpad.o



# LEDs support

obj-$(CONFIG_LEDS) += $(led-y)

arch/arm/mach-sa1100/leds-simpad.c

deleted100644 → 0
+0 −97
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-sa1100/leds-simpad.c

 *

 * Author: Juergen Messerer <juergen.messerer@siemens.ch>

 */

#include <linux/init.h>



#include <mach/hardware.h>

#include <asm/leds.h>

#include <asm/system.h>

#include <mach/simpad.h>



#include "leds.h"





#define LED_STATE_ENABLED	1

#define LED_STATE_CLAIMED	2



static unsigned int led_state;

static unsigned int hw_led_state;



#define	LED_GREEN	(1)

#define	LED_MASK	(1)



void simpad_leds_event(led_event_t evt)

{

	switch (evt)

	{

	case led_start:

	        hw_led_state = LED_GREEN;

		led_state = LED_STATE_ENABLED;

		break;



	case led_stop:

		led_state &= ~LED_STATE_ENABLED;

		break;



	case led_claim:

		led_state |= LED_STATE_CLAIMED;

		hw_led_state = LED_GREEN;

		break;



	case led_release:

		led_state &= ~LED_STATE_CLAIMED;

		hw_led_state = LED_GREEN;

		break;



#ifdef CONFIG_LEDS_TIMER

	case led_timer:

		if (!(led_state & LED_STATE_CLAIMED))

			hw_led_state ^= LED_GREEN;

		break;

#endif



#ifdef CONFIG_LEDS_CPU

	case led_idle_start:

		break;



	case led_idle_end:

		break;

#endif



	case led_halted:

		break;



	case led_green_on:

		if (led_state & LED_STATE_CLAIMED)

			hw_led_state |= LED_GREEN;

		break;



	case led_green_off:

		if (led_state & LED_STATE_CLAIMED)

			hw_led_state &= ~LED_GREEN;

		break;



	case led_amber_on:

		break;



	case led_amber_off:

		break;



	case led_red_on:

		break;



	case led_red_off:

		break;



	default:

		break;

	}



	if  (led_state & LED_STATE_ENABLED)

		simpad_set_cs3_bit(LED2_ON);

	else 

		simpad_clear_cs3_bit(LED2_ON);

}

arch/arm/mach-sa1100/leds.c

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ sa1100_leds_init(void) 
		leds_event = adsbitsy_leds_event;

	if (machine_is_pt_system3())

		leds_event = system3_leds_event;

	if (machine_is_simpad())

		leds_event = simpad_leds_event; /* what about machine registry? including led, apm... -zecke */



	leds_event(led_start);

	return 0;

arch/arm/mach-sa1100/leds.h

+0 −1
Original line number Diff line number Diff line
@@ -11,4 +11,3 @@ extern void pfs168_leds_event(led_event_t evt); 
extern void graphicsmaster_leds_event(led_event_t evt);

extern void adsbitsy_leds_event(led_event_t evt);

extern void system3_leds_event(led_event_t evt);
 
extern void simpad_leds_event(led_event_t evt);

arch/arm/mach-sa1100/simpad.c

+28 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/ioport.h>

#include <linux/input.h>

#include <linux/gpio_keys.h>

#include <linux/leds.h>

#include <linux/i2c-gpio.h>



#include "generic.h"
@@ -294,6 +295,32 @@ static struct platform_device simpad_polled_keys = { 
	},

};



/*

 * GPIO LEDs

 */



static struct gpio_led simpad_leds[] = {

	{

		.name = "simpad:power",

		.gpio = SIMPAD_CS3_LED2_ON,

		.active_low = 0,

		.default_trigger = "default-on",

	},

};



static struct gpio_led_platform_data simpad_led_data = {

	.num_leds = ARRAY_SIZE(simpad_leds),

	.leds = simpad_leds,

};



static struct platform_device simpad_gpio_leds = {

	.name = "leds-gpio",

	.id = 0,

	.dev = {

		.platform_data = &simpad_led_data,

	},

};



/*

 * i2c

 */
@@ -324,6 +351,7 @@ static struct platform_device *devices[] __initdata = { 
	&simpad_keys,

	&simpad_polled_keys,

	&simpad_mq200fb,

	&simpad_gpio_leds,

	&simpad_i2c,

};