forked from luck/tmp_suning_uos_patched
ARM: mach-shark: retire custom LED code
The CPU activity LED is now handled by the trigger in the leds subsystem, retire this old CONFIG_LEDS-based code. Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
This commit is contained in:
Bryan Wu
parent
ae5362d2c2
commit
408a4b2e0f
|
|
@ -4,9 +4,7 @@
|
||||||
|
|
||||||
# Object file lists.
|
# Object file lists.
|
||||||
|
|
||||||
obj-y := core.o dma.o irq.o pci.o
|
obj-y := core.o dma.o irq.o pci.o leds.o
|
||||||
obj-m :=
|
obj-m :=
|
||||||
obj-n :=
|
obj-n :=
|
||||||
obj- :=
|
obj- :=
|
||||||
|
|
||||||
obj-$(CONFIG_LEDS) += leds.o
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@
|
||||||
|
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
#include <asm/leds.h>
|
|
||||||
#include <asm/param.h>
|
#include <asm/param.h>
|
||||||
#include <asm/system_misc.h>
|
#include <asm/system_misc.h>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,165 +1,117 @@
|
||||||
/*
|
/*
|
||||||
* arch/arm/mach-shark/leds.c
|
|
||||||
* by Alexander Schulz
|
|
||||||
*
|
|
||||||
* derived from:
|
|
||||||
* arch/arm/kernel/leds-footbridge.c
|
|
||||||
* Copyright (C) 1998-1999 Russell King
|
|
||||||
*
|
|
||||||
* DIGITAL Shark LED control routines.
|
* DIGITAL Shark LED control routines.
|
||||||
*
|
*
|
||||||
* The leds use is as follows:
|
* Driver for the 3 user LEDs found on the Shark
|
||||||
* - Green front - toggles state every 50 timer interrupts
|
* Based on Versatile and RealView machine LED code
|
||||||
* - Amber front - Unused, this is a dual color led (Amber/Green)
|
|
||||||
* - Amber back - On if system is not idle
|
|
||||||
*
|
*
|
||||||
* Changelog:
|
* License terms: GNU General Public License (GPL) version 2
|
||||||
|
* Author: Bryan Wu <bryan.wu@canonical.com>
|
||||||
*/
|
*/
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/spinlock.h>
|
|
||||||
#include <linux/ioport.h>
|
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
|
#include <linux/ioport.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
#include <linux/leds.h>
|
||||||
|
|
||||||
#include <asm/leds.h>
|
#include <asm/mach-types.h>
|
||||||
|
|
||||||
#define LED_STATE_ENABLED 1
|
#if defined(CONFIG_NEW_LEDS) && defined(CONFIG_LEDS_CLASS)
|
||||||
#define LED_STATE_CLAIMED 2
|
struct shark_led {
|
||||||
|
struct led_classdev cdev;
|
||||||
|
u8 mask;
|
||||||
|
};
|
||||||
|
|
||||||
#define SEQUOIA_LED_GREEN (1<<6)
|
/*
|
||||||
#define SEQUOIA_LED_AMBER (1<<5)
|
* The triggers lines up below will only be used if the
|
||||||
#define SEQUOIA_LED_BACK (1<<7)
|
* LED triggers are compiled in.
|
||||||
|
*/
|
||||||
|
static const struct {
|
||||||
|
const char *name;
|
||||||
|
const char *trigger;
|
||||||
|
} shark_leds[] = {
|
||||||
|
{ "shark:amber0", "default-on", }, /* Bit 5 */
|
||||||
|
{ "shark:green", "heartbeat", }, /* Bit 6 */
|
||||||
|
{ "shark:amber1", "cpu0" }, /* Bit 7 */
|
||||||
|
};
|
||||||
|
|
||||||
static char led_state;
|
static u16 led_reg_read(void)
|
||||||
static short hw_led_state;
|
|
||||||
static short saved_state;
|
|
||||||
|
|
||||||
static DEFINE_RAW_SPINLOCK(leds_lock);
|
|
||||||
|
|
||||||
short sequoia_read(int addr) {
|
|
||||||
outw(addr,0x24);
|
|
||||||
return inw(0x26);
|
|
||||||
}
|
|
||||||
|
|
||||||
void sequoia_write(short value,short addr) {
|
|
||||||
outw(addr,0x24);
|
|
||||||
outw(value,0x26);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sequoia_leds_event(led_event_t evt)
|
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
outw(0x09, 0x24);
|
||||||
|
return inw(0x26);
|
||||||
|
}
|
||||||
|
|
||||||
raw_spin_lock_irqsave(&leds_lock, flags);
|
static void led_reg_write(u16 value)
|
||||||
|
{
|
||||||
|
outw(0x09, 0x24);
|
||||||
|
outw(value, 0x26);
|
||||||
|
}
|
||||||
|
|
||||||
hw_led_state = sequoia_read(0x09);
|
static void shark_led_set(struct led_classdev *cdev,
|
||||||
|
enum led_brightness b)
|
||||||
|
{
|
||||||
|
struct shark_led *led = container_of(cdev,
|
||||||
|
struct shark_led, cdev);
|
||||||
|
u16 reg = led_reg_read();
|
||||||
|
|
||||||
switch (evt) {
|
if (b != LED_OFF)
|
||||||
case led_start:
|
reg |= led->mask;
|
||||||
hw_led_state |= SEQUOIA_LED_GREEN;
|
else
|
||||||
hw_led_state |= SEQUOIA_LED_AMBER;
|
reg &= ~led->mask;
|
||||||
#ifdef CONFIG_LEDS_CPU
|
|
||||||
hw_led_state |= SEQUOIA_LED_BACK;
|
|
||||||
#else
|
|
||||||
hw_led_state &= ~SEQUOIA_LED_BACK;
|
|
||||||
#endif
|
|
||||||
led_state |= LED_STATE_ENABLED;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case led_stop:
|
led_reg_write(reg);
|
||||||
hw_led_state &= ~SEQUOIA_LED_BACK;
|
}
|
||||||
hw_led_state |= SEQUOIA_LED_GREEN;
|
|
||||||
hw_led_state |= SEQUOIA_LED_AMBER;
|
|
||||||
led_state &= ~LED_STATE_ENABLED;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case led_claim:
|
static enum led_brightness shark_led_get(struct led_classdev *cdev)
|
||||||
led_state |= LED_STATE_CLAIMED;
|
{
|
||||||
saved_state = hw_led_state;
|
struct shark_led *led = container_of(cdev,
|
||||||
hw_led_state &= ~SEQUOIA_LED_BACK;
|
struct shark_led, cdev);
|
||||||
hw_led_state |= SEQUOIA_LED_GREEN;
|
u16 reg = led_reg_read();
|
||||||
hw_led_state |= SEQUOIA_LED_AMBER;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case led_release:
|
return (reg & led->mask) ? LED_FULL : LED_OFF;
|
||||||
led_state &= ~LED_STATE_CLAIMED;
|
}
|
||||||
hw_led_state = saved_state;
|
|
||||||
break;
|
|
||||||
|
|
||||||
#ifdef CONFIG_LEDS_TIMER
|
static int __init shark_leds_init(void)
|
||||||
case led_timer:
|
{
|
||||||
if (!(led_state & LED_STATE_CLAIMED))
|
int i;
|
||||||
hw_led_state ^= SEQUOIA_LED_GREEN;
|
u16 reg;
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_LEDS_CPU
|
if (!machine_is_shark())
|
||||||
case led_idle_start:
|
return -ENODEV;
|
||||||
if (!(led_state & LED_STATE_CLAIMED))
|
|
||||||
hw_led_state &= ~SEQUOIA_LED_BACK;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case led_idle_end:
|
for (i = 0; i < ARRAY_SIZE(shark_leds); i++) {
|
||||||
if (!(led_state & LED_STATE_CLAIMED))
|
struct shark_led *led;
|
||||||
hw_led_state |= SEQUOIA_LED_BACK;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
case led_green_on:
|
led = kzalloc(sizeof(*led), GFP_KERNEL);
|
||||||
if (led_state & LED_STATE_CLAIMED)
|
if (!led)
|
||||||
hw_led_state &= ~SEQUOIA_LED_GREEN;
|
break;
|
||||||
break;
|
|
||||||
|
|
||||||
case led_green_off:
|
led->cdev.name = shark_leds[i].name;
|
||||||
if (led_state & LED_STATE_CLAIMED)
|
led->cdev.brightness_set = shark_led_set;
|
||||||
hw_led_state |= SEQUOIA_LED_GREEN;
|
led->cdev.brightness_get = shark_led_get;
|
||||||
break;
|
led->cdev.default_trigger = shark_leds[i].trigger;
|
||||||
|
|
||||||
case led_amber_on:
|
/* Count in 5 bits offset */
|
||||||
if (led_state & LED_STATE_CLAIMED)
|
led->mask = BIT(i + 5);
|
||||||
hw_led_state &= ~SEQUOIA_LED_AMBER;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case led_amber_off:
|
if (led_classdev_register(NULL, &led->cdev) < 0) {
|
||||||
if (led_state & LED_STATE_CLAIMED)
|
kfree(led);
|
||||||
hw_led_state |= SEQUOIA_LED_AMBER;
|
break;
|
||||||
break;
|
}
|
||||||
|
|
||||||
case led_red_on:
|
|
||||||
if (led_state & LED_STATE_CLAIMED)
|
|
||||||
hw_led_state |= SEQUOIA_LED_BACK;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case led_red_off:
|
|
||||||
if (led_state & LED_STATE_CLAIMED)
|
|
||||||
hw_led_state &= ~SEQUOIA_LED_BACK;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (led_state & LED_STATE_ENABLED)
|
|
||||||
sequoia_write(hw_led_state,0x09);
|
|
||||||
|
|
||||||
raw_spin_unlock_irqrestore(&leds_lock, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init leds_init(void)
|
|
||||||
{
|
|
||||||
extern void (*leds_event)(led_event_t);
|
|
||||||
short temp;
|
|
||||||
|
|
||||||
leds_event = sequoia_leds_event;
|
|
||||||
|
|
||||||
/* Make LEDs independent of power-state */
|
/* Make LEDs independent of power-state */
|
||||||
request_region(0x24,4,"sequoia");
|
request_region(0x24, 4, "led_reg");
|
||||||
temp = sequoia_read(0x09);
|
reg = led_reg_read();
|
||||||
temp |= 1<<10;
|
reg |= 1 << 10;
|
||||||
sequoia_write(temp,0x09);
|
led_reg_write(reg);
|
||||||
leds_event(led_start);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
__initcall(leds_init);
|
/*
|
||||||
|
* Since we may have triggers on any subsystem, defer registration
|
||||||
|
* until after subsystem_init.
|
||||||
|
*/
|
||||||
|
fs_initcall(shark_leds_init);
|
||||||
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user