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

Commit 25329671 authored by Jürgen Schindele's avatar Jürgen Schindele Committed by Russell King
Browse files

[ARM] 5251/1: remove old LED support for Trizeps4 SOM 



Remove the old led support in arch/arm/mach-pxa/leds...
for TRIZEPS4 SOM. It is / will be replaced by generic
led driver drivers/leds/...

Signed-off-by: default avatarJürgen Schindele <linux@schindele.name>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 642aa663

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ config LEDS 
		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \

		   ARCH_AT91 || ARCH_DAVINCI || \

		   ARCH_KS8695 || MACH_RD88F5182

	help

	  If you say Y here, the LEDs on your machine will be used

arch/arm/mach-pxa/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ led-y := leds.o 
led-$(CONFIG_ARCH_LUBBOCK)	+= leds-lubbock.o

led-$(CONFIG_MACH_MAINSTONE)	+= leds-mainstone.o

led-$(CONFIG_ARCH_PXA_IDP)	+= leds-idp.o

led-$(CONFIG_MACH_TRIZEPS4)	+= leds-trizeps4.o



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

arch/arm/mach-pxa/leds-trizeps4.c

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

 * linux/arch/arm/mach-pxa/leds-trizeps4.c

 *

 *  Author:	Jürgen Schindele

 *  Created:	20 02, 2006

 *  Copyright:	Jürgen Schindele

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/init.h>



#include <mach/hardware.h>

#include <asm/system.h>

#include <asm/types.h>

#include <asm/leds.h>



#include <mach/pxa-regs.h>

#include <mach/pxa2xx-gpio.h>

#include <mach/trizeps4.h>



#include "leds.h"



#define LED_STATE_ENABLED	1

#define LED_STATE_CLAIMED	2



#define SYS_BUSY		0x01

#define HEARTBEAT		0x02

#define BLINK			0x04



static unsigned int led_state;

static unsigned int hw_led_state;



void trizeps4_leds_event(led_event_t evt)

{

	unsigned long flags;



	local_irq_save(flags);



	switch (evt) {

	case led_start:

		hw_led_state = 0;

		pxa_gpio_mode( GPIO_SYS_BUSY_LED  | GPIO_OUT);		/* LED1 */

		pxa_gpio_mode( GPIO_HEARTBEAT_LED | GPIO_OUT);		/* LED2 */

		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 = 0;

		break;



	case led_release:

		led_state &= ~LED_STATE_CLAIMED;

		hw_led_state = 0;

		break;



#ifdef CONFIG_LEDS_TIMER

	case led_timer:

		hw_led_state ^= HEARTBEAT;

		break;

#endif



#ifdef CONFIG_LEDS_CPU

	case led_idle_start:

		hw_led_state &= ~SYS_BUSY;

		break;



	case led_idle_end:

		hw_led_state |= SYS_BUSY;

		break;

#endif



	case led_halted:

		break;



	case led_green_on:

		hw_led_state |= BLINK;

		break;



	case led_green_off:

		hw_led_state &= ~BLINK;

		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) {

		switch (hw_led_state) {

			case 0:

				GPSR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);

				GPSR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);

				break;

			case 1:

				GPCR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);

				GPSR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);

				break;

			case 2:

				GPSR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);

				GPCR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);

				break;

			case 3:

				GPCR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);

				GPCR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);

				break;

		}

	}

	else {

		/* turn all off */

		GPSR(GPIO_SYS_BUSY_LED)  |= GPIO_bit(GPIO_SYS_BUSY_LED);

		GPSR(GPIO_HEARTBEAT_LED) |= GPIO_bit(GPIO_HEARTBEAT_LED);

	}



	local_irq_restore(flags);

}

arch/arm/mach-pxa/leds.c

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ pxa_leds_init(void) 
		leds_event = mainstone_leds_event;

	if (machine_is_pxa_idp())

		leds_event = idp_leds_event;

	if (machine_is_trizeps4())

		leds_event = trizeps4_leds_event;



	leds_event(led_start);

	return 0;