Commit 55f5d8ec authored by Bryan Wu's avatar Bryan Wu
Browse files

ARM: mach-pxa: retire custom LED code 



Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
parent 51891a43

arch/arm/mach-pxa/Makefile

+0 −8
Original line number Diff line number Diff line
@@ -95,12 +95,4 @@ obj-$(CONFIG_MACH_RAUMFELD_CONNECTOR) += raumfeld.o 
obj-$(CONFIG_MACH_RAUMFELD_SPEAKER)	+= raumfeld.o

obj-$(CONFIG_MACH_ZIPIT2)	+= z2.o



# Support for blinky lights

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



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



obj-$(CONFIG_TOSA_BT)		+= tosa-bt.o

arch/arm/mach-pxa/idp.c

+81 −0
Original line number Diff line number Diff line
@@ -191,6 +191,87 @@ static void __init idp_map_io(void) 
	iotable_init(idp_io_desc, ARRAY_SIZE(idp_io_desc));

}



/* LEDs */

#if defined(CONFIG_NEW_LEDS) && defined(CONFIG_LEDS_CLASS)

struct idp_led {

	struct led_classdev     cdev;

	u8                      mask;

};



/*

 * The triggers lines up below will only be used if the

 * LED triggers are compiled in.

 */

static const struct {

	const char *name;

	const char *trigger;

} idp_leds[] = {

	{ "idp:green", "heartbeat", },

	{ "idp:red", "cpu0", },

};



static void idp_led_set(struct led_classdev *cdev,

		enum led_brightness b)

{

	struct idp_led *led = container_of(cdev,

			struct idp_led, cdev);

	u32 reg = IDP_CPLD_LED_CONTROL;



	if (b != LED_OFF)

		reg &= ~led->mask;

	else

		reg |= led->mask;



	IDP_CPLD_LED_CONTROL = reg;

}



static enum led_brightness idp_led_get(struct led_classdev *cdev)

{

	struct idp_led *led = container_of(cdev,

			struct idp_led, cdev);



	return (IDP_CPLD_LED_CONTROL & led->mask) ? LED_OFF : LED_FULL;

}



static int __init idp_leds_init(void)

{

	int i;



	if (!machine_is_pxa_idp())

		return -ENODEV;



	for (i = 0; i < ARRAY_SIZE(idp_leds); i++) {

		struct idp_led *led;



		led = kzalloc(sizeof(*led), GFP_KERNEL);

		if (!led)

			break;



		led->cdev.name = idp_leds[i].name;

		led->cdev.brightness_set = idp_led_set;

		led->cdev.brightness_get = idp_led_get;

		led->cdev.default_trigger = idp_leds[i].trigger;



		if (i == 0)

			led->mask = IDP_HB_LED;

		else

			led->mask = IDP_BUSY_LED;



		if (led_classdev_register(NULL, &led->cdev) < 0) {

			kfree(led);

			break;

		}

	}



	return 0;

}



/*

 * Since we may have triggers on any subsystem, defer registration

 * until after subsystem_init.

 */

fs_initcall(idp_leds_init);

#endif



MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")

	/* Maintainer: Vibren Technologies */

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

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

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

 *

 * Copyright (C) 2000 John Dorsey <john+@cs.cmu.edu>

 *

 * Copyright (c) 2001 Jeff Sutherland <jeffs@accelent.com>

 *

 * Original (leds-footbridge.c) by Russell King

 *

 * Macros for actual LED manipulation should be in machine specific

 * files in this 'mach' directory.

 */





#include <linux/init.h>



#include <mach/hardware.h>

#include <asm/leds.h>



#include <mach/pxa25x.h>

#include <mach/idp.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;



void idp_leds_event(led_event_t evt)

{

	unsigned long flags;



	local_irq_save(flags);



	switch (evt) {

	case led_start:

		hw_led_state = IDP_HB_LED | IDP_BUSY_LED;

		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 = IDP_HB_LED | IDP_BUSY_LED;

		break;



	case led_release:

		led_state &= ~LED_STATE_CLAIMED;

		hw_led_state = IDP_HB_LED | IDP_BUSY_LED;

		break;



#ifdef CONFIG_LEDS_TIMER

	case led_timer:

		if (!(led_state & LED_STATE_CLAIMED))

			hw_led_state ^= IDP_HB_LED;

		break;

#endif



#ifdef CONFIG_LEDS_CPU

	case led_idle_start:

		if (!(led_state & LED_STATE_CLAIMED))

			hw_led_state &= ~IDP_BUSY_LED;

		break;



	case led_idle_end:

		if (!(led_state & LED_STATE_CLAIMED))

			hw_led_state |= IDP_BUSY_LED;

		break;

#endif



	case led_halted:

		break;



	case led_green_on:

		if (led_state & LED_STATE_CLAIMED)

			hw_led_state |= IDP_HB_LED;

		break;



	case led_green_off:

		if (led_state & LED_STATE_CLAIMED)

			hw_led_state &= ~IDP_HB_LED;

		break;



	case led_amber_on:

		break;



	case led_amber_off:

		break;



	case led_red_on:

		if (led_state & LED_STATE_CLAIMED)

			hw_led_state |= IDP_BUSY_LED;

		break;



	case led_red_off:

		if (led_state & LED_STATE_CLAIMED)

			hw_led_state &= ~IDP_BUSY_LED;

		break;



	default:

		break;

	}



	if  (led_state & LED_STATE_ENABLED)

		IDP_CPLD_LED_CONTROL = ( (IDP_CPLD_LED_CONTROL | IDP_LEDS_MASK) & ~hw_led_state);

	else

		IDP_CPLD_LED_CONTROL |= IDP_LEDS_MASK;



	local_irq_restore(flags);

}

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

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

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

 *

 * Copyright (C) 2000 John Dorsey <john+@cs.cmu.edu>

 *

 * Copyright (c) 2001 Jeff Sutherland <jeffs@accelent.com>

 *

 * Original (leds-footbridge.c) by Russell King

 *

 * Major surgery on April 2004 by Nicolas Pitre for less global

 * namespace collision.  Mostly adapted the Mainstone version.

 */



#include <linux/init.h>



#include <mach/hardware.h>

#include <asm/leds.h>

#include <mach/pxa25x.h>

#include <mach/lubbock.h>



#include "leds.h"



/*

 * 8 discrete leds available for general use:

 *

 * Note: bits [15-8] are used to enable/blank the 8 7 segment hex displays

 * so be sure to not monkey with them here.

 */



#define D28			(1 << 0)

#define D27			(1 << 1)

#define D26			(1 << 2)

#define D25			(1 << 3)

#define D24			(1 << 4)

#define D23			(1 << 5)

#define D22			(1 << 6)

#define D21			(1 << 7)



#define LED_STATE_ENABLED	1

#define LED_STATE_CLAIMED	2



static unsigned int led_state;

static unsigned int hw_led_state;



void lubbock_leds_event(led_event_t evt)

{

	unsigned long flags;



	local_irq_save(flags);



	switch (evt) {

	case led_start:

		hw_led_state = 0;

		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 ^= D26;

		break;

#endif



#ifdef CONFIG_LEDS_CPU

	case led_idle_start:

		hw_led_state &= ~D27;

		break;



	case led_idle_end:

		hw_led_state |= D27;

		break;

#endif



	case led_halted:

		break;



	case led_green_on:

		hw_led_state |= D21;

		break;



	case led_green_off:

		hw_led_state &= ~D21;

		break;



	case led_amber_on:

		hw_led_state |= D22;

		break;



	case led_amber_off:

		hw_led_state &= ~D22;

		break;



	case led_red_on:

		hw_led_state |= D23;

		break;



	case led_red_off:

		hw_led_state &= ~D23;

		break;



	default:

		break;

	}



	if  (led_state & LED_STATE_ENABLED)

		LUB_DISC_BLNK_LED = (LUB_DISC_BLNK_LED | 0xff) & ~hw_led_state;

	else

		LUB_DISC_BLNK_LED |= 0xff;



	local_irq_restore(flags);

}

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

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

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

 *

 * Author:     Nicolas Pitre

 * Created:    Nov 05, 2002

 * Copyright:  MontaVista Software Inc.

 *

 * 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/leds.h>



#include <mach/pxa27x.h>

#include <mach/mainstone.h>



#include "leds.h"





/* 8 discrete leds available for general use: */

#define D28			(1 << 0)

#define D27			(1 << 1)

#define D26			(1 << 2)

#define D25			(1 << 3)

#define D24			(1 << 4)

#define D23			(1 << 5)

#define D22			(1 << 6)

#define D21			(1 << 7)



#define LED_STATE_ENABLED	1

#define LED_STATE_CLAIMED	2



static unsigned int led_state;

static unsigned int hw_led_state;



void mainstone_leds_event(led_event_t evt)

{

	unsigned long flags;



	local_irq_save(flags);



	switch (evt) {

	case led_start:

		hw_led_state = 0;

		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 ^= D26;

		break;

#endif



#ifdef CONFIG_LEDS_CPU

	case led_idle_start:

		hw_led_state &= ~D27;

		break;



	case led_idle_end:

		hw_led_state |= D27;

		break;

#endif



	case led_halted:

		break;



	case led_green_on:

		hw_led_state |= D21;

		break;



	case led_green_off:

		hw_led_state &= ~D21;

		break;



	case led_amber_on:

		hw_led_state |= D22;

		break;



	case led_amber_off:

		hw_led_state &= ~D22;

		break;



	case led_red_on:

		hw_led_state |= D23;

		break;



	case led_red_off:

		hw_led_state &= ~D23;

		break;



	default:

		break;

	}



	if  (led_state & LED_STATE_ENABLED)

		MST_LEDCTRL = (MST_LEDCTRL | 0xff) & ~hw_led_state;

	else

		MST_LEDCTRL |= 0xff;



	local_irq_restore(flags);

}