* [PATCH 01/17] leds: create a trigger for CPU activity
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-06 13:16 ` Eric Miao
2011-07-06 12:34 ` [PATCH 02/17] arm: at91: convert old leds drivers to gpio_led and led_trigger drivers Bryan Wu
` (16 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Attempting to consolidate the ARM LED code, this removes the
custom RealView LED trigger code to turn LEDs on and off in
response to CPU activity and replace it with a standard trigger.
(bryan.wu at canonical.com:
It moves arch/arm/kernel/leds.c syscore stubs into this trigger.
It also provides ledtrig_cpu trigger event stub in <linux/leds.h>.
Although it was inspired by ARM work, it can be used in other arch.)
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
drivers/leds/Kconfig | 10 +++
drivers/leds/Makefile | 1 +
drivers/leds/ledtrig-cpu.c | 144 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/leds.h | 15 +++++
4 files changed, 170 insertions(+), 0 deletions(-)
create mode 100644 drivers/leds/ledtrig-cpu.c
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 713d43b..186000a 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -446,6 +446,16 @@ config LEDS_TRIGGER_BACKLIGHT
If unsure, say N.
+config LEDS_TRIGGER_CPU
+ bool "LED CPU Trigger"
+ depends on LEDS_TRIGGERS
+ help
+ This allows LEDs to be controlled by active CPUs. This shows
+ the active CPUs across an array of LEDs so you can see what
+ CPUs are active on the system at any given moment.
+
+ If unsure, say N.
+
config LEDS_TRIGGER_GPIO
tristate "LED GPIO Trigger"
depends on LEDS_TRIGGERS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index bbfd2e3..5e70d2e 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -53,4 +53,5 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o
obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o
+obj-$(CONFIG_LEDS_TRIGGER_CPU) += ledtrig-cpu.o
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
diff --git a/drivers/leds/ledtrig-cpu.c b/drivers/leds/ledtrig-cpu.c
new file mode 100644
index 0000000..4d63ada
--- /dev/null
+++ b/drivers/leds/ledtrig-cpu.c
@@ -0,0 +1,144 @@
+/*
+ * ledtrig-cpu.c - LED trigger based on CPU activity
+ *
+ * Copyright 2011 Linus Walleij <linus.walleij@linaro.org>
+ * Copyright 2011 Bryan Wu <bryan.wu@canonical.com>
+ *
+ * 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/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/percpu.h>
+#include <linux/syscore_ops.h>
+#include "leds.h"
+
+struct cpu_trig_data {
+ struct led_classdev *led;
+};
+
+static DEFINE_PER_CPU(struct cpu_trig_data *, cpu_triggers);
+
+void ledtrig_cpu(enum cpu_led_event ledevt)
+{
+ struct cpu_trig_data *trigdata = __get_cpu_var(cpu_triggers);
+
+ if (!trigdata)
+ return;
+
+ /* Locate the correct CPU LED */
+
+ switch (ledevt) {
+ case CPU_LED_START:
+ case CPU_LED_IDLE_START:
+ /* Will turn the LED on, max brightness */
+ if (trigdata->led)
+ led_set_brightness(trigdata->led,
+ trigdata->led->max_brightness);
+ break;
+
+ case CPU_LED_STOP:
+ case CPU_LED_IDLE_END:
+ case CPU_LED_HALTED:
+ /* Will turn the LED off */
+ if (trigdata->led)
+ led_set_brightness(trigdata->led, LED_OFF);
+ break;
+
+ default:
+ /* Will leave the LED as it is */
+ break;
+ }
+}
+EXPORT_SYMBOL(ledtrig_cpu);
+
+static void cpu_trig_activate_cpu(void *data)
+{
+ struct cpu_trig_data *cpu_data;
+ struct led_classdev *led = data;
+ int my_cpu = smp_processor_id();
+ unsigned long target_cpu = (unsigned long) led->trigger_data;
+
+ if (target_cpu != my_cpu)
+ return;
+
+ cpu_data = kzalloc(sizeof(*cpu_data), GFP_KERNEL);
+ if (!cpu_data)
+ return;
+
+ dev_info(led->dev, "led %s indicate activity on CPU %d\n",
+ led->name, my_cpu);
+
+ cpu_data->led = led;
+ __get_cpu_var(cpu_triggers) = cpu_data;
+}
+
+static void cpu_trig_activate(struct led_classdev *led)
+{
+ on_each_cpu(cpu_trig_activate_cpu, led, 1);
+}
+
+static void cpu_trig_deactivate(struct led_classdev *led)
+{
+ struct cpu_trig_data *cpu_data = led->trigger_data;
+
+ kfree(cpu_data);
+}
+
+static struct led_trigger cpu_led_trigger = {
+ .name = "cpu",
+ .activate = cpu_trig_activate,
+ .deactivate = cpu_trig_deactivate,
+};
+
+
+static int cpu_syscore_suspend(void)
+{
+ ledtrig_cpu(CPU_LED_STOP);
+ return 0;
+}
+
+static void cpu_syscore_resume(void)
+{
+ ledtrig_cpu(CPU_LED_START);
+}
+
+static void cpu_syscore_shutdown(void)
+{
+ ledtrig_cpu(CPU_LED_HALTED);
+}
+
+static struct syscore_ops cpu_syscore_ops = {
+ .shutdown = cpu_syscore_shutdown,
+ .suspend = cpu_syscore_suspend,
+ .resume = cpu_syscore_resume,
+};
+
+static int __init cpu_trig_init(void)
+{
+ int ret;
+
+ ret = led_trigger_register(&cpu_led_trigger);
+ if (!ret)
+ register_syscore_ops(&cpu_syscore_ops);
+
+ return ret;
+}
+module_init(cpu_trig_init);
+
+static void __exit cpu_trig_exit(void)
+{
+ unregister_syscore_ops(&cpu_syscore_ops);
+ led_trigger_unregister(&cpu_led_trigger);
+}
+module_exit(cpu_trig_exit);
+
+MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
+MODULE_AUTHOR("Bryan Wu <bryan.wu@canonical.com>");
+MODULE_DESCRIPTION("CPU LED trigger");
+MODULE_LICENSE("GPL");
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 5884def..94cdb9a 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -210,4 +210,19 @@ struct gpio_led_platform_data {
struct platform_device *gpio_led_register_device(
int id, const struct gpio_led_platform_data *pdata);
+#ifdef CONFIG_LEDS_TRIGGER_CPU
+enum cpu_led_event {
+ CPU_LED_IDLE_START,
+ CPU_LED_IDLE_END,
+ CPU_LED_START,
+ CPU_LED_STOP,
+ CPU_LED_HALTED
+};
+
+/* Use this routine to handle LEDs */
+extern void ledtrig_cpu(enum cpu_led_event evt);
+#else
+#define ledtrig_cpu(evt) do {} while (0)
+#endif
+
#endif /* __LINUX_LEDS_H_INCLUDED */
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 01/17] leds: create a trigger for CPU activity
2011-07-06 12:34 ` [PATCH 01/17] leds: create a " Bryan Wu
@ 2011-07-06 13:16 ` Eric Miao
2011-07-06 13:35 ` Russell King - ARM Linux
2011-07-07 12:58 ` Bryan Wu
0 siblings, 2 replies; 66+ messages in thread
From: Eric Miao @ 2011-07-06 13:16 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 6, 2011 at 8:34 PM, Bryan Wu <bryan.wu@canonical.com> wrote:
> Attempting to consolidate the ARM LED code, this removes the
> custom RealView LED trigger code to turn LEDs on and off in
> response to CPU activity and replace it with a standard trigger.
>
> (bryan.wu at canonical.com:
> It moves arch/arm/kernel/leds.c syscore stubs into this trigger.
> It also provides ledtrig_cpu trigger event stub in <linux/leds.h>.
> Although it was inspired by ARM work, it can be used in other arch.)
>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
> ---
> ?drivers/leds/Kconfig ? ? ? | ? 10 +++
> ?drivers/leds/Makefile ? ? ?| ? ?1 +
> ?drivers/leds/ledtrig-cpu.c | ?144 ++++++++++++++++++++++++++++++++++++++++++++
> ?include/linux/leds.h ? ? ? | ? 15 +++++
> ?4 files changed, 170 insertions(+), 0 deletions(-)
> ?create mode 100644 drivers/leds/ledtrig-cpu.c
>
> diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
> index 713d43b..186000a 100644
> --- a/drivers/leds/Kconfig
> +++ b/drivers/leds/Kconfig
> @@ -446,6 +446,16 @@ config LEDS_TRIGGER_BACKLIGHT
>
> ? ? ? ? ?If unsure, say N.
>
> +config LEDS_TRIGGER_CPU
> + ? ? ? bool "LED CPU Trigger"
> + ? ? ? depends on LEDS_TRIGGERS
> + ? ? ? help
> + ? ? ? ? This allows LEDs to be controlled by active CPUs. This shows
> + ? ? ? ? the active CPUs across an array of LEDs so you can see what
> + ? ? ? ? CPUs are active on the system at any given moment.
> +
> + ? ? ? ? If unsure, say N.
> +
> ?config LEDS_TRIGGER_GPIO
> ? ? ? ?tristate "LED GPIO Trigger"
> ? ? ? ?depends on LEDS_TRIGGERS
> diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
> index bbfd2e3..5e70d2e 100644
> --- a/drivers/leds/Makefile
> +++ b/drivers/leds/Makefile
> @@ -53,4 +53,5 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) ? += ledtrig-ide-disk.o
> ?obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) ? += ledtrig-heartbeat.o
> ?obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) ? += ledtrig-backlight.o
> ?obj-$(CONFIG_LEDS_TRIGGER_GPIO) ? ? ? ? ? ? ? ?+= ledtrig-gpio.o
> +obj-$(CONFIG_LEDS_TRIGGER_CPU) ? ? ? ? += ledtrig-cpu.o
> ?obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) ?+= ledtrig-default-on.o
> diff --git a/drivers/leds/ledtrig-cpu.c b/drivers/leds/ledtrig-cpu.c
> new file mode 100644
> index 0000000..4d63ada
> --- /dev/null
> +++ b/drivers/leds/ledtrig-cpu.c
> @@ -0,0 +1,144 @@
> +/*
> + * ledtrig-cpu.c - LED trigger based on CPU activity
> + *
> + * Copyright 2011 Linus Walleij <linus.walleij@linaro.org>
> + * Copyright 2011 Bryan Wu <bryan.wu@canonical.com>
> + *
> + * 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/module.h>
> +#include <linux/kernel.h>
> +#include <linux/init.h>
> +#include <linux/slab.h>
> +#include <linux/percpu.h>
> +#include <linux/syscore_ops.h>
> +#include "leds.h"
> +
> +struct cpu_trig_data {
> + ? ? ? struct led_classdev *led;
> +};
> +
> +static DEFINE_PER_CPU(struct cpu_trig_data *, cpu_triggers);
> +
> +void ledtrig_cpu(enum cpu_led_event ledevt)
> +{
> + ? ? ? struct cpu_trig_data *trigdata = __get_cpu_var(cpu_triggers);
> +
> + ? ? ? if (!trigdata)
> + ? ? ? ? ? ? ? return;
> +
> + ? ? ? /* Locate the correct CPU LED */
> +
> + ? ? ? switch (ledevt) {
> + ? ? ? case CPU_LED_START:
> + ? ? ? case CPU_LED_IDLE_START:
> + ? ? ? ? ? ? ? /* Will turn the LED on, max brightness */
> + ? ? ? ? ? ? ? if (trigdata->led)
> + ? ? ? ? ? ? ? ? ? ? ? led_set_brightness(trigdata->led,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?trigdata->led->max_brightness);
> + ? ? ? ? ? ? ? break;
> +
> + ? ? ? case CPU_LED_STOP:
> + ? ? ? case CPU_LED_IDLE_END:
> + ? ? ? case CPU_LED_HALTED:
> + ? ? ? ? ? ? ? /* Will turn the LED off */
> + ? ? ? ? ? ? ? if (trigdata->led)
> + ? ? ? ? ? ? ? ? ? ? ? led_set_brightness(trigdata->led, LED_OFF);
> + ? ? ? ? ? ? ? break;
> +
> + ? ? ? default:
> + ? ? ? ? ? ? ? /* Will leave the LED as it is */
> + ? ? ? ? ? ? ? break;
> + ? ? ? }
> +}
I'm a bit worrying about the LED brightness hardcoded here, what if
a platform requires different behavior, e.g. LED_OFF when IDLE_START.
> +EXPORT_SYMBOL(ledtrig_cpu);
> +
> +static void cpu_trig_activate_cpu(void *data)
> +{
> + ? ? ? struct cpu_trig_data *cpu_data;
> + ? ? ? struct led_classdev *led = data;
> + ? ? ? int my_cpu = smp_processor_id();
> + ? ? ? unsigned long target_cpu = (unsigned long) led->trigger_data;
> +
> + ? ? ? if (target_cpu != my_cpu)
> + ? ? ? ? ? ? ? return;
> +
> + ? ? ? cpu_data = kzalloc(sizeof(*cpu_data), GFP_KERNEL);
> + ? ? ? if (!cpu_data)
> + ? ? ? ? ? ? ? return;
> +
> + ? ? ? dev_info(led->dev, "led %s indicate activity on CPU %d\n",
> + ? ? ? ? ? ? ? ?led->name, my_cpu);
> +
> + ? ? ? cpu_data->led = led;
> + ? ? ? __get_cpu_var(cpu_triggers) = cpu_data;
> +}
> +
> +static void cpu_trig_activate(struct led_classdev *led)
> +{
> + ? ? ? on_each_cpu(cpu_trig_activate_cpu, led, 1);
> +}
> +
> +static void cpu_trig_deactivate(struct led_classdev *led)
> +{
> + ? ? ? struct cpu_trig_data *cpu_data = led->trigger_data;
> +
> + ? ? ? kfree(cpu_data);
> +}
> +
> +static struct led_trigger cpu_led_trigger = {
> + ? ? ? .name ? ? ? ? ? = "cpu",
> + ? ? ? .activate ? ? ? = cpu_trig_activate,
> + ? ? ? .deactivate ? ? = cpu_trig_deactivate,
> +};
> +
> +
> +static int cpu_syscore_suspend(void)
> +{
> + ? ? ? ledtrig_cpu(CPU_LED_STOP);
> + ? ? ? return 0;
> +}
> +
> +static void cpu_syscore_resume(void)
> +{
> + ? ? ? ledtrig_cpu(CPU_LED_START);
> +}
> +
> +static void cpu_syscore_shutdown(void)
> +{
> + ? ? ? ledtrig_cpu(CPU_LED_HALTED);
> +}
> +
> +static struct syscore_ops cpu_syscore_ops = {
> + ? ? ? .shutdown ? ? ? = cpu_syscore_shutdown,
> + ? ? ? .suspend ? ? ? ?= cpu_syscore_suspend,
> + ? ? ? .resume ? ? ? ? = cpu_syscore_resume,
> +};
Even this is static, I think naming of ledtrig_cpu_syscore_* will be better
here, causing less confusion. As cpu_syscore_shutdown really gave me a
first impression it's about the action when the CPU shuts down.
> +
> +static int __init cpu_trig_init(void)
> +{
> + ? ? ? int ret;
> +
> + ? ? ? ret = led_trigger_register(&cpu_led_trigger);
> + ? ? ? if (!ret)
> + ? ? ? ? ? ? ? register_syscore_ops(&cpu_syscore_ops);
> +
> + ? ? ? return ret;
> +}
> +module_init(cpu_trig_init);
> +
> +static void __exit cpu_trig_exit(void)
> +{
> + ? ? ? unregister_syscore_ops(&cpu_syscore_ops);
> + ? ? ? led_trigger_unregister(&cpu_led_trigger);
> +}
> +module_exit(cpu_trig_exit);
ledtrig_cpu_exit?
> +
> +MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
> +MODULE_AUTHOR("Bryan Wu <bryan.wu@canonical.com>");
> +MODULE_DESCRIPTION("CPU LED trigger");
> +MODULE_LICENSE("GPL");
> diff --git a/include/linux/leds.h b/include/linux/leds.h
> index 5884def..94cdb9a 100644
> --- a/include/linux/leds.h
> +++ b/include/linux/leds.h
> @@ -210,4 +210,19 @@ struct gpio_led_platform_data {
> ?struct platform_device *gpio_led_register_device(
> ? ? ? ? ? ? ? ?int id, const struct gpio_led_platform_data *pdata);
>
> +#ifdef CONFIG_LEDS_TRIGGER_CPU
> +enum cpu_led_event {
> + ? ? ? CPU_LED_IDLE_START,
> + ? ? ? CPU_LED_IDLE_END,
> + ? ? ? CPU_LED_START,
> + ? ? ? CPU_LED_STOP,
> + ? ? ? CPU_LED_HALTED
> +};
A brief block of comments explaining these events would be
very helpful for passing correct parameters to ledtrig_cpu()
> +
> +/* Use this routine to handle LEDs */
> +extern void ledtrig_cpu(enum cpu_led_event evt);
> +#else
> +#define ledtrig_cpu(evt) do {} while (0)
> +#endif
> +
> ?#endif ? ? ? ? /* __LINUX_LEDS_H_INCLUDED */
> --
> 1.7.5
>
>
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 01/17] leds: create a trigger for CPU activity
2011-07-06 13:16 ` Eric Miao
@ 2011-07-06 13:35 ` Russell King - ARM Linux
2011-07-06 14:11 ` Nicolas Pitre
2011-07-07 12:58 ` Bryan Wu
1 sibling, 1 reply; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-06 13:35 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 06, 2011 at 09:16:47PM +0800, Eric Miao wrote:
> On Wed, Jul 6, 2011 at 8:34 PM, Bryan Wu <bryan.wu@canonical.com> wrote:
> > + ? ? ? switch (ledevt) {
> > + ? ? ? case CPU_LED_START:
> > + ? ? ? case CPU_LED_IDLE_START:
> > + ? ? ? ? ? ? ? /* Will turn the LED on, max brightness */
> > + ? ? ? ? ? ? ? if (trigdata->led)
> > + ? ? ? ? ? ? ? ? ? ? ? led_set_brightness(trigdata->led,
> > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?trigdata->led->max_brightness);
> > + ? ? ? ? ? ? ? break;
> > +
> > + ? ? ? case CPU_LED_STOP:
> > + ? ? ? case CPU_LED_IDLE_END:
> > + ? ? ? case CPU_LED_HALTED:
> > + ? ? ? ? ? ? ? /* Will turn the LED off */
> > + ? ? ? ? ? ? ? if (trigdata->led)
> > + ? ? ? ? ? ? ? ? ? ? ? led_set_brightness(trigdata->led, LED_OFF);
> > + ? ? ? ? ? ? ? break;
> > +
> > + ? ? ? default:
> > + ? ? ? ? ? ? ? /* Will leave the LED as it is */
> > + ? ? ? ? ? ? ? break;
> > + ? ? ? }
> > +}
>
> I'm a bit worrying about the LED brightness hardcoded here, what if
> a platform requires different behavior, e.g. LED_OFF when IDLE_START.
Indeed - there are platforms (Netwinder, Assabet etc) which use LED=ON
to mean that the system is not idle - and also turn the LED on when
halted.
A change of behaviour could be fairly disasterous too. Eg, some people
use Netwinders in a stand-alone mode, and getting the LED behaviour correct
is _critical_ as it is the only display that some people may see - and
they may use that display to decide whether they can pull the power after
shutdown. Changing it may mean that they end up pulling the power while
the system is still alive.
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 01/17] leds: create a trigger for CPU activity
2011-07-06 13:35 ` Russell King - ARM Linux
@ 2011-07-06 14:11 ` Nicolas Pitre
0 siblings, 0 replies; 66+ messages in thread
From: Nicolas Pitre @ 2011-07-06 14:11 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 6 Jul 2011, Russell King - ARM Linux wrote:
> On Wed, Jul 06, 2011 at 09:16:47PM +0800, Eric Miao wrote:
> > On Wed, Jul 6, 2011 at 8:34 PM, Bryan Wu <bryan.wu@canonical.com> wrote:
> > > + ? ? ? switch (ledevt) {
> > > + ? ? ? case CPU_LED_START:
> > > + ? ? ? case CPU_LED_IDLE_START:
> > > + ? ? ? ? ? ? ? /* Will turn the LED on, max brightness */
> > > + ? ? ? ? ? ? ? if (trigdata->led)
> > > + ? ? ? ? ? ? ? ? ? ? ? led_set_brightness(trigdata->led,
> > > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?trigdata->led->max_brightness);
> > > + ? ? ? ? ? ? ? break;
> > > +
> > > + ? ? ? case CPU_LED_STOP:
> > > + ? ? ? case CPU_LED_IDLE_END:
> > > + ? ? ? case CPU_LED_HALTED:
> > > + ? ? ? ? ? ? ? /* Will turn the LED off */
> > > + ? ? ? ? ? ? ? if (trigdata->led)
> > > + ? ? ? ? ? ? ? ? ? ? ? led_set_brightness(trigdata->led, LED_OFF);
> > > + ? ? ? ? ? ? ? break;
> > > +
> > > + ? ? ? default:
> > > + ? ? ? ? ? ? ? /* Will leave the LED as it is */
> > > + ? ? ? ? ? ? ? break;
> > > + ? ? ? }
> > > +}
> >
> > I'm a bit worrying about the LED brightness hardcoded here, what if
> > a platform requires different behavior, e.g. LED_OFF when IDLE_START.
>
> Indeed - there are platforms (Netwinder, Assabet etc) which use LED=ON
> to mean that the system is not idle - and also turn the LED on when
> halted.
What about simply setting active_low to 1 in the struct gpio_led
instance for those particular LEDs (or invert it if it is already set)?
Nicolas
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 01/17] leds: create a trigger for CPU activity
2011-07-06 13:16 ` Eric Miao
2011-07-06 13:35 ` Russell King - ARM Linux
@ 2011-07-07 12:58 ` Bryan Wu
1 sibling, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-07 12:58 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 6, 2011 at 9:16 PM, Eric Miao <eric.y.miao@gmail.com> wrote:
> On Wed, Jul 6, 2011 at 8:34 PM, Bryan Wu <bryan.wu@canonical.com> wrote:
>> Attempting to consolidate the ARM LED code, this removes the
>> custom RealView LED trigger code to turn LEDs on and off in
>> response to CPU activity and replace it with a standard trigger.
>>
>> (bryan.wu at canonical.com:
>> It moves arch/arm/kernel/leds.c syscore stubs into this trigger.
>> It also provides ledtrig_cpu trigger event stub in <linux/leds.h>.
>> Although it was inspired by ARM work, it can be used in other arch.)
>>
>> Cc: Richard Purdie <rpurdie@rpsys.net>
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
>> ---
>> ?drivers/leds/Kconfig ? ? ? | ? 10 +++
>> ?drivers/leds/Makefile ? ? ?| ? ?1 +
>> ?drivers/leds/ledtrig-cpu.c | ?144 ++++++++++++++++++++++++++++++++++++++++++++
>> ?include/linux/leds.h ? ? ? | ? 15 +++++
>> ?4 files changed, 170 insertions(+), 0 deletions(-)
>> ?create mode 100644 drivers/leds/ledtrig-cpu.c
>>
>> diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
>> index 713d43b..186000a 100644
>> --- a/drivers/leds/Kconfig
>> +++ b/drivers/leds/Kconfig
>> @@ -446,6 +446,16 @@ config LEDS_TRIGGER_BACKLIGHT
>>
>> ? ? ? ? ?If unsure, say N.
>>
>> +config LEDS_TRIGGER_CPU
>> + ? ? ? bool "LED CPU Trigger"
>> + ? ? ? depends on LEDS_TRIGGERS
>> + ? ? ? help
>> + ? ? ? ? This allows LEDs to be controlled by active CPUs. This shows
>> + ? ? ? ? the active CPUs across an array of LEDs so you can see what
>> + ? ? ? ? CPUs are active on the system at any given moment.
>> +
>> + ? ? ? ? If unsure, say N.
>> +
>> ?config LEDS_TRIGGER_GPIO
>> ? ? ? ?tristate "LED GPIO Trigger"
>> ? ? ? ?depends on LEDS_TRIGGERS
>> diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
>> index bbfd2e3..5e70d2e 100644
>> --- a/drivers/leds/Makefile
>> +++ b/drivers/leds/Makefile
>> @@ -53,4 +53,5 @@ obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) ? += ledtrig-ide-disk.o
>> ?obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) ? += ledtrig-heartbeat.o
>> ?obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) ? += ledtrig-backlight.o
>> ?obj-$(CONFIG_LEDS_TRIGGER_GPIO) ? ? ? ? ? ? ? ?+= ledtrig-gpio.o
>> +obj-$(CONFIG_LEDS_TRIGGER_CPU) ? ? ? ? += ledtrig-cpu.o
>> ?obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) ?+= ledtrig-default-on.o
>> diff --git a/drivers/leds/ledtrig-cpu.c b/drivers/leds/ledtrig-cpu.c
>> new file mode 100644
>> index 0000000..4d63ada
>> --- /dev/null
>> +++ b/drivers/leds/ledtrig-cpu.c
>> @@ -0,0 +1,144 @@
>> +/*
>> + * ledtrig-cpu.c - LED trigger based on CPU activity
>> + *
>> + * Copyright 2011 Linus Walleij <linus.walleij@linaro.org>
>> + * Copyright 2011 Bryan Wu <bryan.wu@canonical.com>
>> + *
>> + * 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/module.h>
>> +#include <linux/kernel.h>
>> +#include <linux/init.h>
>> +#include <linux/slab.h>
>> +#include <linux/percpu.h>
>> +#include <linux/syscore_ops.h>
>> +#include "leds.h"
>> +
>> +struct cpu_trig_data {
>> + ? ? ? struct led_classdev *led;
>> +};
>> +
>> +static DEFINE_PER_CPU(struct cpu_trig_data *, cpu_triggers);
>> +
>> +void ledtrig_cpu(enum cpu_led_event ledevt)
>> +{
>> + ? ? ? struct cpu_trig_data *trigdata = __get_cpu_var(cpu_triggers);
>> +
>> + ? ? ? if (!trigdata)
>> + ? ? ? ? ? ? ? return;
>> +
>> + ? ? ? /* Locate the correct CPU LED */
>> +
>> + ? ? ? switch (ledevt) {
>> + ? ? ? case CPU_LED_START:
>> + ? ? ? case CPU_LED_IDLE_START:
>> + ? ? ? ? ? ? ? /* Will turn the LED on, max brightness */
>> + ? ? ? ? ? ? ? if (trigdata->led)
>> + ? ? ? ? ? ? ? ? ? ? ? led_set_brightness(trigdata->led,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?trigdata->led->max_brightness);
>> + ? ? ? ? ? ? ? break;
>> +
>> + ? ? ? case CPU_LED_STOP:
>> + ? ? ? case CPU_LED_IDLE_END:
>> + ? ? ? case CPU_LED_HALTED:
>> + ? ? ? ? ? ? ? /* Will turn the LED off */
>> + ? ? ? ? ? ? ? if (trigdata->led)
>> + ? ? ? ? ? ? ? ? ? ? ? led_set_brightness(trigdata->led, LED_OFF);
>> + ? ? ? ? ? ? ? break;
>> +
>> + ? ? ? default:
>> + ? ? ? ? ? ? ? /* Will leave the LED as it is */
>> + ? ? ? ? ? ? ? break;
>> + ? ? ? }
>> +}
>
> I'm a bit worrying about the LED brightness hardcoded here, what if
> a platform requires different behavior, e.g. LED_OFF when IDLE_START.
>
>> +EXPORT_SYMBOL(ledtrig_cpu);
>> +
>> +static void cpu_trig_activate_cpu(void *data)
>> +{
>> + ? ? ? struct cpu_trig_data *cpu_data;
>> + ? ? ? struct led_classdev *led = data;
>> + ? ? ? int my_cpu = smp_processor_id();
>> + ? ? ? unsigned long target_cpu = (unsigned long) led->trigger_data;
>> +
>> + ? ? ? if (target_cpu != my_cpu)
>> + ? ? ? ? ? ? ? return;
>> +
>> + ? ? ? cpu_data = kzalloc(sizeof(*cpu_data), GFP_KERNEL);
>> + ? ? ? if (!cpu_data)
>> + ? ? ? ? ? ? ? return;
>> +
>> + ? ? ? dev_info(led->dev, "led %s indicate activity on CPU %d\n",
>> + ? ? ? ? ? ? ? ?led->name, my_cpu);
>> +
>> + ? ? ? cpu_data->led = led;
>> + ? ? ? __get_cpu_var(cpu_triggers) = cpu_data;
>> +}
>> +
>> +static void cpu_trig_activate(struct led_classdev *led)
>> +{
>> + ? ? ? on_each_cpu(cpu_trig_activate_cpu, led, 1);
>> +}
>> +
>> +static void cpu_trig_deactivate(struct led_classdev *led)
>> +{
>> + ? ? ? struct cpu_trig_data *cpu_data = led->trigger_data;
>> +
>> + ? ? ? kfree(cpu_data);
>> +}
>> +
>> +static struct led_trigger cpu_led_trigger = {
>> + ? ? ? .name ? ? ? ? ? = "cpu",
>> + ? ? ? .activate ? ? ? = cpu_trig_activate,
>> + ? ? ? .deactivate ? ? = cpu_trig_deactivate,
>> +};
>> +
>> +
>> +static int cpu_syscore_suspend(void)
>> +{
>> + ? ? ? ledtrig_cpu(CPU_LED_STOP);
>> + ? ? ? return 0;
>> +}
>> +
>> +static void cpu_syscore_resume(void)
>> +{
>> + ? ? ? ledtrig_cpu(CPU_LED_START);
>> +}
>> +
>> +static void cpu_syscore_shutdown(void)
>> +{
>> + ? ? ? ledtrig_cpu(CPU_LED_HALTED);
>> +}
>> +
>> +static struct syscore_ops cpu_syscore_ops = {
>> + ? ? ? .shutdown ? ? ? = cpu_syscore_shutdown,
>> + ? ? ? .suspend ? ? ? ?= cpu_syscore_suspend,
>> + ? ? ? .resume ? ? ? ? = cpu_syscore_resume,
>> +};
>
> Even this is static, I think naming of ledtrig_cpu_syscore_* will be better
> here, causing less confusion. As cpu_syscore_shutdown really gave me a
> first impression it's about the action when the CPU shuts down.
>
OK, I will fix this name confusing issue.
Thanks
>> +
>> +static int __init cpu_trig_init(void)
>> +{
>> + ? ? ? int ret;
>> +
>> + ? ? ? ret = led_trigger_register(&cpu_led_trigger);
>> + ? ? ? if (!ret)
>> + ? ? ? ? ? ? ? register_syscore_ops(&cpu_syscore_ops);
>> +
>> + ? ? ? return ret;
>> +}
>> +module_init(cpu_trig_init);
>> +
>> +static void __exit cpu_trig_exit(void)
>> +{
>> + ? ? ? unregister_syscore_ops(&cpu_syscore_ops);
>> + ? ? ? led_trigger_unregister(&cpu_led_trigger);
>> +}
>> +module_exit(cpu_trig_exit);
>
> ledtrig_cpu_exit?
>
>> +
>> +MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
>> +MODULE_AUTHOR("Bryan Wu <bryan.wu@canonical.com>");
>> +MODULE_DESCRIPTION("CPU LED trigger");
>> +MODULE_LICENSE("GPL");
>> diff --git a/include/linux/leds.h b/include/linux/leds.h
>> index 5884def..94cdb9a 100644
>> --- a/include/linux/leds.h
>> +++ b/include/linux/leds.h
>> @@ -210,4 +210,19 @@ struct gpio_led_platform_data {
>> ?struct platform_device *gpio_led_register_device(
>> ? ? ? ? ? ? ? ?int id, const struct gpio_led_platform_data *pdata);
>>
>> +#ifdef CONFIG_LEDS_TRIGGER_CPU
>> +enum cpu_led_event {
>> + ? ? ? CPU_LED_IDLE_START,
>> + ? ? ? CPU_LED_IDLE_END,
>> + ? ? ? CPU_LED_START,
>> + ? ? ? CPU_LED_STOP,
>> + ? ? ? CPU_LED_HALTED
>> +};
>
> A brief block of comments explaining these events would be
> very helpful for passing correct parameters to ledtrig_cpu()
>
>> +
>> +/* Use this routine to handle LEDs */
>> +extern void ledtrig_cpu(enum cpu_led_event evt);
>> +#else
>> +#define ledtrig_cpu(evt) do {} while (0)
>> +#endif
>> +
>> ?#endif ? ? ? ? /* __LINUX_LEDS_H_INCLUDED */
>> --
>> 1.7.5
>>
>>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 02/17] arm: at91: convert old leds drivers to gpio_led and led_trigger drivers
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
2011-07-06 12:34 ` [PATCH 01/17] leds: create a " Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-06 12:34 ` [PATCH 03/17] mach-realview: retire custom LED code Bryan Wu
` (15 subsequent siblings)
17 siblings, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Build with at91 defconfigs successfully
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/board-cap9adk.c | 21 ++++++-
arch/arm/mach-at91/board-csb337.c | 3 -
arch/arm/mach-at91/board-ecbat91.c | 18 +++++-
arch/arm/mach-at91/board-eco920.c | 23 ++++++-
arch/arm/mach-at91/board-kafa.c | 17 ++++-
arch/arm/mach-at91/board-kb9202.c | 23 ++++++-
arch/arm/mach-at91/board-rm9200dk.c | 3 -
arch/arm/mach-at91/board-rm9200ek.c | 3 -
arch/arm/mach-at91/board-sam9-l9260.c | 23 ++++++-
arch/arm/mach-at91/board-sam9261ek.c | 3 -
arch/arm/mach-at91/board-yl-9200.c | 3 -
arch/arm/mach-at91/include/mach/board.h | 1 -
arch/arm/mach-at91/leds.c | 105 -------------------------------
13 files changed, 108 insertions(+), 138 deletions(-)
diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c
index cdb65d4..7a6a32b 100644
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@ -55,8 +55,6 @@ static void __init cap9adk_init_early(void)
/* Initialize processor: 12 MHz crystal */
at91cap9_initialize(12000000);
- /* Setup the LEDs: USER1 and USER2 LED for cpu/timer... */
- at91_init_leds(AT91_PIN_PA10, AT91_PIN_PA11);
/* ... POWER LED always on */
at91_set_gpio_output(AT91_PIN_PC29, 1);
@@ -365,6 +363,23 @@ static struct ac97c_platform_data cap9adk_ac97_data = {
// .reset_pin = ... not connected
};
+/*
+ * LEDs
+ */
+static struct gpio_led cap9adk_leds[] = {
+ { /* D1 */
+ .name = "led1",
+ .gpio = AT91_PIN_PA10,
+ .active_low = 1,
+ .default_trigger = "heartbeat",
+ },
+ { /* D2 */
+ .name = "led2",
+ .gpio = AT91_PIN_PA11,
+ .active_low = 1,
+ .default_trigger = "timer",
+ }
+};
static void __init cap9adk_board_init(void)
{
@@ -392,6 +407,8 @@ static void __init cap9adk_board_init(void)
at91_add_device_lcdc(&cap9adk_lcdc_data);
/* AC97 */
at91_add_device_ac97(&cap9adk_ac97_data);
+ /* LEDs */
+ at91_gpio_leds(cap9adk_leds, ARRAY_SIZE(cap9adk_leds));
}
MACHINE_START(AT91CAP9ADK, "Atmel AT91CAP9A-DK")
diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c
index d98bcec..da3fb48 100644
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
@@ -48,9 +48,6 @@ static void __init csb337_init_early(void)
/* Initialize processor: 3.6864 MHz crystal */
at91rm9200_initialize(3686400);
- /* Setup the LEDs */
- at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
-
/* DBGU on ttyS0 */
at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c
index a6f57fa..e82d024 100644
--- a/arch/arm/mach-at91/board-ecbat91.c
+++ b/arch/arm/mach-at91/board-ecbat91.c
@@ -51,9 +51,6 @@ static void __init ecb_at91init_early(void)
/* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000);
- /* Setup the LEDs */
- at91_init_leds(AT91_PIN_PC7, AT91_PIN_PC7);
-
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
@@ -149,6 +146,18 @@ static struct spi_board_info __initdata ecb_at91spi_devices[] = {
},
};
+/*
+ * LEDs
+ */
+static struct gpio_led ecb_leds[] = {
+ { /* D1 */
+ .name = "led1",
+ .gpio = AT91_PIN_PC7,
+ .active_low = 1,
+ .default_trigger = "heartbeat",
+ }
+};
+
static void __init ecb_at91board_init(void)
{
/* Serial */
@@ -168,6 +177,9 @@ static void __init ecb_at91board_init(void)
/* SPI */
at91_add_device_spi(ecb_at91spi_devices, ARRAY_SIZE(ecb_at91spi_devices));
+
+ /* LEDs */
+ at91_gpio_leds(ecb_leds, ARRAY_SIZE(ecb_leds));
}
MACHINE_START(ECBAT91, "emQbit's ECB_AT91")
diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c
index bfc0062..60fd9e6 100644
--- a/arch/arm/mach-at91/board-eco920.c
+++ b/arch/arm/mach-at91/board-eco920.c
@@ -37,9 +37,6 @@ static void __init eco920_init_early(void)
at91rm9200_initialize(18432000);
- /* Setup the LEDs */
- at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
-
/* DBGU on ttyS0. (Rx & Tx only */
at91_register_uart(0, 0, 0);
@@ -100,6 +97,24 @@ static struct spi_board_info eco920_spi_devices[] = {
},
};
+/*
+ * LEDs
+ */
+static struct gpio_led eco920_leds[] = {
+ { /* D1 */
+ .name = "led1",
+ .gpio = AT91_PIN_PB0,
+ .active_low = 1,
+ .default_trigger = "heartbeat",
+ },
+ { /* D2 */
+ .name = "led2",
+ .gpio = AT91_PIN_PB1,
+ .active_low = 1,
+ .default_trigger = "timer",
+ }
+};
+
static void __init eco920_board_init(void)
{
at91_add_device_serial();
@@ -130,6 +145,8 @@ static void __init eco920_board_init(void)
);
at91_add_device_spi(eco920_spi_devices, ARRAY_SIZE(eco920_spi_devices));
+ /* LEDs */
+ at91_gpio_leds(eco920_leds, ARRAY_SIZE(eco920_leds));
}
MACHINE_START(ECO920, "eco920")
diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c
index 9b003ff..5a46902 100644
--- a/arch/arm/mach-at91/board-kafa.c
+++ b/arch/arm/mach-at91/board-kafa.c
@@ -48,9 +48,6 @@ static void __init kafa_init_early(void)
/* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000);
- /* Set up the LEDs */
- at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4);
-
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
@@ -80,6 +77,18 @@ static struct at91_udc_data __initdata kafa_udc_data = {
.pullup_pin = AT91_PIN_PB7,
};
+/*
+ * LEDs
+ */
+static struct gpio_led kafa_leds[] = {
+ { /* D1 */
+ .name = "led1",
+ .gpio = AT91_PIN_PB4,
+ .active_low = 1,
+ .default_trigger = "heartbeat",
+ },
+};
+
static void __init kafa_board_init(void)
{
/* Serial */
@@ -94,6 +103,8 @@ static void __init kafa_board_init(void)
at91_add_device_i2c(NULL, 0);
/* SPI */
at91_add_device_spi(NULL, 0);
+ /* LEDs */
+ at91_gpio_leds(kafa_leds, ARRAY_SIZE(kafa_leds));
}
MACHINE_START(KAFA, "Sperry-Sun KAFA")
diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c
index a813a74..1a62283 100644
--- a/arch/arm/mach-at91/board-kb9202.c
+++ b/arch/arm/mach-at91/board-kb9202.c
@@ -50,9 +50,6 @@ static void __init kb9202_init_early(void)
/* Initialize processor: 10 MHz crystal */
at91rm9200_initialize(10000000);
- /* Set up the LEDs */
- at91_init_leds(AT91_PIN_PC19, AT91_PIN_PC18);
-
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
@@ -117,6 +114,24 @@ static struct atmel_nand_data __initdata kb9202_nand_data = {
.partition_info = nand_partitions,
};
+/*
+ * LEDs
+ */
+static struct gpio_led kb9202_leds[] = {
+ { /* D1 */
+ .name = "led1",
+ .gpio = AT91_PIN_PC19,
+ .active_low = 1,
+ .default_trigger = "heartbeat",
+ },
+ { /* D2 */
+ .name = "led2",
+ .gpio = AT91_PIN_PC18,
+ .active_low = 1,
+ .default_trigger = "timer",
+ }
+};
+
static void __init kb9202_board_init(void)
{
/* Serial */
@@ -135,6 +150,8 @@ static void __init kb9202_board_init(void)
at91_add_device_spi(NULL, 0);
/* NAND */
at91_add_device_nand(&kb9202_nand_data);
+ /* LEDs */
+ at91_gpio_leds(kb9202_leds, ARRAY_SIZE(kb9202_leds));
}
MACHINE_START(KB9200, "KB920x")
diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c
index aef9627..029e487 100644
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@ -50,9 +50,6 @@ static void __init dk_init_early(void)
/* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000);
- /* Setup the LEDs */
- at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
-
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c
index 015a021..0452f85 100644
--- a/arch/arm/mach-at91/board-rm9200ek.c
+++ b/arch/arm/mach-at91/board-rm9200ek.c
@@ -50,9 +50,6 @@ static void __init ek_init_early(void)
/* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000);
- /* Setup the LEDs */
- at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);
-
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
index aaf1bf0..a4c2de3 100644
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@ -49,9 +49,6 @@ static void __init ek_init_early(void)
/* Initialize processor: 18.432 MHz crystal */
at91sam9260_initialize(18432000);
- /* Setup the LEDs */
- at91_init_leds(AT91_PIN_PA9, AT91_PIN_PA6);
-
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
@@ -190,6 +187,24 @@ static struct at91_mmc_data __initdata ek_mmc_data = {
// .vcc_pin = ... not connected
};
+/*
+ * LEDs
+ */
+static struct gpio_led ek_leds[] = {
+ { /* D1 */
+ .name = "led1",
+ .gpio = AT91_PIN_PA9,
+ .active_low = 1,
+ .default_trigger = "heartbeat",
+ },
+ { /* D2 */
+ .name = "led2",
+ .gpio = AT91_PIN_PA6,
+ .active_low = 1,
+ .default_trigger = "timer",
+ }
+};
+
static void __init ek_board_init(void)
{
/* Serial */
@@ -208,6 +223,8 @@ static void __init ek_board_init(void)
at91_add_device_mmc(0, &ek_mmc_data);
/* I2C */
at91_add_device_i2c(NULL, 0);
+ /* LEDs */
+ at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
}
MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index b60c22b..00cc106 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -59,9 +59,6 @@ static void __init ek_init_early(void)
/* Initialize processor: 18.432 MHz crystal */
at91sam9261_initialize(18432000);
- /* Setup the LEDs */
- at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);
-
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index c208cc3..8a905a7 100644
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@ -58,9 +58,6 @@ static void __init yl9200_init_early(void)
/* Initialize processor: 18.432 MHz crystal */
at91rm9200_initialize(18432000);
- /* Setup the LEDs D2=PB17 (timer), D3=PB16 (cpu) */
- at91_init_leds(AT91_PIN_PB16, AT91_PIN_PB17);
-
/* DBGU on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index ed544a0..c2a7746 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -200,7 +200,6 @@ struct at91_can_data {
extern void __init at91_add_device_can(struct at91_can_data *data);
/* LEDs */
-extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);
extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);
extern void __init at91_pwm_leds(struct gpio_led *leds, int nr);
diff --git a/arch/arm/mach-at91/leds.c b/arch/arm/mach-at91/leds.c
index 0415a839..844aef8 100644
--- a/arch/arm/mach-at91/leds.c
+++ b/arch/arm/mach-at91/leds.c
@@ -90,108 +90,3 @@ void __init at91_pwm_leds(struct gpio_led *leds, int nr)
#else
void __init at91_pwm_leds(struct gpio_led *leds, int nr){}
#endif
-
-
-/* ------------------------------------------------------------------------- */
-
-#if defined(CONFIG_LEDS)
-
-#include <asm/leds.h>
-
-/*
- * Old ARM-specific LED framework; not fully functional when generic time is
- * in use.
- */
-
-static u8 at91_leds_cpu;
-static u8 at91_leds_timer;
-
-static inline void at91_led_on(unsigned int led)
-{
- at91_set_gpio_value(led, 0);
-}
-
-static inline void at91_led_off(unsigned int led)
-{
- at91_set_gpio_value(led, 1);
-}
-
-static inline void at91_led_toggle(unsigned int led)
-{
- unsigned long is_off = at91_get_gpio_value(led);
- if (is_off)
- at91_led_on(led);
- else
- at91_led_off(led);
-}
-
-
-/*
- * Handle LED events.
- */
-static void at91_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- local_irq_save(flags);
-
- switch(evt) {
- case led_start: /* System startup */
- at91_led_on(at91_leds_cpu);
- break;
-
- case led_stop: /* System stop / suspend */
- at91_led_off(at91_leds_cpu);
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer: /* Every 50 timer ticks */
- at91_led_toggle(at91_leds_timer);
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start: /* Entering idle state */
- at91_led_off(at91_leds_cpu);
- break;
-
- case led_idle_end: /* Exit idle state */
- at91_led_on(at91_leds_cpu);
- break;
-#endif
-
- default:
- break;
- }
-
- local_irq_restore(flags);
-}
-
-
-static int __init leds_init(void)
-{
- if (!at91_leds_timer || !at91_leds_cpu)
- return -ENODEV;
-
- leds_event = at91_leds_event;
-
- leds_event(led_start);
- return 0;
-}
-
-__initcall(leds_init);
-
-
-void __init at91_init_leds(u8 cpu_led, u8 timer_led)
-{
- /* Enable GPIO to access the LEDs */
- at91_set_gpio_output(cpu_led, 1);
- at91_set_gpio_output(timer_led, 1);
-
- at91_leds_cpu = cpu_led;
- at91_leds_timer = timer_led;
-}
-
-#else
-void __init at91_init_leds(u8 cpu_led, u8 timer_led) {}
-#endif
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 03/17] mach-realview: retire custom LED code
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
2011-07-06 12:34 ` [PATCH 01/17] leds: create a " Bryan Wu
2011-07-06 12:34 ` [PATCH 02/17] arm: at91: convert old leds drivers to gpio_led and led_trigger drivers Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-10 9:27 ` Russell King - ARM Linux
2011-07-06 12:34 ` [PATCH 04/17] mach-versatile: " Bryan Wu
` (14 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Linus Walleij <linus.walleij@linaro.org>
This replaces the custom LED trigger code in mach-realview with
some overarching platform code for the plat-versatile family that
will lock down LEDs 2 thru 5 for CPU activity indication. The
day we have 8 core ARM systems the plat-versatile code will have
to become more elaborate.
Tested on RealView PB11MPCore by invoking four different CPU
hogs (yes > /dev/null&) and see the LEDs go on one at a time.
They all go off as the hogs are killed. Tested on the PB1176
as well - just one activity led (led 2) goes on and off with
CPU activity.
(bryan.wu at canonical.com: use ledtrig-cpu instead of ledtrig-arm-cpu)
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Pawel Moll <pawel.moll@arm.com>
---
arch/arm/mach-realview/core.c | 39 ------------------------------
arch/arm/mach-realview/core.h | 2 -
arch/arm/mach-realview/realview_eb.c | 4 ---
arch/arm/mach-realview/realview_pb1176.c | 4 ---
arch/arm/mach-realview/realview_pb11mp.c | 4 ---
arch/arm/mach-realview/realview_pba8.c | 4 ---
arch/arm/mach-realview/realview_pbx.c | 4 ---
arch/arm/plat-versatile/Kconfig | 6 ++++-
arch/arm/plat-versatile/leds.c | 13 +++++++---
9 files changed, 14 insertions(+), 66 deletions(-)
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 5c23450..3a12b6b 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -36,7 +36,6 @@
#include <asm/system.h>
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/hardware/arm_timer.h>
#include <asm/hardware/icst.h>
@@ -437,44 +436,6 @@ struct clcd_board clcd_plat_data = {
.remove = versatile_clcd_remove_dma,
};
-#ifdef CONFIG_LEDS
-#define VA_LEDS_BASE (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LED_OFFSET)
-
-void realview_leds_event(led_event_t ledevt)
-{
- unsigned long flags;
- u32 val;
- u32 led = 1 << smp_processor_id();
-
- local_irq_save(flags);
- val = readl(VA_LEDS_BASE);
-
- switch (ledevt) {
- case led_idle_start:
- val = val & ~led;
- break;
-
- case led_idle_end:
- val = val | led;
- break;
-
- case led_timer:
- val = val ^ REALVIEW_SYS_LED7;
- break;
-
- case led_halted:
- val = 0;
- break;
-
- default:
- break;
- }
-
- writel(val, VA_LEDS_BASE);
- local_irq_restore(flags);
-}
-#endif /* CONFIG_LEDS */
-
/*
* Where is the timer (VA)?
*/
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 5c83d1e..47ee3bc 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -26,7 +26,6 @@
#include <linux/io.h>
#include <asm/setup.h>
-#include <asm/leds.h>
#define AMBA_DEVICE(name,busid,base,plat) \
static struct amba_device name##_device = { \
@@ -57,7 +56,6 @@ extern void __iomem *timer1_va_base;
extern void __iomem *timer2_va_base;
extern void __iomem *timer3_va_base;
-extern void realview_leds_event(led_event_t ledevt);
extern void realview_timer_init(unsigned int timer_irq);
extern int realview_flash_register(struct resource *res, u32 num);
extern int realview_eth_register(const char *name, struct resource *res);
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 10e75fa..2fb438a 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -30,7 +30,6 @@
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/pmu.h>
#include <asm/pgtable.h>
@@ -455,9 +454,6 @@ static void __init realview_eb_init(void)
amba_device_register(d, &iomem_resource);
}
-#ifdef CONFIG_LEDS
- leds_event = realview_leds_event;
-#endif
realview_reset = realview_eb_reset;
}
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index eab6070..2e0350a 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -30,7 +30,6 @@
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/pmu.h>
#include <asm/pgtable.h>
@@ -350,9 +349,6 @@ static void __init realview_pb1176_init(void)
amba_device_register(d, &iomem_resource);
}
-#ifdef CONFIG_LEDS
- leds_event = realview_leds_event;
-#endif
realview_reset = realview_pb1176_reset;
}
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index b2985fc..9dd929a 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -30,7 +30,6 @@
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/pmu.h>
#include <asm/pgtable.h>
@@ -352,9 +351,6 @@ static void __init realview_pb11mp_init(void)
amba_device_register(d, &iomem_resource);
}
-#ifdef CONFIG_LEDS
- leds_event = realview_leds_event;
-#endif
realview_reset = realview_pb11mp_reset;
}
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index fb68665..d1bcd5f 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -29,7 +29,6 @@
#include <linux/io.h>
#include <asm/irq.h>
-#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/pmu.h>
#include <asm/pgtable.h>
@@ -302,9 +301,6 @@ static void __init realview_pba8_init(void)
amba_device_register(d, &iomem_resource);
}
-#ifdef CONFIG_LEDS
- leds_event = realview_leds_event;
-#endif
realview_reset = realview_pba8_reset;
}
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 92ace2c..797a509 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -28,7 +28,6 @@
#include <linux/io.h>
#include <asm/irq.h>
-#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/pmu.h>
#include <asm/smp_twd.h>
@@ -385,9 +384,6 @@ static void __init realview_pbx_init(void)
amba_device_register(d, &iomem_resource);
}
-#ifdef CONFIG_LEDS
- leds_event = realview_leds_event;
-#endif
realview_reset = realview_pbx_reset;
}
diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
index 52353be..c600420 100644
--- a/arch/arm/plat-versatile/Kconfig
+++ b/arch/arm/plat-versatile/Kconfig
@@ -7,8 +7,12 @@ config PLAT_VERSATILE_FPGA_IRQ
bool
config PLAT_VERSATILE_LEDS
- def_bool y if LEDS_CLASS
+ def_bool y
depends on ARCH_REALVIEW || ARCH_VERSATILE
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
config PLAT_VERSATILE_SCHED_CLOCK
def_bool y if !ARCH_INTEGRATOR_AP
diff --git a/arch/arm/plat-versatile/leds.c b/arch/arm/plat-versatile/leds.c
index 3169fa5..a617a8f 100644
--- a/arch/arm/plat-versatile/leds.c
+++ b/arch/arm/plat-versatile/leds.c
@@ -37,10 +37,10 @@ static const struct {
} versatile_leds[] = {
{ "versatile:0", "heartbeat", },
{ "versatile:1", "mmc0", },
- { "versatile:2", },
- { "versatile:3", },
- { "versatile:4", },
- { "versatile:5", },
+ { "versatile:2", "cpu" },
+ { "versatile:3", "cpu" },
+ { "versatile:4", "cpu" },
+ { "versatile:5", "cpu" },
{ "versatile:6", },
{ "versatile:7", },
};
@@ -85,6 +85,11 @@ static int __init versatile_leds_init(void)
led->cdev.brightness_set = versatile_led_set;
led->cdev.brightness_get = versatile_led_get;
led->cdev.default_trigger = versatile_leds[i].trigger;
+ /* Some trigger data for CPU LEDs */
+ if (i >= 2 && i <= 5) {
+ /* This is the CPU number actually */
+ led->cdev.trigger_data = (void *) i - 2;
+ }
led->mask = BIT(i);
if (led_classdev_register(NULL, &led->cdev) < 0) {
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 03/17] mach-realview: retire custom LED code
2011-07-06 12:34 ` [PATCH 03/17] mach-realview: retire custom LED code Bryan Wu
@ 2011-07-10 9:27 ` Russell King - ARM Linux
2011-07-11 14:13 ` Bryan Wu
0 siblings, 1 reply; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-10 9:27 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 06, 2011 at 08:34:33PM +0800, Bryan Wu wrote:
> diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
> index 52353be..c600420 100644
> --- a/arch/arm/plat-versatile/Kconfig
> +++ b/arch/arm/plat-versatile/Kconfig
> @@ -7,8 +7,12 @@ config PLAT_VERSATILE_FPGA_IRQ
> bool
>
> config PLAT_VERSATILE_LEDS
> - def_bool y if LEDS_CLASS
> + def_bool y
> depends on ARCH_REALVIEW || ARCH_VERSATILE
> + select NEW_LEDS
> + select LEDS_CLASS
> + select LEDS_TRIGGERS
> + select LEDS_TRIGGER_CPU
Can you explain the choice to force LED support to be enabled with no
choice for these?
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 03/17] mach-realview: retire custom LED code
2011-07-10 9:27 ` Russell King - ARM Linux
@ 2011-07-11 14:13 ` Bryan Wu
0 siblings, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-11 14:13 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 10, 2011 at 5:27 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Jul 06, 2011 at 08:34:33PM +0800, Bryan Wu wrote:
>> diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
>> index 52353be..c600420 100644
>> --- a/arch/arm/plat-versatile/Kconfig
>> +++ b/arch/arm/plat-versatile/Kconfig
>> @@ -7,8 +7,12 @@ config PLAT_VERSATILE_FPGA_IRQ
>> ? ? ? bool
>>
>> ?config PLAT_VERSATILE_LEDS
>> - ? ? def_bool y if LEDS_CLASS
>> + ? ? def_bool y
>> ? ? ? depends on ARCH_REALVIEW || ARCH_VERSATILE
>> + ? ? select NEW_LEDS
>> + ? ? select LEDS_CLASS
>> + ? ? select LEDS_TRIGGERS
>> + ? ? select LEDS_TRIGGER_CPU
>
> Can you explain the choice to force LED support to be enabled with no
> choice for these?
>
I force to select this to default build-in LEDS stuff and don't wanna
to modify the defconfig to build-in LEDS stuff as default.
Now, I agree we can let users to select them when they wanna to enable
LED via menuconfig.
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 04/17] mach-versatile: retire custom LED code
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (2 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 03/17] mach-realview: retire custom LED code Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-10 9:28 ` Russell King - ARM Linux
2011-07-06 12:34 ` [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it Bryan Wu
` (13 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Linus Walleij <linus.walleij@linaro.org>
The CPU activity LED is now handled by the trigger in the leds
subsystem, retire this old CONFIG_LEDS-based code.
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Pawel Moll <pawel.moll@arm.com>
---
arch/arm/mach-versatile/core.c | 42 ----------------------------------------
1 files changed, 0 insertions(+), 42 deletions(-)
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 0c99cf0..b9ff8ff 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -36,7 +36,6 @@
#include <asm/system.h>
#include <asm/irq.h>
-#include <asm/leds.h>
#include <asm/hardware/arm_timer.h>
#include <asm/hardware/icst.h>
#include <asm/hardware/vic.h>
@@ -646,43 +645,6 @@ static struct amba_device *amba_devs[] __initdata = {
&kmi1_device,
};
-#ifdef CONFIG_LEDS
-#define VA_LEDS_BASE (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_LED_OFFSET)
-
-static void versatile_leds_event(led_event_t ledevt)
-{
- unsigned long flags;
- u32 val;
-
- local_irq_save(flags);
- val = readl(VA_LEDS_BASE);
-
- switch (ledevt) {
- case led_idle_start:
- val = val & ~VERSATILE_SYS_LED0;
- break;
-
- case led_idle_end:
- val = val | VERSATILE_SYS_LED0;
- break;
-
- case led_timer:
- val = val ^ VERSATILE_SYS_LED1;
- break;
-
- case led_halted:
- val = 0;
- break;
-
- default:
- break;
- }
-
- writel(val, VA_LEDS_BASE);
- local_irq_restore(flags);
-}
-#endif /* CONFIG_LEDS */
-
/* Early initializations */
void __init versatile_init_early(void)
{
@@ -707,10 +669,6 @@ void __init versatile_init(void)
struct amba_device *d = amba_devs[i];
amba_device_register(d, &iomem_resource);
}
-
-#ifdef CONFIG_LEDS
- leds_event = versatile_leds_event;
-#endif
}
/*
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 04/17] mach-versatile: retire custom LED code
2011-07-06 12:34 ` [PATCH 04/17] mach-versatile: " Bryan Wu
@ 2011-07-10 9:28 ` Russell King - ARM Linux
2011-07-11 14:02 ` Bryan Wu
0 siblings, 1 reply; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-10 9:28 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 06, 2011 at 08:34:34PM +0800, Bryan Wu wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
>
> The CPU activity LED is now handled by the trigger in the leds
> subsystem, retire this old CONFIG_LEDS-based code.
Shouldn't this be part of the previous patch? The previous patch changes
both Realview and Versatile by touching plat-versatile.
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 04/17] mach-versatile: retire custom LED code
2011-07-10 9:28 ` Russell King - ARM Linux
@ 2011-07-11 14:02 ` Bryan Wu
2011-07-12 11:12 ` Linus Walleij
0 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-11 14:02 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 10, 2011 at 5:28 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Jul 06, 2011 at 08:34:34PM +0800, Bryan Wu wrote:
>> From: Linus Walleij <linus.walleij@linaro.org>
>>
>> The CPU activity LED is now handled by the trigger in the leds
>> subsystem, retire this old CONFIG_LEDS-based code.
>
> Shouldn't this be part of the previous patch? ?The previous patch changes
> both Realview and Versatile by touching plat-versatile.
>
I will fold them together, if Linus has no problem about it.
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 04/17] mach-versatile: retire custom LED code
2011-07-11 14:02 ` Bryan Wu
@ 2011-07-12 11:12 ` Linus Walleij
0 siblings, 0 replies; 66+ messages in thread
From: Linus Walleij @ 2011-07-12 11:12 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 11, 2011 at 4:02 PM, Bryan Wu <bryan.wu@canonical.com> wrote:
> On Sun, Jul 10, 2011 at 5:28 PM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
>>
>> Shouldn't this be part of the previous patch? ?The previous patch changes
>> both Realview and Versatile by touching plat-versatile.
>>
>
> I will fold them together, if Linus has no problem about it.
I have no problems with anything, and I'm not one bit picky about
SoB:s and Author: tags, I'm more concerned about the LED code
getting cleaned up. Just do whatever it takes to make good patches
out of this!
Thanks,
Linus Walleij
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (3 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 04/17] mach-versatile: " Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-08 20:23 ` Andrew Victor
2011-07-06 12:34 ` [PATCH 06/17] mach-shark: retire custom LED code Bryan Wu
` (12 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/mach-ks8695/Makefile | 3 -
arch/arm/mach-ks8695/devices.c | 21 ------
arch/arm/mach-ks8695/include/mach/devices.h | 5 --
arch/arm/mach-ks8695/leds.c | 93 ---------------------------
4 files changed, 0 insertions(+), 122 deletions(-)
delete mode 100644 arch/arm/mach-ks8695/leds.c
diff --git a/arch/arm/mach-ks8695/Makefile b/arch/arm/mach-ks8695/Makefile
index 7e3e816..39c7d3c 100644
--- a/arch/arm/mach-ks8695/Makefile
+++ b/arch/arm/mach-ks8695/Makefile
@@ -11,9 +11,6 @@ obj- :=
# PCI support is optional
obj-$(CONFIG_PCI) += pci.o
-# LEDs
-obj-$(CONFIG_LEDS) += leds.o
-
# Board-specific support
obj-$(CONFIG_MACH_KS8695) += board-micrel.o
obj-$(CONFIG_MACH_DSM320) += board-dsm320.o
diff --git a/arch/arm/mach-ks8695/devices.c b/arch/arm/mach-ks8695/devices.c
index b89fb6d..5ebf45d 100644
--- a/arch/arm/mach-ks8695/devices.c
+++ b/arch/arm/mach-ks8695/devices.c
@@ -181,27 +181,6 @@ static void __init ks8695_add_device_watchdog(void)
}
-/* --------------------------------------------------------------------
- * LEDs
- * -------------------------------------------------------------------- */
-
-#if defined(CONFIG_LEDS)
-short ks8695_leds_cpu = -1;
-short ks8695_leds_timer = -1;
-
-void __init ks8695_init_leds(u8 cpu_led, u8 timer_led)
-{
- /* Enable GPIO to access the LEDs */
- gpio_direction_output(cpu_led, 1);
- gpio_direction_output(timer_led, 1);
-
- ks8695_leds_cpu = cpu_led;
- ks8695_leds_timer = timer_led;
-}
-#else
-void __init ks8695_init_leds(u8 cpu_led, u8 timer_led) {}
-#endif
-
/* -------------------------------------------------------------------- */
/*
diff --git a/arch/arm/mach-ks8695/include/mach/devices.h b/arch/arm/mach-ks8695/include/mach/devices.h
index 2744fec..6e0c94a 100644
--- a/arch/arm/mach-ks8695/include/mach/devices.h
+++ b/arch/arm/mach-ks8695/include/mach/devices.h
@@ -18,11 +18,6 @@ extern void __init ks8695_add_device_wan(void);
extern void __init ks8695_add_device_lan(void);
extern void __init ks8695_add_device_hpna(void);
- /* LEDs */
-extern short ks8695_leds_cpu;
-extern short ks8695_leds_timer;
-extern void __init ks8695_init_leds(u8 cpu_led, u8 timer_led);
-
/* PCI */
#define KS8695_MODE_PCI 0
#define KS8695_MODE_MINIPCI 1
diff --git a/arch/arm/mach-ks8695/leds.c b/arch/arm/mach-ks8695/leds.c
deleted file mode 100644
index 184ef74..0000000
--- a/arch/arm/mach-ks8695/leds.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * LED driver for KS8695-based boards.
- *
- * Copyright (C) Andrew Victor
- *
- * 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/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-
-#include <asm/leds.h>
-#include <mach/devices.h>
-#include <mach/gpio.h>
-
-
-static inline void ks8695_led_on(unsigned int led)
-{
- gpio_set_value(led, 0);
-}
-
-static inline void ks8695_led_off(unsigned int led)
-{
- gpio_set_value(led, 1);
-}
-
-static inline void ks8695_led_toggle(unsigned int led)
-{
- unsigned long is_off = gpio_get_value(led);
- if (is_off)
- ks8695_led_on(led);
- else
- ks8695_led_off(led);
-}
-
-
-/*
- * Handle LED events.
- */
-static void ks8695_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- local_irq_save(flags);
-
- switch(evt) {
- case led_start: /* System startup */
- ks8695_led_on(ks8695_leds_cpu);
- break;
-
- case led_stop: /* System stop / suspend */
- ks8695_led_off(ks8695_leds_cpu);
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer: /* Every 50 timer ticks */
- ks8695_led_toggle(ks8695_leds_timer);
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start: /* Entering idle state */
- ks8695_led_off(ks8695_leds_cpu);
- break;
-
- case led_idle_end: /* Exit idle state */
- ks8695_led_on(ks8695_leds_cpu);
- break;
-#endif
-
- default:
- break;
- }
-
- local_irq_restore(flags);
-}
-
-
-static int __init leds_init(void)
-{
- if ((ks8695_leds_timer == -1) || (ks8695_leds_cpu == -1))
- return -ENODEV;
-
- leds_event = ks8695_leds_event;
-
- leds_event(led_start);
- return 0;
-}
-
-__initcall(leds_init);
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it
2011-07-06 12:34 ` [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it Bryan Wu
@ 2011-07-08 20:23 ` Andrew Victor
2011-07-11 11:11 ` Sergei Shtylyov
0 siblings, 1 reply; 66+ messages in thread
From: Andrew Victor @ 2011-07-08 20:23 UTC (permalink / raw)
To: linux-arm-kernel
> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
As the original author of this code.
Acked-by: Andrew Victor <linux@maxim.org.za>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it
2011-07-08 20:23 ` Andrew Victor
@ 2011-07-11 11:11 ` Sergei Shtylyov
2011-07-11 13:48 ` Bryan Wu
0 siblings, 1 reply; 66+ messages in thread
From: Sergei Shtylyov @ 2011-07-11 11:11 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 09-07-2011 0:23, Andrew Victor wrote:
>> Signed-off-by: Bryan Wu<bryan.wu@canonical.com>
> As the original author of this code.
> Acked-by: Andrew Victor <linux@maxim.org.za>
If you're the original author, shouldn't there be:
From: Andrew Victor <linux@maxim.org.za>
WBR, Sergei
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it
2011-07-11 11:11 ` Sergei Shtylyov
@ 2011-07-11 13:48 ` Bryan Wu
2011-07-11 14:00 ` Nicolas Pitre
0 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-11 13:48 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 11, 2011 at 7:11 PM, Sergei Shtylyov <sshtylyov@mvista.com> wrote:
> Hello.
>
> On 09-07-2011 0:23, Andrew Victor wrote:
>
>>> Signed-off-by: Bryan Wu<bryan.wu@canonical.com>
>
>> As the original author of this code.
>
>> Acked-by: Andrew Victor <linux@maxim.org.za>
>
> ? If you're the original author, shouldn't there be:
>
> From: Andrew Victor <linux@maxim.org.za>
>
No problem, I will change that.
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it
2011-07-11 13:48 ` Bryan Wu
@ 2011-07-11 14:00 ` Nicolas Pitre
2011-07-11 14:07 ` Bryan Wu
0 siblings, 1 reply; 66+ messages in thread
From: Nicolas Pitre @ 2011-07-11 14:00 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 11 Jul 2011, Bryan Wu wrote:
> On Mon, Jul 11, 2011 at 7:11 PM, Sergei Shtylyov <sshtylyov@mvista.com> wrote:
> > Hello.
> >
> > On 09-07-2011 0:23, Andrew Victor wrote:
> >
> >>> Signed-off-by: Bryan Wu<bryan.wu@canonical.com>
> >
> >> As the original author of this code.
> >
> >> Acked-by: Andrew Victor <linux@maxim.org.za>
> >
> > ? If you're the original author, shouldn't there be:
> >
> > From: Andrew Victor <linux@maxim.org.za>
> >
>
> No problem, I will change that.
Beware. Is Andrew Victor the original author of the code being removed
here and in this case he's indicating his agreement to the removal of
his code, or he is the one actually responsible for the removal? If the
former then it is wrong to put a "From" with his name and the
"Acked-by:" is the right thing to do.
Nicolas
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it
2011-07-11 14:00 ` Nicolas Pitre
@ 2011-07-11 14:07 ` Bryan Wu
2011-07-11 14:30 ` Andrew Victor
0 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-11 14:07 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 11, 2011 at 10:00 PM, Nicolas Pitre
<nicolas.pitre@linaro.org> wrote:
> On Mon, 11 Jul 2011, Bryan Wu wrote:
>
>> On Mon, Jul 11, 2011 at 7:11 PM, Sergei Shtylyov <sshtylyov@mvista.com> wrote:
>> > Hello.
>> >
>> > On 09-07-2011 0:23, Andrew Victor wrote:
>> >
>> >>> Signed-off-by: Bryan Wu<bryan.wu@canonical.com>
>> >
>> >> As the original author of this code.
>> >
>> >> Acked-by: Andrew Victor <linux@maxim.org.za>
>> >
>> > ? If you're the original author, shouldn't there be:
>> >
>> > From: Andrew Victor <linux@maxim.org.za>
>> >
>>
>> No problem, I will change that.
>
> Beware. ?Is Andrew Victor the original author of the code being removed
> here and in this case he's indicating his agreement to the removal of
> his code, or he is the one actually responsible for the removal? ?If the
> former then it is wrong to put a "From" with his name and the
> "Acked-by:" is the right thing to do.
>
Right, I was confused by the email. I prepared the removing patch and
Andrew said "Acked-by".
Andrew, is that what you want?
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it
2011-07-11 14:07 ` Bryan Wu
@ 2011-07-11 14:30 ` Andrew Victor
0 siblings, 0 replies; 66+ messages in thread
From: Andrew Victor @ 2011-07-11 14:30 UTC (permalink / raw)
To: linux-arm-kernel
hi,
>> Beware. ?Is Andrew Victor the original author of the code being removed
>> here and in this case he's indicating his agreement to the removal of
>> his code, or he is the one actually responsible for the removal? ?If the
>> former then it is wrong to put a "From" with his name and the
>> "Acked-by:" is the right thing to do.
>>
>
> Right, I was confused by the email. I prepared the removing patch and
> Andrew said "Acked-by".
> Andrew, is that what you want?
Yes, I'm acknowledging the removal of my code.
So, Acked-by.
Regards,
Andrew
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 06/17] mach-shark: retire custom LED code
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (4 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 05/17] mach-ks8695: remove leds driver, since nobody use it Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-10 9:30 ` Russell King - ARM Linux
2011-07-06 12:34 ` [PATCH 07/17] mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger Bryan Wu
` (11 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/Kconfig | 6 +
arch/arm/mach-shark/Makefile | 4 +-
arch/arm/mach-shark/core.c | 1 -
arch/arm/mach-shark/leds.c | 222 ++++++++++++++++--------------------------
4 files changed, 90 insertions(+), 143 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9adc278..df971c7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -783,6 +783,12 @@ config ARCH_SHARK
select ZONE_DMA
select PCI
select ARCH_USES_GETTIMEOFFSET
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
+ select LEDS_TRIGGER_DEFAULT_ON
help
Support for the StrongARM based Digital DNARD machine, also known
as "Shark" (<http://www.shark-linux.de/shark.html>).
diff --git a/arch/arm/mach-shark/Makefile b/arch/arm/mach-shark/Makefile
index 45be9b0..2965718 100644
--- a/arch/arm/mach-shark/Makefile
+++ b/arch/arm/mach-shark/Makefile
@@ -4,9 +4,7 @@
# 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-n :=
obj- :=
-
-obj-$(CONFIG_LEDS) += leds.o
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index 5cf7f94..f4b6288 100644
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -13,7 +13,6 @@
#include <asm/setup.h>
#include <asm/mach-types.h>
-#include <asm/leds.h>
#include <asm/param.h>
#include <asm/mach/map.h>
diff --git a/arch/arm/mach-shark/leds.c b/arch/arm/mach-shark/leds.c
index c9e32de..77cf16b 100644
--- a/arch/arm/mach-shark/leds.c
+++ b/arch/arm/mach-shark/leds.c
@@ -1,166 +1,110 @@
/*
- * 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.
*
- * The leds use is as follows:
- * - Green front - toggles state every 50 timer interrupts
- * - Amber front - Unused, this is a dual color led (Amber/Green)
- * - Amber back - On if system is not idle
+ * Driver for the 3 user LEDs found on the Shark
+ * Based on Versatile and RealView machine LED code
*
- * Changelog:
+ * License terms: GNU General Public License (GPL) version 2
+ * Author: Bryan Wu <bryan.wu@canonical.com>
*/
#include <linux/kernel.h>
-#include <linux/module.h>
#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/ioport.h>
#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
-#include <asm/leds.h>
-#include <asm/system.h>
+struct shark_led {
+ struct led_classdev cdev;
+ u8 mask;
+};
-#define LED_STATE_ENABLED 1
-#define LED_STATE_CLAIMED 2
+/*
+ * 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;
+} shark_leds[] = {
+ { "shark:amber0", "default-on", }, /* Bit 5 */
+ { "shark:green", "heartbeat", }, /* Bit 6 */
+ { "shark:amber1", "cpu" }, /* Bit 7 */
+};
+
+static u16 led_reg_read(void)
+{
+ outw(0x09, 0x24);
+ return inw(0x26);
+}
-#define SEQUOIA_LED_GREEN (1<<6)
-#define SEQUOIA_LED_AMBER (1<<5)
-#define SEQUOIA_LED_BACK (1<<7)
+static void led_reg_write(u16 value)
+{
+ outw(0x09, 0x24);
+ outw(value, 0x26);
+}
-static char led_state;
-static short hw_led_state;
-static short saved_state;
+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();
-static DEFINE_SPINLOCK(leds_lock);
+ if (b != LED_OFF)
+ reg |= led->mask;
+ else
+ reg &= ~led->mask;
-short sequoia_read(int addr) {
- outw(addr,0x24);
- return inw(0x26);
+ led_reg_write(reg);
}
-void sequoia_write(short value,short addr) {
- outw(addr,0x24);
- outw(value,0x26);
+static enum led_brightness shark_led_get(struct led_classdev *cdev)
+{
+ struct shark_led *led = container_of(cdev,
+ struct shark_led, cdev);
+ u16 reg = led_reg_read();
+
+ return (reg & led->mask) ? LED_FULL : LED_OFF;
}
-static void sequoia_leds_event(led_event_t evt)
+static int __init shark_leds_init(void)
{
- unsigned long flags;
-
- spin_lock_irqsave(&leds_lock, flags);
-
- hw_led_state = sequoia_read(0x09);
-
- switch (evt) {
- case led_start:
- hw_led_state |= SEQUOIA_LED_GREEN;
- hw_led_state |= SEQUOIA_LED_AMBER;
-#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:
- 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:
- led_state |= LED_STATE_CLAIMED;
- saved_state = hw_led_state;
- hw_led_state &= ~SEQUOIA_LED_BACK;
- hw_led_state |= SEQUOIA_LED_GREEN;
- hw_led_state |= SEQUOIA_LED_AMBER;
- break;
-
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- hw_led_state = saved_state;
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state ^= SEQUOIA_LED_GREEN;
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~SEQUOIA_LED_BACK;
- break;
-
- case led_idle_end:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= SEQUOIA_LED_BACK;
- break;
-#endif
-
- case led_green_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~SEQUOIA_LED_GREEN;
- break;
-
- case led_green_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= SEQUOIA_LED_GREEN;
- break;
-
- case led_amber_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~SEQUOIA_LED_AMBER;
- break;
-
- case led_amber_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= SEQUOIA_LED_AMBER;
- 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;
- }
+ int i;
+ u16 reg;
- if (led_state & LED_STATE_ENABLED)
- sequoia_write(hw_led_state,0x09);
+ for (i = 0; i < ARRAY_SIZE(shark_leds); i++) {
+ struct shark_led *led;
- spin_unlock_irqrestore(&leds_lock, flags);
-}
+ led = kzalloc(sizeof(*led), GFP_KERNEL);
+ if (!led)
+ break;
-static int __init leds_init(void)
-{
- extern void (*leds_event)(led_event_t);
- short temp;
-
- leds_event = sequoia_leds_event;
+ led->cdev.name = shark_leds[i].name;
+ led->cdev.brightness_set = shark_led_set;
+ led->cdev.brightness_get = shark_led_get;
+ led->cdev.default_trigger = shark_leds[i].trigger;
+
+ /* Count in 5 bits offset */
+ led->mask = BIT(i + 5);
+
+ if (led_classdev_register(NULL, &led->cdev) < 0) {
+ kfree(led);
+ break;
+ }
+ }
/* Make LEDs independent of power-state */
- request_region(0x24,4,"sequoia");
- temp = sequoia_read(0x09);
- temp |= 1<<10;
- sequoia_write(temp,0x09);
- leds_event(led_start);
+ request_region(0x24, 4, "led_reg");
+ reg = led_reg_read();
+ reg |= 1 << 10;
+ led_reg_write(reg);
+
return 0;
}
-__initcall(leds_init);
+/*
+ * Since we may have triggers on any subsystem, defer registration
+ * until after subsystem_init.
+ */
+fs_initcall(shark_leds_init);
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 06/17] mach-shark: retire custom LED code
2011-07-06 12:34 ` [PATCH 06/17] mach-shark: retire custom LED code Bryan Wu
@ 2011-07-10 9:30 ` Russell King - ARM Linux
2011-07-11 14:19 ` Bryan Wu
0 siblings, 1 reply; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-10 9:30 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 06, 2011 at 08:34:36PM +0800, Bryan Wu wrote:
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 9adc278..df971c7 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -783,6 +783,12 @@ config ARCH_SHARK
> select ZONE_DMA
> select PCI
> select ARCH_USES_GETTIMEOFFSET
> + select NEW_LEDS
> + select LEDS_CLASS
> + select LEDS_TRIGGERS
> + select LEDS_TRIGGER_CPU
> + select LEDS_TRIGGER_HEARTBEAT
> + select LEDS_TRIGGER_DEFAULT_ON
So Shark too gets forced to have LED support no matter what. Can we
please stop this madness.
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 06/17] mach-shark: retire custom LED code
2011-07-10 9:30 ` Russell King - ARM Linux
@ 2011-07-11 14:19 ` Bryan Wu
0 siblings, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-11 14:19 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 10, 2011 at 5:30 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Jul 06, 2011 at 08:34:36PM +0800, Bryan Wu wrote:
>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>> index 9adc278..df971c7 100644
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@ -783,6 +783,12 @@ config ARCH_SHARK
>> ? ? ? select ZONE_DMA
>> ? ? ? select PCI
>> ? ? ? select ARCH_USES_GETTIMEOFFSET
>> + ? ? select NEW_LEDS
>> + ? ? select LEDS_CLASS
>> + ? ? select LEDS_TRIGGERS
>> + ? ? select LEDS_TRIGGER_CPU
>> + ? ? select LEDS_TRIGGER_HEARTBEAT
>> + ? ? select LEDS_TRIGGER_DEFAULT_ON
>
> So Shark too gets forced to have LED support no matter what. ?Can we
> please stop this madness.
>
I will remove them
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 07/17] mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (5 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 06/17] mach-shark: retire custom LED code Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-06 14:05 ` Nicolas Pitre
2011-07-06 12:34 ` [PATCH 08/17] mach-integrator: retire custom LED code Bryan Wu
` (10 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/configs/orion5x_defconfig | 1 +
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 -
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 -
arch/arm/mach-orion5x/rd88f5182-setup.c | 74 ++++++++------------------
arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 -
5 files changed, 24 insertions(+), 54 deletions(-)
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
index a288d70..6579baf 100644
--- a/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@ -126,6 +126,7 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_CPU=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 9eec7c2..ddb6be1 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -19,7 +19,6 @@
#include <net/dsa.h>
#include <asm/mach-types.h>
#include <asm/gpio.h>
-#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index 0cc90bb..454f666 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -20,7 +20,6 @@
#include <net/dsa.h>
#include <asm/mach-types.h>
#include <asm/gpio.h>
-#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 48da39b..200e02c 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -19,9 +19,9 @@
#include <linux/mv643xx_eth.h>
#include <linux/ata_platform.h>
#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
#include <asm/mach-types.h>
-#include <asm/gpio.h>
-#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
@@ -54,12 +54,6 @@
#define RD88F5182_PCI_SLOT0_IRQ_A_PIN 7
#define RD88F5182_PCI_SLOT0_IRQ_B_PIN 6
-/*
- * GPIO Debug LED
- */
-
-#define RD88F5182_GPIO_DBG_LED 0
-
/*****************************************************************************
* 16M NOR Flash on Device bus CS1
****************************************************************************/
@@ -84,55 +78,32 @@ static struct platform_device rd88f5182_nor_flash = {
.resource = &rd88f5182_nor_flash_resource,
};
-#ifdef CONFIG_LEDS
-
/*****************************************************************************
- * Use GPIO debug led as CPU active indication
+ * Use GPIO LED as CPU active indication
****************************************************************************/
-static void rd88f5182_dbgled_event(led_event_t evt)
-{
- int val;
-
- if (evt == led_idle_end)
- val = 1;
- else if (evt == led_idle_start)
- val = 0;
- else
- return;
-
- gpio_set_value(RD88F5182_GPIO_DBG_LED, val);
-}
-
-static int __init rd88f5182_dbgled_init(void)
-{
- int pin;
-
- if (machine_is_rd88f5182()) {
- pin = RD88F5182_GPIO_DBG_LED;
+#define RD88F5182_GPIO_LED 0
- if (gpio_request(pin, "DBGLED") == 0) {
- if (gpio_direction_output(pin, 0) != 0) {
- printk(KERN_ERR "rd88f5182_dbgled_init failed "
- "to set output pin %d\n", pin);
- gpio_free(pin);
- return 0;
- }
- } else {
- printk(KERN_ERR "rd88f5182_dbgled_init failed "
- "to request gpio %d\n", pin);
- return 0;
- }
-
- leds_event = rd88f5182_dbgled_event;
- }
-
- return 0;
-}
+static struct gpio_led rd88f5182_gpio_led_pins[] = {
+ {
+ .name = "rd88f5182:cpu",
+ .default_trigger = "cpu",
+ .gpio = RD88F5182_GPIO_LED,
+ },
+};
-__initcall(rd88f5182_dbgled_init);
+static struct gpio_led_platform_data rd88f5182_gpio_led_data = {
+ .leds = rd88f5182_gpio_led_pins,
+ .num_leds = ARRAY_SIZE(rd88f5182_gpio_led_pins),
+};
-#endif
+static struct platform_device rd88f5182_gpio_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &rd88f5182_gpio_led_data,
+ },
+};
/*****************************************************************************
* PCI
@@ -299,6 +270,7 @@ static void __init rd88f5182_init(void)
orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE);
platform_device_register(&rd88f5182_nor_flash);
+ platform_device_register(&rd88f5182_gpio_leds);
i2c_register_board_info(0, &rd88f5182_i2c_rtc, 1);
}
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
index ad2eba9..0c5d1d2 100644
--- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
@@ -22,7 +22,6 @@
#include <net/dsa.h>
#include <asm/mach-types.h>
#include <asm/gpio.h>
-#include <asm/leds.h>
#include <asm/mach/arch.h>
#include <asm/mach/pci.h>
#include <mach/orion5x.h>
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 07/17] mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger
2011-07-06 12:34 ` [PATCH 07/17] mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger Bryan Wu
@ 2011-07-06 14:05 ` Nicolas Pitre
0 siblings, 0 replies; 66+ messages in thread
From: Nicolas Pitre @ 2011-07-06 14:05 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 6 Jul 2011, Bryan Wu wrote:
> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
> ---
> arch/arm/configs/orion5x_defconfig | 1 +
> arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 -
> arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 -
> arch/arm/mach-orion5x/rd88f5182-setup.c | 74 ++++++++------------------
> arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 -
> 5 files changed, 24 insertions(+), 54 deletions(-)
>
> diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
> index a288d70..6579baf 100644
> --- a/arch/arm/configs/orion5x_defconfig
> +++ b/arch/arm/configs/orion5x_defconfig
> @@ -126,6 +126,7 @@ CONFIG_LEDS_CLASS=y
> CONFIG_LEDS_GPIO=y
> CONFIG_LEDS_TRIGGERS=y
> CONFIG_LEDS_TRIGGER_TIMER=y
> +CONFIG_LEDS_TRIGGER_CPU=y
> CONFIG_LEDS_TRIGGER_HEARTBEAT=y
> CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
> CONFIG_RTC_CLASS=y
> diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
> index 9eec7c2..ddb6be1 100644
> --- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
> +++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
> @@ -19,7 +19,6 @@
> #include <net/dsa.h>
> #include <asm/mach-types.h>
> #include <asm/gpio.h>
> -#include <asm/leds.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/pci.h>
> #include <mach/orion5x.h>
> diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
> index 0cc90bb..454f666 100644
> --- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
> +++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
> @@ -20,7 +20,6 @@
> #include <net/dsa.h>
> #include <asm/mach-types.h>
> #include <asm/gpio.h>
> -#include <asm/leds.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/pci.h>
> #include <mach/orion5x.h>
> diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
> index 48da39b..200e02c 100644
> --- a/arch/arm/mach-orion5x/rd88f5182-setup.c
> +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
> @@ -19,9 +19,9 @@
> #include <linux/mv643xx_eth.h>
> #include <linux/ata_platform.h>
> #include <linux/i2c.h>
> +#include <linux/gpio.h>
> +#include <linux/leds.h>
> #include <asm/mach-types.h>
> -#include <asm/gpio.h>
> -#include <asm/leds.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/pci.h>
> #include <mach/orion5x.h>
> @@ -54,12 +54,6 @@
> #define RD88F5182_PCI_SLOT0_IRQ_A_PIN 7
> #define RD88F5182_PCI_SLOT0_IRQ_B_PIN 6
>
> -/*
> - * GPIO Debug LED
> - */
> -
> -#define RD88F5182_GPIO_DBG_LED 0
> -
> /*****************************************************************************
> * 16M NOR Flash on Device bus CS1
> ****************************************************************************/
> @@ -84,55 +78,32 @@ static struct platform_device rd88f5182_nor_flash = {
> .resource = &rd88f5182_nor_flash_resource,
> };
>
> -#ifdef CONFIG_LEDS
> -
> /*****************************************************************************
> - * Use GPIO debug led as CPU active indication
> + * Use GPIO LED as CPU active indication
> ****************************************************************************/
>
> -static void rd88f5182_dbgled_event(led_event_t evt)
> -{
> - int val;
> -
> - if (evt == led_idle_end)
> - val = 1;
> - else if (evt == led_idle_start)
> - val = 0;
> - else
> - return;
> -
> - gpio_set_value(RD88F5182_GPIO_DBG_LED, val);
> -}
> -
> -static int __init rd88f5182_dbgled_init(void)
> -{
> - int pin;
> -
> - if (machine_is_rd88f5182()) {
> - pin = RD88F5182_GPIO_DBG_LED;
> +#define RD88F5182_GPIO_LED 0
>
> - if (gpio_request(pin, "DBGLED") == 0) {
> - if (gpio_direction_output(pin, 0) != 0) {
> - printk(KERN_ERR "rd88f5182_dbgled_init failed "
> - "to set output pin %d\n", pin);
> - gpio_free(pin);
> - return 0;
> - }
> - } else {
> - printk(KERN_ERR "rd88f5182_dbgled_init failed "
> - "to request gpio %d\n", pin);
> - return 0;
> - }
> -
> - leds_event = rd88f5182_dbgled_event;
> - }
> -
> - return 0;
> -}
> +static struct gpio_led rd88f5182_gpio_led_pins[] = {
> + {
> + .name = "rd88f5182:cpu",
> + .default_trigger = "cpu",
> + .gpio = RD88F5182_GPIO_LED,
> + },
> +};
>
> -__initcall(rd88f5182_dbgled_init);
> +static struct gpio_led_platform_data rd88f5182_gpio_led_data = {
> + .leds = rd88f5182_gpio_led_pins,
> + .num_leds = ARRAY_SIZE(rd88f5182_gpio_led_pins),
> +};
>
> -#endif
> +static struct platform_device rd88f5182_gpio_leds = {
> + .name = "leds-gpio",
> + .id = -1,
> + .dev = {
> + .platform_data = &rd88f5182_gpio_led_data,
> + },
> +};
>
> /*****************************************************************************
> * PCI
> @@ -299,6 +270,7 @@ static void __init rd88f5182_init(void)
>
> orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE);
> platform_device_register(&rd88f5182_nor_flash);
> + platform_device_register(&rd88f5182_gpio_leds);
>
> i2c_register_board_info(0, &rd88f5182_i2c_rtc, 1);
> }
> diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
> index ad2eba9..0c5d1d2 100644
> --- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
> +++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
> @@ -22,7 +22,6 @@
> #include <net/dsa.h>
> #include <asm/mach-types.h>
> #include <asm/gpio.h>
> -#include <asm/leds.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/pci.h>
> #include <mach/orion5x.h>
> --
> 1.7.5
>
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 08/17] mach-integrator: retire custom LED code
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (6 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 07/17] mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-10 9:33 ` Russell King - ARM Linux
2011-07-06 12:34 ` [PATCH 09/17] mach-clps711x: retire custom LED code of P720T machine Bryan Wu
` (9 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Use 4 LEDs in baseboard instead of the LED in core module.
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>
---
arch/arm/Kconfig | 7 ++
arch/arm/mach-integrator/Makefile | 3 +-
arch/arm/mach-integrator/core.c | 1 -
arch/arm/mach-integrator/leds.c | 147 +++++++++++++++++++------------------
4 files changed, 84 insertions(+), 74 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index df971c7..066009a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -243,6 +243,13 @@ config ARCH_INTEGRATOR
select GENERIC_CLOCKEVENTS
select PLAT_VERSATILE
select PLAT_VERSATILE_FPGA_IRQ
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
+ select LEDS_TRIGGER_DEFAULT_ON
+
help
Support for ARM's Integrator platform.
diff --git a/arch/arm/mach-integrator/Makefile b/arch/arm/mach-integrator/Makefile
index ebeef96..5521d18 100644
--- a/arch/arm/mach-integrator/Makefile
+++ b/arch/arm/mach-integrator/Makefile
@@ -4,11 +4,10 @@
# Object file lists.
-obj-y := core.o lm.o
+obj-y := core.o lm.o leds.o
obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o
obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o
-obj-$(CONFIG_LEDS) += leds.o
obj-$(CONFIG_PCI) += pci_v3.o pci.o
obj-$(CONFIG_CPU_FREQ_INTEGRATOR) += cpu.o
obj-$(CONFIG_INTEGRATOR_IMPD1) += impd1.o
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 77315b9..c4753d8 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -28,7 +28,6 @@
#include <asm/irq.h>
#include <mach/cm.h>
#include <asm/system.h>
-#include <asm/leds.h>
#include <asm/mach/time.h>
#include <asm/pgtable.h>
diff --git a/arch/arm/mach-integrator/leds.c b/arch/arm/mach-integrator/leds.c
index 28be186..21a5d97 100644
--- a/arch/arm/mach-integrator/leds.c
+++ b/arch/arm/mach-integrator/leds.c
@@ -1,91 +1,96 @@
/*
- * linux/arch/arm/mach-integrator/leds.c
+ * Driver for the 4 user LEDs found on the Integrator AP/CP baseboard
+ * Based on Versatile and RealView machine LED code
*
- * Integrator/AP and Integrator/CP LED control routines
- *
- * Copyright (C) 1999 ARM Limited
- * Copyright (C) 2000 Deep Blue Solutions Ltd
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License terms: GNU General Public License (GPL) version 2
+ * Author: Bryan Wu <bryan.wu@canonical.com>
*/
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/spinlock.h>
#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
#include <mach/hardware.h>
#include <mach/platform.h>
-#include <asm/leds.h>
-#include <asm/system.h>
-#include <asm/mach-types.h>
-#include <mach/cm.h>
-static int saved_leds;
+#define ALPHA_REG __io_address(INTEGRATOR_DBG_BASE)
+#define LEDREG (__io_address(INTEGRATOR_DBG_BASE) + INTEGRATOR_DBG_LEDS_OFFSET)
+
+struct integrator_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;
+} integrator_leds[] = {
+ { "integrator:green0", "heartbeat", },
+ { "integrator:yellow", "cpu", },
+ { "integrator:red", "default-on" },
+ { "integrator:green1", },
+};
-static void integrator_leds_event(led_event_t ledevt)
+static void integrator_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
{
- unsigned long flags;
- const unsigned int dbg_base = IO_ADDRESS(INTEGRATOR_DBG_BASE);
- unsigned int update_alpha_leds;
-
- // yup, change the LEDs
- local_irq_save(flags);
- update_alpha_leds = 0;
-
- switch(ledevt) {
- case led_idle_start:
- cm_control(CM_CTRL_LED, 0);
- break;
-
- case led_idle_end:
- cm_control(CM_CTRL_LED, CM_CTRL_LED);
- break;
-
- case led_timer:
- saved_leds ^= GREEN_LED;
- update_alpha_leds = 1;
- break;
-
- case led_red_on:
- saved_leds |= RED_LED;
- update_alpha_leds = 1;
- break;
-
- case led_red_off:
- saved_leds &= ~RED_LED;
- update_alpha_leds = 1;
- break;
-
- default:
- break;
- }
+ struct integrator_led *led = container_of(cdev,
+ struct integrator_led, cdev);
+ u32 reg = __raw_readl(LEDREG);
- if (update_alpha_leds) {
- while (__raw_readl(dbg_base + INTEGRATOR_DBG_ALPHA_OFFSET) & 1);
- __raw_writel(saved_leds, dbg_base + INTEGRATOR_DBG_LEDS_OFFSET);
- }
- local_irq_restore(flags);
+ if (b != LED_OFF)
+ reg |= led->mask;
+ else
+ reg &= ~led->mask;
+
+ while (__raw_readl(ALPHA_REG) & 1)
+ cpu_relax();
+
+ __raw_writel(reg, LEDREG);
}
-static int __init leds_init(void)
+static enum led_brightness integrator_led_get(struct led_classdev *cdev)
{
- if (machine_is_integrator() || machine_is_cintegrator())
- leds_event = integrator_leds_event;
+ struct integrator_led *led = container_of(cdev,
+ struct integrator_led, cdev);
+ u32 reg = __raw_readl(LEDREG);
+
+ return (reg & led->mask) ? LED_FULL : LED_OFF;
+}
+
+static int __init integrator_leds_init(void)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(integrator_leds); i++) {
+ struct integrator_led *led;
+
+ led = kzalloc(sizeof(*led), GFP_KERNEL);
+ if (!led)
+ break;
+
+ led->cdev.name = integrator_leds[i].name;
+ led->cdev.brightness_set = integrator_led_set;
+ led->cdev.brightness_get = integrator_led_get;
+ led->cdev.default_trigger = integrator_leds[i].trigger;
+ led->mask = BIT(i);
+
+ if (led_classdev_register(NULL, &led->cdev) < 0) {
+ kfree(led);
+ break;
+ }
+ }
return 0;
}
-core_initcall(leds_init);
+/*
+ * Since we may have triggers on any subsystem, defer registration
+ * until after subsystem_init.
+ */
+fs_initcall(integrator_leds_init);
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 08/17] mach-integrator: retire custom LED code
2011-07-06 12:34 ` [PATCH 08/17] mach-integrator: retire custom LED code Bryan Wu
@ 2011-07-10 9:33 ` Russell King - ARM Linux
2011-07-19 16:20 ` Linus Walleij
0 siblings, 1 reply; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-10 9:33 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 06, 2011 at 08:34:38PM +0800, Bryan Wu wrote:
> Use 4 LEDs in baseboard instead of the LED in core module.
>
> The CPU activity LED is now handled by the trigger in the leds
> subsystem, retire this old CONFIG_LEDS-based code.
This is a functional change. Integrator CP has four baseboard LEDs.
I don't remember Integrator AP having those, but it does have the LED
on the core module, which is used for CPU activity on all Integrator
platforms.
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 08/17] mach-integrator: retire custom LED code
2011-07-10 9:33 ` Russell King - ARM Linux
@ 2011-07-19 16:20 ` Linus Walleij
0 siblings, 0 replies; 66+ messages in thread
From: Linus Walleij @ 2011-07-19 16:20 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 10, 2011 at 11:33 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Jul 06, 2011 at 08:34:38PM +0800, Bryan Wu wrote:
>> Use 4 LEDs in baseboard instead of the LED in core module.
>>
>> The CPU activity LED is now handled by the trigger in the leds
>> subsystem, retire this old CONFIG_LEDS-based code.
>
> This is a functional change. ?Integrator CP has four baseboard LEDs.
> I don't remember Integrator AP having those,
I have one here, it has three LEDs: green, yellow, red.
It appears the yellow one wasn't used for anything before.
> but it does have the LED on the core module, which is used for
> CPU activity on all Integrator platforms.
Sounds more intuitive too, if that LED is to be used for anything,
it's for this.
Thanks,
Linus Walleij
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 09/17] mach-clps711x: retire custom LED code of P720T machine
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (7 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 08/17] mach-integrator: retire custom LED code Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-06 12:34 ` [PATCH 10/17] mach-ebsa110: retire custom LED code Bryan Wu
` (8 subsequent siblings)
17 siblings, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Add tigger based LED driver into board file of P720T.
Remove old LED driver file.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/mach-clps711x/Kconfig | 5 ++
arch/arm/mach-clps711x/Makefile | 2 -
arch/arm/mach-clps711x/include/mach/time.h | 2 -
arch/arm/mach-clps711x/p720t-leds.c | 67 ----------------------------
arch/arm/mach-clps711x/p720t.c | 57 +++++++++++++++++++++++
arch/arm/mach-clps711x/time.c | 1 -
6 files changed, 62 insertions(+), 72 deletions(-)
delete mode 100644 arch/arm/mach-clps711x/p720t-leds.c
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index eb34bd1..b2a0ee2 100644
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -38,6 +38,11 @@ config ARCH_EDB7211
config ARCH_P720T
bool "P720T"
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_HEARTBEAT
+
help
Say Y here if you intend to run this kernel on the ARM Prospector
720T.
diff --git a/arch/arm/mach-clps711x/Makefile b/arch/arm/mach-clps711x/Makefile
index 4a19731..af9dcce 100644
--- a/arch/arm/mach-clps711x/Makefile
+++ b/arch/arm/mach-clps711x/Makefile
@@ -16,5 +16,3 @@ obj-$(CONFIG_ARCH_CLEP7312) += clep7312.o
obj-$(CONFIG_ARCH_EDB7211) += edb7211-arch.o edb7211-mm.o
obj-$(CONFIG_ARCH_FORTUNET) += fortunet.o
obj-$(CONFIG_ARCH_P720T) += p720t.o
-leds-$(CONFIG_ARCH_P720T) += p720t-leds.o
-obj-$(CONFIG_LEDS) += $(leds-y)
diff --git a/arch/arm/mach-clps711x/include/mach/time.h b/arch/arm/mach-clps711x/include/mach/time.h
index 61fef91..bafc325 100644
--- a/arch/arm/mach-clps711x/include/mach/time.h
+++ b/arch/arm/mach-clps711x/include/mach/time.h
@@ -17,7 +17,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <asm/leds.h>
#include <asm/hardware/clps7111.h>
extern void clps711x_setup_timer(void);
@@ -29,7 +28,6 @@ static irqreturn_t
p720t_timer_interrupt(int irq, void *dev_id)
{
struct pt_regs *regs = get_irq_regs();
- do_leds();
xtime_update(1);
#ifndef CONFIG_SMP
update_process_times(user_mode(regs));
diff --git a/arch/arm/mach-clps711x/p720t-leds.c b/arch/arm/mach-clps711x/p720t-leds.c
deleted file mode 100644
index 1512144..0000000
--- a/arch/arm/mach-clps711x/p720t-leds.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * linux/arch/arm/mach-clps711x/leds.c
- *
- * Integrator LED control routines
- *
- * Copyright (C) 2000 Deep Blue Solutions Ltd
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.h>
-#include <asm/mach-types.h>
-
-#include <asm/hardware/clps7111.h>
-#include <asm/hardware/ep7212.h>
-
-static void p720t_leds_event(led_event_t ledevt)
-{
- unsigned long flags;
- u32 pddr;
-
- local_irq_save(flags);
- switch(ledevt) {
- case led_idle_start:
- break;
-
- case led_idle_end:
- break;
-
- case led_timer:
- pddr = clps_readb(PDDR);
- clps_writeb(pddr ^ 1, PDDR);
- break;
-
- default:
- break;
- }
-
- local_irq_restore(flags);
-}
-
-static int __init leds_init(void)
-{
- if (machine_is_p720t())
- leds_event = p720t_leds_event;
-
- return 0;
-}
-
-arch_initcall(leds_init);
diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c
index cefbce0..5c3bcbd 100644
--- a/arch/arm/mach-clps711x/p720t.c
+++ b/arch/arm/mach-clps711x/p720t.c
@@ -23,6 +23,8 @@
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
#include <mach/hardware.h>
#include <asm/pgtable.h>
@@ -34,6 +36,8 @@
#include <asm/mach/map.h>
#include <mach/syspld.h>
+#include <asm/hardware/clps7111.h>
+
#include "common.h"
/*
@@ -121,3 +125,56 @@ static int p720t_hw_init(void)
__initcall(p720t_hw_init);
+/*
+ * LED controled by CPLD
+ */
+static void p720t_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
+{
+ u8 reg = clps_readb(PDDR);
+
+ if (b != LED_OFF)
+ reg |= 0x1;
+ else
+ reg &= ~0x1;
+
+ clps_writeb(reg, PDDR);
+}
+
+static enum led_brightness p720t_led_get(struct led_classdev *cdev)
+{
+ u8 reg = clps_readb(PDDR);
+
+ return (reg & 0x1) ? LED_FULL : LED_OFF;
+}
+
+static int __init p720t_leds_init(void)
+{
+
+ struct led_classdev *cdev;
+ int ret;
+
+ cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
+ if (!cdev)
+ return -ENOMEM;
+
+ cdev->name = "p720t:0";
+ cdev->brightness_set = p720t_led_set;
+ cdev->brightness_get = p720t_led_get;
+ cdev->default_trigger = "heartbeat";
+
+ ret = led_classdev_register(NULL, cdev);
+ if (ret < 0) {
+ kfree(cdev);
+ return ret;
+ }
+
+ return 0;
+}
+
+/*
+ * Since we may have triggers on any subsystem, defer registration
+ * until after subsystem_init.
+ */
+fs_initcall(p720t_leds_init);
+
diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c
index d581ef0..d79fe79 100644
--- a/arch/arm/mach-clps711x/time.c
+++ b/arch/arm/mach-clps711x/time.c
@@ -25,7 +25,6 @@
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/leds.h>
#include <asm/hardware/clps7111.h>
#include <asm/mach/time.h>
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 10/17] mach-ebsa110: retire custom LED code
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (8 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 09/17] mach-clps711x: retire custom LED code of P720T machine Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-10 9:36 ` Russell King - ARM Linux
2011-07-06 12:34 ` [PATCH 11/17] mach-footbridge: " Bryan Wu
` (7 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/Kconfig | 4 ++
arch/arm/mach-ebsa110/Makefile | 4 +--
arch/arm/mach-ebsa110/leds.c | 77 +++++++++++++++++++++++----------------
3 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 066009a..2a37079 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -350,6 +350,10 @@ config ARCH_EBSA110
select ISA
select NO_IOPORT
select ARCH_USES_GETTIMEOFFSET
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_HEARTBEAT
help
This is an evaluation board for the StrongARM processor available
from Digital. It has limited hardware on-board, including an
diff --git a/arch/arm/mach-ebsa110/Makefile b/arch/arm/mach-ebsa110/Makefile
index 6520ac8..935e4af 100644
--- a/arch/arm/mach-ebsa110/Makefile
+++ b/arch/arm/mach-ebsa110/Makefile
@@ -4,9 +4,7 @@
# Object file lists.
-obj-y := core.o io.o
+obj-y := core.o io.o leds.o
obj-m :=
obj-n :=
obj- :=
-
-obj-$(CONFIG_LEDS) += leds.o
diff --git a/arch/arm/mach-ebsa110/leds.c b/arch/arm/mach-ebsa110/leds.c
index 6a6ea57..a09f0e3 100644
--- a/arch/arm/mach-ebsa110/leds.c
+++ b/arch/arm/mach-ebsa110/leds.c
@@ -1,51 +1,64 @@
/*
- * linux/arch/arm/mach-ebsa110/leds.c
+ * Driver for the LED found on the EBSA110 machine
+ * Based on Versatile and RealView machine LED code
*
- * Copyright (C) 1998 Russell King
- *
- * 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.
- *
- * EBSA-110 LED control routines. We use the led as follows:
- *
- * - Red - toggles state every 50 timer interrupts
+ * License terms: GNU General Public License (GPL) version 2
+ * Author: Bryan Wu <bryan.wu@canonical.com>
*/
-#include <linux/module.h>
-#include <linux/spinlock.h>
+#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.h>
-#include <asm/mach-types.h>
-
-static spinlock_t leds_lock;
-static void ebsa110_leds_event(led_event_t ledevt)
+static void ebsa110_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
{
- unsigned long flags;
+ u8 reg = __raw_readb(SOFT_BASE);
- spin_lock_irqsave(&leds_lock, flags);
+ if (b != LED_OFF)
+ reg |= 0x80;
+ else
+ reg &= ~0x80;
- switch(ledevt) {
- case led_timer:
- *(volatile unsigned char *)SOFT_BASE ^= 128;
- break;
+ __raw_writeb(reg, SOFT_BASE);
+}
- default:
- break;
- }
+static enum led_brightness ebsa110_led_get(struct led_classdev *cdev)
+{
+ u8 reg = __raw_readb(SOFT_BASE);
- spin_unlock_irqrestore(&leds_lock, flags);
+ return (reg & 0x80) ? LED_FULL : LED_OFF;
}
-static int __init leds_init(void)
+static int __init ebsa110_leds_init(void)
{
- if (machine_is_ebsa110())
- leds_event = ebsa110_leds_event;
+
+ struct led_classdev *cdev;
+ int ret;
+
+ cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
+ if (!cdev)
+ return -ENOMEM;
+
+ cdev->name = "ebsa110:0";
+ cdev->brightness_set = ebsa110_led_set;
+ cdev->brightness_get = ebsa110_led_get;
+ cdev->default_trigger = "heartbeat";
+
+ ret = led_classdev_register(NULL, cdev);
+ if (ret < 0) {
+ kfree(cdev);
+ return ret;
+ }
return 0;
}
-__initcall(leds_init);
+/*
+ * Since we may have triggers on any subsystem, defer registration
+ * until after subsystem_init.
+ */
+fs_initcall(ebsa110_leds_init);
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 10/17] mach-ebsa110: retire custom LED code
2011-07-06 12:34 ` [PATCH 10/17] mach-ebsa110: retire custom LED code Bryan Wu
@ 2011-07-10 9:36 ` Russell King - ARM Linux
0 siblings, 0 replies; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-10 9:36 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 06, 2011 at 08:34:40PM +0800, Bryan Wu wrote:
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 066009a..2a37079 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -350,6 +350,10 @@ config ARCH_EBSA110
> select ISA
> select NO_IOPORT
> select ARCH_USES_GETTIMEOFFSET
> + select NEW_LEDS
> + select LEDS_CLASS
> + select LEDS_TRIGGERS
> + select LEDS_TRIGGER_HEARTBEAT
Same comment about forcing.
> -static int __init leds_init(void)
> +static int __init ebsa110_leds_init(void)
> {
> - if (machine_is_ebsa110())
> - leds_event = ebsa110_leds_event;
> +
> + struct led_classdev *cdev;
> + int ret;
Same comment about initialization. This seems to be a common theme.
As a whole, this patch set seems to result in a net step backwards to
the goal of a single kernel image.
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 11/17] mach-footbridge: retire custom LED code
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (9 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 10/17] mach-ebsa110: retire custom LED code Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-10 9:37 ` Russell King - ARM Linux
2011-07-06 12:34 ` [PATCH 12/17] mach-pxa: " Bryan Wu
` (6 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
| 16 +++
| 4 -
| 139 ------------------------
| 76 +++++++++++++
| 1 -
| 102 +++++++++++++++---
| 139 ------------------------
7 files changed, 180 insertions(+), 297 deletions(-)
delete mode 100644 arch/arm/mach-footbridge/ebsa285-leds.c
delete mode 100644 arch/arm/mach-footbridge/netwinder-leds.c
--git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index 46adca0..0a97d5c 100644
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -39,6 +39,12 @@ config ARCH_EBSA285_ADDIN
bool "EBSA285 (addin mode)"
select ARCH_EBSA285
select FOOTBRIDGE_ADDIN
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
+ select LEDS_TRIGGER_DEFAULT_ON
help
Say Y here if you intend to run this kernel on the EBSA285 card
in addin mode.
@@ -52,6 +58,11 @@ config ARCH_EBSA285_HOST
select ISA
select ISA_DMA
select PCI
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
help
Say Y here if you intend to run this kernel on the EBSA285 card
in host ("central function") mode.
@@ -65,6 +76,11 @@ config ARCH_NETWINDER
select ISA
select ISA_DMA
select PCI
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
help
Say Y here if you intend to run this kernel on the Rebel.COM
NetWinder. Information about this machine can be found at:
--git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile
index 3afb1b2..0b64dd4 100644
--- a/arch/arm/mach-footbridge/Makefile
+++ b/arch/arm/mach-footbridge/Makefile
@@ -14,15 +14,11 @@ pci-$(CONFIG_ARCH_EBSA285_HOST) += ebsa285-pci.o
pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o
pci-$(CONFIG_ARCH_PERSONAL_SERVER) += personal-pci.o
-leds-$(CONFIG_ARCH_EBSA285) += ebsa285-leds.o
-leds-$(CONFIG_ARCH_NETWINDER) += netwinder-leds.o
-
obj-$(CONFIG_ARCH_CATS) += cats-hw.o isa-timer.o
obj-$(CONFIG_ARCH_EBSA285) += ebsa285.o dc21285-timer.o
obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o isa-timer.o
obj-$(CONFIG_ARCH_PERSONAL_SERVER) += personal.o dc21285-timer.o
obj-$(CONFIG_PCI) +=$(pci-y)
-obj-$(CONFIG_LEDS) +=$(leds-y)
obj-$(CONFIG_ISA) += isa.o isa-rtc.o
diff --git a/arch/arm/mach-footbridge/ebsa285-leds.c b/arch/arm/mach-footbridge/ebsa285-leds.c
deleted file mode 100644
index 4e10090..0000000
--- a/arch/arm/mach-footbridge/ebsa285-leds.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * linux/arch/arm/mach-footbridge/ebsa285-leds.c
- *
- * Copyright (C) 1998-1999 Russell King
- *
- * 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.
- * EBSA-285 control routines.
- *
- * The EBSA-285 uses the leds as follows:
- * - Green - toggles state every 50 timer interrupts
- * - Amber - On if system is not idle
- * - Red - currently unused
- *
- * Changelog:
- * 02-05-1999 RMK Various cleanups
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/mach-types.h>
-#include <asm/system.h>
-
-#define LED_STATE_ENABLED 1
-#define LED_STATE_CLAIMED 2
-static char led_state;
-static char hw_led_state;
-
-static DEFINE_SPINLOCK(leds_lock);
-
-static void ebsa285_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- spin_lock_irqsave(&leds_lock, flags);
-
- switch (evt) {
- case led_start:
- hw_led_state = XBUS_LED_RED | XBUS_LED_GREEN;
-#ifndef CONFIG_LEDS_CPU
- hw_led_state |= XBUS_LED_AMBER;
-#endif
- 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 = XBUS_LED_RED | XBUS_LED_GREEN | XBUS_LED_AMBER;
- break;
-
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- hw_led_state = XBUS_LED_RED | XBUS_LED_GREEN | XBUS_LED_AMBER;
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state ^= XBUS_LED_GREEN;
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= XBUS_LED_AMBER;
- break;
-
- case led_idle_end:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~XBUS_LED_AMBER;
- break;
-#endif
-
- case led_halted:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~XBUS_LED_RED;
- break;
-
- case led_green_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~XBUS_LED_GREEN;
- break;
-
- case led_green_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= XBUS_LED_GREEN;
- break;
-
- case led_amber_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~XBUS_LED_AMBER;
- break;
-
- case led_amber_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= XBUS_LED_AMBER;
- break;
-
- case led_red_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~XBUS_LED_RED;
- break;
-
- case led_red_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= XBUS_LED_RED;
- break;
-
- default:
- break;
- }
-
- if (led_state & LED_STATE_ENABLED)
- *XBUS_LEDS = hw_led_state;
-
- spin_unlock_irqrestore(&leds_lock, flags);
-}
-
-static int __init leds_init(void)
-{
- if (machine_is_ebsa285())
- leds_event = ebsa285_leds_event;
-
- leds_event(led_start);
-
- return 0;
-}
-
-__initcall(leds_init);
--git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c
index 2ef69ff..ca2c6a0 100644
--- a/arch/arm/mach-footbridge/ebsa285.c
+++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -5,6 +5,8 @@
*/
#include <linux/init.h>
#include <linux/spinlock.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
#include <asm/hardware/dec21285.h>
#include <asm/mach-types.h>
@@ -13,6 +15,80 @@
#include "common.h"
+/* LEDs */
+struct ebsa285_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;
+} ebsa285_leds[] = {
+ { "ebsa285:amber", "heartbeat", },
+ { "ebsa285:green", "cpu", },
+ { "ebsa285:red",},
+};
+
+static void ebsa285_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
+{
+ struct ebsa285_led *led = container_of(cdev,
+ struct ebsa285_led, cdev);
+
+ if (b != LED_OFF)
+ *XBUS_LEDS |= led->mask;
+ else
+ *XBUS_LEDS &= ~led->mask;
+}
+
+static enum led_brightness ebsa285_led_get(struct led_classdev *cdev)
+{
+ struct ebsa285_led *led = container_of(cdev,
+ struct ebsa285_led, cdev);
+
+ return (*XBUS_LEDS & led->mask) ? LED_FULL : LED_OFF;
+}
+
+static int __init ebsa285_leds_init(void)
+{
+ int i;
+
+ /* 3 LEDS All ON */
+ *XBUS_LEDS |= XBUS_LED_AMBER | XBUS_LED_GREEN | XBUS_LED_RED;
+
+ for (i = 0; i < ARRAY_SIZE(ebsa285_leds); i++) {
+ struct ebsa285_led *led;
+
+ led = kzalloc(sizeof(*led), GFP_KERNEL);
+ if (!led)
+ break;
+
+ led->cdev.name = ebsa285_leds[i].name;
+ led->cdev.brightness_set = ebsa285_led_set;
+ led->cdev.brightness_get = ebsa285_led_get;
+ led->cdev.default_trigger = ebsa285_leds[i].trigger;
+ led->mask = BIT(i);
+
+ 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(ebsa285_leds_init);
+
MACHINE_START(EBSA285, "EBSA285")
/* Maintainer: Russell King */
.boot_params = 0x00000100,
--git a/arch/arm/mach-footbridge/include/mach/system.h b/arch/arm/mach-footbridge/include/mach/system.h
index 0b29315..c026efa 100644
--- a/arch/arm/mach-footbridge/include/mach/system.h
+++ b/arch/arm/mach-footbridge/include/mach/system.h
@@ -10,7 +10,6 @@
#include <linux/io.h>
#include <asm/hardware/dec21285.h>
#include <mach/hardware.h>
-#include <asm/leds.h>
#include <asm/mach-types.h>
static inline void arch_idle(void)
--git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c
index 06e514f..83d0be7 100644
--- a/arch/arm/mach-footbridge/netwinder-hw.c
+++ b/arch/arm/mach-footbridge/netwinder-hw.c
@@ -12,9 +12,10 @@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/spinlock.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
#include <asm/hardware/dec21285.h>
-#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/setup.h>
@@ -26,13 +27,6 @@
#define GP1_IO_BASE 0x338
#define GP2_IO_BASE 0x33a
-
-#ifdef CONFIG_LEDS
-#define DEFAULT_LEDS 0
-#else
-#define DEFAULT_LEDS GPIO_GREEN_LED
-#endif
-
/*
* Winbond WB83977F accessibility stuff
*/
@@ -610,15 +604,9 @@ static void __init rwa010_init(void)
static int __init nw_hw_init(void)
{
if (machine_is_netwinder()) {
- unsigned long flags;
-
wb977_init();
cpld_init();
rwa010_init();
-
- spin_lock_irqsave(&nw_gpio_lock, flags);
- nw_gpio_modify_op(GPIO_RED_LED|GPIO_GREEN_LED, DEFAULT_LEDS);
- spin_unlock_irqrestore(&nw_gpio_lock, flags);
}
return 0;
}
@@ -646,6 +634,92 @@ fixup_netwinder(struct machine_desc *desc, struct tag *tags,
#endif
}
+/* LEDs */
+struct netwinder_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;
+} netwinder_leds[] = {
+ { "netwinder:green", "heartbeat", },
+ { "netwinder:red", "cpu", },
+};
+
+static void netwinder_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
+{
+ struct netwinder_led *led = container_of(cdev,
+ struct netwinder_led, cdev);
+ unsigned long flags;
+ u32 reg;
+
+ spin_lock_irqsave(&nw_gpio_lock, flags);
+ reg = nw_gpio_read();
+ if (b != LED_OFF)
+ reg |= led->mask;
+ else
+ reg &= ~led->mask;
+ nw_gpio_modify_op(led->mask, reg);
+ spin_unlock_irqrestore(&nw_gpio_lock, flags);
+}
+
+static enum led_brightness netwinder_led_get(struct led_classdev *cdev)
+{
+ struct netwinder_led *led = container_of(cdev,
+ struct netwinder_led, cdev);
+ unsigned long flags;
+ u32 reg;
+
+ spin_lock_irqsave(&nw_gpio_lock, flags);
+ reg = nw_gpio_read();
+ spin_unlock_irqrestore(&nw_gpio_lock, flags);
+
+ return (reg & led->mask) ? LED_FULL : LED_OFF;
+}
+
+static int __init netwinder_leds_init(void)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(netwinder_leds); i++) {
+ struct netwinder_led *led;
+
+ led = kzalloc(sizeof(*led), GFP_KERNEL);
+ if (!led)
+ break;
+
+ led->cdev.name = netwinder_leds[i].name;
+ led->cdev.brightness_set = netwinder_led_set;
+ led->cdev.brightness_get = netwinder_led_get;
+ led->cdev.default_trigger = netwinder_leds[i].trigger;
+
+ if (i == 0)
+ led->mask = GPIO_GREEN_LED;
+ else
+ led->mask = GPIO_RED_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(netwinder_leds_init);
+
MACHINE_START(NETWINDER, "Rebel-NetWinder")
/* Maintainer: Russell King/Rebel.com */
.boot_params = 0x00000100,
diff --git a/arch/arm/mach-footbridge/netwinder-leds.c b/arch/arm/mach-footbridge/netwinder-leds.c
deleted file mode 100644
index 00269fe..0000000
--- a/arch/arm/mach-footbridge/netwinder-leds.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * linux/arch/arm/mach-footbridge/netwinder-leds.c
- *
- * Copyright (C) 1998-1999 Russell King
- *
- * 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.
- *
- * NetWinder LED control routines.
- *
- * The Netwinder uses the leds as follows:
- * - Green - toggles state every 50 timer interrupts
- * - Red - On if the system is not idle
- *
- * Changelog:
- * 02-05-1999 RMK Various cleanups
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/mach-types.h>
-#include <asm/system.h>
-
-#define LED_STATE_ENABLED 1
-#define LED_STATE_CLAIMED 2
-static char led_state;
-static char hw_led_state;
-
-static DEFINE_SPINLOCK(leds_lock);
-
-static void netwinder_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- spin_lock_irqsave(&leds_lock, flags);
-
- switch (evt) {
- case led_start:
- led_state |= LED_STATE_ENABLED;
- hw_led_state = GPIO_GREEN_LED;
- 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:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state ^= GPIO_GREEN_LED;
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~GPIO_RED_LED;
- break;
-
- case led_idle_end:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= GPIO_RED_LED;
- break;
-#endif
-
- case led_halted:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= GPIO_RED_LED;
- break;
-
- case led_green_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= GPIO_GREEN_LED;
- break;
-
- case led_green_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~GPIO_GREEN_LED;
- break;
-
- case led_amber_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= GPIO_GREEN_LED | GPIO_RED_LED;
- break;
-
- case led_amber_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~(GPIO_GREEN_LED | GPIO_RED_LED);
- break;
-
- case led_red_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= GPIO_RED_LED;
- break;
-
- case led_red_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~GPIO_RED_LED;
- break;
-
- default:
- break;
- }
-
- spin_unlock_irqrestore(&leds_lock, flags);
-
- if (led_state & LED_STATE_ENABLED) {
- spin_lock_irqsave(&nw_gpio_lock, flags);
- nw_gpio_modify_op(GPIO_RED_LED | GPIO_GREEN_LED, hw_led_state);
- spin_unlock_irqrestore(&nw_gpio_lock, flags);
- }
-}
-
-static int __init leds_init(void)
-{
- if (machine_is_netwinder())
- leds_event = netwinder_leds_event;
-
- leds_event(led_start);
-
- return 0;
-}
-
-__initcall(leds_init);
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 11/17] mach-footbridge: retire custom LED code
2011-07-06 12:34 ` [PATCH 11/17] mach-footbridge: " Bryan Wu
@ 2011-07-10 9:37 ` Russell King - ARM Linux
2011-07-11 14:25 ` Bryan Wu
0 siblings, 1 reply; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-10 9:37 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 06, 2011 at 08:34:41PM +0800, Bryan Wu wrote:
> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Same comments again.
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 11/17] mach-footbridge: retire custom LED code
2011-07-10 9:37 ` Russell King - ARM Linux
@ 2011-07-11 14:25 ` Bryan Wu
0 siblings, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-11 14:25 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 10, 2011 at 5:37 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Jul 06, 2011 at 08:34:41PM +0800, Bryan Wu wrote:
>> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
>
> Same comments again.
>
OK, removed.
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 12/17] mach-pxa: retire custom LED code
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (10 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 11/17] mach-footbridge: " Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-10 9:37 ` Russell King - ARM Linux
2011-07-06 12:34 ` [PATCH 13/17] plat-samsung: remove including old leds event API header file Bryan Wu
` (5 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/mach-pxa/Kconfig | 17 +++++
arch/arm/mach-pxa/Makefile | 8 --
arch/arm/mach-pxa/idp.c | 76 ++++++++++++++++++++++
arch/arm/mach-pxa/leds-idp.c | 116 ---------------------------------
arch/arm/mach-pxa/leds-lubbock.c | 125 ------------------------------------
arch/arm/mach-pxa/leds-mainstone.c | 120 ----------------------------------
arch/arm/mach-pxa/leds.c | 32 ---------
arch/arm/mach-pxa/leds.h | 13 ----
arch/arm/mach-pxa/lubbock.c | 90 ++++++++++++++++++++++++++
arch/arm/mach-pxa/mainstone.c | 89 +++++++++++++++++++++++++
10 files changed, 272 insertions(+), 414 deletions(-)
delete mode 100644 arch/arm/mach-pxa/leds-idp.c
delete mode 100644 arch/arm/mach-pxa/leds-lubbock.c
delete mode 100644 arch/arm/mach-pxa/leds-mainstone.c
delete mode 100644 arch/arm/mach-pxa/leds.c
delete mode 100644 arch/arm/mach-pxa/leds.h
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index cd19309..111ade4 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -8,11 +8,23 @@ config ARCH_LUBBOCK
bool "Intel DBPXA250 Development Platform (aka Lubbock)"
select PXA25x
select SA1111
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
+ select LEDS_TRIGGER_DEFAULT_ON
config MACH_MAINSTONE
bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
select PXA27x
select HAVE_PWM
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
+ select LEDS_TRIGGER_DEFAULT_ON
config MACH_ZYLONITE
bool
@@ -59,6 +71,11 @@ comment "Third Party Dev Platforms (sorted by vendor name)"
config ARCH_PXA_IDP
bool "Accelent Xscale IDP"
select PXA25x
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
config ARCH_VIPER
bool "Arcom/Eurotech VIPER SBC"
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index cc39d17..2d42d23 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -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
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index f7fb64f..105f4d2 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -191,6 +191,82 @@ static void __init idp_map_io(void)
iotable_init(idp_io_desc, ARRAY_SIZE(idp_io_desc));
}
+/* LEDs */
+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", "cpu", },
+};
+
+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;
+
+ 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);
MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
/* Maintainer: Vibren Technologies */
diff --git a/arch/arm/mach-pxa/leds-idp.c b/arch/arm/mach-pxa/leds-idp.c
deleted file mode 100644
index 8b9c171..0000000
--- a/arch/arm/mach-pxa/leds-idp.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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 <asm/system.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);
-}
diff --git a/arch/arm/mach-pxa/leds-lubbock.c b/arch/arm/mach-pxa/leds-lubbock.c
deleted file mode 100644
index e26d5ef..0000000
--- a/arch/arm/mach-pxa/leds-lubbock.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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 <asm/system.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);
-}
diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c
deleted file mode 100644
index db4af5e..0000000
--- a/arch/arm/mach-pxa/leds-mainstone.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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 <asm/system.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);
-}
diff --git a/arch/arm/mach-pxa/leds.c b/arch/arm/mach-pxa/leds.c
deleted file mode 100644
index bbe4d5f..0000000
--- a/arch/arm/mach-pxa/leds.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * linux/arch/arm/mach-pxa/leds.c
- *
- * xscale LEDs dispatcher
- *
- * Copyright (C) 2001 Nicolas Pitre
- *
- * Copyright (c) 2001 Jeff Sutherland, Accelent Systems Inc.
- */
-#include <linux/compiler.h>
-#include <linux/init.h>
-
-#include <asm/leds.h>
-#include <asm/mach-types.h>
-
-#include "leds.h"
-
-static int __init
-pxa_leds_init(void)
-{
- if (machine_is_lubbock())
- leds_event = lubbock_leds_event;
- if (machine_is_mainstone())
- leds_event = mainstone_leds_event;
- if (machine_is_pxa_idp())
- leds_event = idp_leds_event;
-
- leds_event(led_start);
- return 0;
-}
-
-core_initcall(pxa_leds_init);
diff --git a/arch/arm/mach-pxa/leds.h b/arch/arm/mach-pxa/leds.h
deleted file mode 100644
index 7f0dfe0..0000000
--- a/arch/arm/mach-pxa/leds.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/mach-pxa/leds.h
- *
- * Copyright (c) 2001 Jeff Sutherland, Accelent Systems Inc.
- *
- * blinky lights for various PXA-based systems:
- *
- */
-
-extern void idp_leds_event(led_event_t evt);
-extern void lubbock_leds_event(led_event_t evt);
-extern void mainstone_leds_event(led_event_t evt);
-extern void trizeps4_leds_event(led_event_t evt);
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index e10ddb8..3795a32 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -14,6 +14,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/syscore_ops.h>
#include <linux/major.h>
@@ -22,6 +23,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/smc91x.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
@@ -548,6 +551,93 @@ static void __init lubbock_map_io(void)
PCFR |= PCFR_OPDE;
}
+/*
+ * Driver for the 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.
+ */
+
+struct lubbock_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;
+} lubbock_leds[] = {
+ { "lubbock:D28", "default-on", },
+ { "lubbock:D27", "cpu", },
+ { "lubbock:D26", "heartbeat" },
+ { "lubbock:D25", },
+ { "lubbock:D24", },
+ { "lubbock:D23", },
+ { "lubbock:D22", },
+ { "lubbock:D21", },
+};
+
+static void lubbock_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
+{
+ struct lubbock_led *led = container_of(cdev,
+ struct lubbock_led, cdev);
+ u32 reg = LUB_DISC_BLNK_LED;
+
+ if (b != LED_OFF)
+ reg |= led->mask;
+ else
+ reg &= ~led->mask;
+
+ LUB_DISC_BLNK_LED = reg;
+}
+
+static enum led_brightness lubbock_led_get(struct led_classdev *cdev)
+{
+ struct lubbock_led *led = container_of(cdev,
+ struct lubbock_led, cdev);
+ u32 reg = LUB_DISC_BLNK_LED;
+
+ return (reg & led->mask) ? LED_FULL : LED_OFF;
+}
+
+static int __init lubbock_leds_init(void)
+{
+ int i;
+
+ /* All ON */
+ LUB_DISC_BLNK_LED |= 0xff;
+ for (i = 0; i < ARRAY_SIZE(lubbock_leds); i++) {
+ struct lubbock_led *led;
+
+ led = kzalloc(sizeof(*led), GFP_KERNEL);
+ if (!led)
+ break;
+
+ led->cdev.name = lubbock_leds[i].name;
+ led->cdev.brightness_set = lubbock_led_set;
+ led->cdev.brightness_get = lubbock_led_get;
+ led->cdev.default_trigger = lubbock_leds[i].trigger;
+ led->mask = BIT(i);
+
+ 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(lubbock_leds_init);
+
MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
/* Maintainer: MontaVista Software Inc. */
.map_io = lubbock_map_io,
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 3479e2b..437fdcf 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -28,6 +28,8 @@
#include <linux/pwm_backlight.h>
#include <linux/smc91x.h>
#include <linux/i2c/pxa-i2c.h>
+#include <linux/slab.h>
+#include <linux/leds.h>
#include <asm/types.h>
#include <asm/setup.h>
@@ -614,6 +616,93 @@ static void __init mainstone_map_io(void)
PCFR = 0x66;
}
+/*
+ * Driver for the 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.
+ */
+
+struct mainstone_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;
+} mainstone_leds[] = {
+ { "mainstone:D28", "default-on", },
+ { "mainstone:D27", "cpu", },
+ { "mainstone:D26", "heartbeat" },
+ { "mainstone:D25", },
+ { "mainstone:D24", },
+ { "mainstone:D23", },
+ { "mainstone:D22", },
+ { "mainstone:D21", },
+};
+
+static void mainstone_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
+{
+ struct mainstone_led *led = container_of(cdev,
+ struct mainstone_led, cdev);
+ u32 reg = MST_LEDCTRL;
+
+ if (b != LED_OFF)
+ reg |= led->mask;
+ else
+ reg &= ~led->mask;
+
+ MST_LEDCTRL = reg;
+}
+
+static enum led_brightness mainstone_led_get(struct led_classdev *cdev)
+{
+ struct mainstone_led *led = container_of(cdev,
+ struct mainstone_led, cdev);
+ u32 reg = MST_LEDCTRL;
+
+ return (reg & led->mask) ? LED_FULL : LED_OFF;
+}
+
+static int __init mainstone_leds_init(void)
+{
+ int i;
+
+ /* All ON */
+ MST_LEDCTRL |= 0xff;
+ for (i = 0; i < ARRAY_SIZE(mainstone_leds); i++) {
+ struct mainstone_led *led;
+
+ led = kzalloc(sizeof(*led), GFP_KERNEL);
+ if (!led)
+ break;
+
+ led->cdev.name = mainstone_leds[i].name;
+ led->cdev.brightness_set = mainstone_led_set;
+ led->cdev.brightness_get = mainstone_led_get;
+ led->cdev.default_trigger = mainstone_leds[i].trigger;
+ led->mask = BIT(i);
+
+ 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(mainstone_leds_init);
+
MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
/* Maintainer: MontaVista Software Inc. */
.boot_params = 0xa0000100, /* BLOB boot parameter setting */
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 13/17] plat-samsung: remove including old leds event API header file
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (11 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 12/17] mach-pxa: " Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-06 12:34 ` [PATCH 14/17] mach-pnx4008: " Bryan Wu
` (4 subsequent siblings)
17 siblings, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/plat-samsung/time.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-samsung/time.c b/arch/arm/plat-samsung/time.c
index 2231d80..bd9d42d 100644
--- a/arch/arm/plat-samsung/time.c
+++ b/arch/arm/plat-samsung/time.c
@@ -29,7 +29,6 @@
#include <linux/platform_device.h>
#include <asm/system.h>
-#include <asm/leds.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 14/17] mach-pnx4008: remove including old leds event API header file
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (12 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 13/17] plat-samsung: remove including old leds event API header file Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-06 12:34 ` [PATCH 15/17] mach-omap1: retire custom LED code Bryan Wu
` (3 subsequent siblings)
17 siblings, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/mach-pnx4008/time.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-pnx4008/time.c b/arch/arm/mach-pnx4008/time.c
index 0c8aad4..4385793 100644
--- a/arch/arm/mach-pnx4008/time.c
+++ b/arch/arm/mach-pnx4008/time.c
@@ -26,7 +26,6 @@
#include <asm/system.h>
#include <mach/hardware.h>
-#include <asm/leds.h>
#include <asm/mach/time.h>
#include <asm/errno.h>
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 15/17] mach-omap1: retire custom LED code
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (13 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 14/17] mach-pnx4008: " Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-07 14:29 ` Tony Lindgren
2011-07-06 12:34 ` [PATCH 16/17] mach-sa1100: " Bryan Wu
` (2 subsequent siblings)
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/mach-omap1/Kconfig | 21 +++
arch/arm/mach-omap1/Makefile | 8 -
arch/arm/mach-omap1/board-h2.c | 34 ++++-
arch/arm/mach-omap1/board-h3.c | 34 ++++-
arch/arm/mach-omap1/board-osk.c | 33 ++++
arch/arm/mach-omap1/leds-h2p2-debug.c | 167 -------------------
arch/arm/mach-omap1/leds-innovator.c | 99 -----------
arch/arm/mach-omap1/leds-osk.c | 115 -------------
arch/arm/mach-omap1/leds.c | 69 --------
arch/arm/mach-omap1/leds.h | 3 -
arch/arm/mach-omap1/time.c | 1 -
arch/arm/mach-omap1/timer32k.c | 1 -
arch/arm/plat-omap/Kconfig | 9 +-
arch/arm/plat-omap/debug-leds.c | 292 ++++++++-------------------------
14 files changed, 193 insertions(+), 693 deletions(-)
delete mode 100644 arch/arm/mach-omap1/leds-h2p2-debug.c
delete mode 100644 arch/arm/mach-omap1/leds-innovator.c
delete mode 100644 arch/arm/mach-omap1/leds-osk.c
delete mode 100644 arch/arm/mach-omap1/leds.c
delete mode 100644 arch/arm/mach-omap1/leds.h
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index e0a0281..df8b52a 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -46,6 +46,11 @@ config MACH_OMAP_H2
bool "TI H2 Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX
select OMAP_MCBSP
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
help
TI OMAP 1610/1611B H2 board support. Say Y here if you have such
a board.
@@ -53,6 +58,11 @@ config MACH_OMAP_H2
config MACH_OMAP_H3
bool "TI H3 Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
help
TI OMAP 1710 H3 board support. Say Y here if you have such
a board.
@@ -73,6 +83,11 @@ config MACH_OMAP_OSK
bool "TI OSK Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX
select OMAP_MCBSP
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
if you have such a board.
@@ -88,6 +103,12 @@ config OMAP_OSK_MISTRAL
config MACH_OMAP_PERSEUS2
bool "TI Perseus2"
depends on ARCH_OMAP1 && ARCH_OMAP730
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
+ select LEDS_TRIGGER_DEFAULT_ON
help
Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
a board.
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index 5b114d1..4d2a140 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -54,14 +54,6 @@ obj-$(CONFIG_ARCH_OMAP850) += gpio7xx.o
obj-$(CONFIG_ARCH_OMAP15XX) += gpio15xx.o
obj-$(CONFIG_ARCH_OMAP16XX) += gpio16xx.o
-# LEDs support
-led-$(CONFIG_MACH_OMAP_H2) += leds-h2p2-debug.o
-led-$(CONFIG_MACH_OMAP_H3) += leds-h2p2-debug.o
-led-$(CONFIG_MACH_OMAP_INNOVATOR) += leds-innovator.o
-led-$(CONFIG_MACH_OMAP_PERSEUS2) += leds-h2p2-debug.o
-led-$(CONFIG_MACH_OMAP_OSK) += leds-osk.o
-obj-$(CONFIG_LEDS) += $(led-y)
-
ifneq ($(CONFIG_FB_OMAP),)
obj-y += lcd_dma.o
endif
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index ba3bd09..c5c9116 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -30,9 +30,10 @@
#include <linux/input.h>
#include <linux/i2c/tps65010.h>
#include <linux/smc91x.h>
+#include <linux/leds.h>
+#include <linux/gpio.h>
#include <mach/hardware.h>
-#include <asm/gpio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -331,6 +332,32 @@ static struct platform_device h2_lcd_device = {
.id = -1,
};
+static struct gpio_led h2_gpio_led_pins[] = {
+ {
+ .name = "h2:red",
+ .default_trigger = "heartbeat",
+ .gpio = 3,
+ },
+ {
+ .name = "h2:green",
+ .default_trigger = "cpu",
+ .gpio = OMAP_MPUIO(4),
+ },
+};
+
+static struct gpio_led_platform_data h2_gpio_led_data = {
+ .leds = h2_gpio_led_pins,
+ .num_leds = ARRAY_SIZE(h2_gpio_led_pins),
+};
+
+static struct platform_device h2_gpio_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &h2_gpio_led_data,
+ },
+};
+
static struct platform_device *h2_devices[] __initdata = {
&h2_nor_device,
&h2_nand_device,
@@ -338,6 +365,7 @@ static struct platform_device *h2_devices[] __initdata = {
&h2_irda_device,
&h2_kp_device,
&h2_lcd_device,
+ &h2_gpio_leds,
};
static void __init h2_init_smc91x(void)
@@ -444,6 +472,10 @@ static void __init h2_init(void)
omap_cfg_reg(E19_1610_KBR4);
omap_cfg_reg(N19_1610_KBR5);
+ /* GPIO based LEDs */
+ omap_cfg_reg(P18_1610_GPIO3);
+ omap_cfg_reg(MPUIO4);
+
platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
omap_board_config = h2_config;
omap_board_config_size = ARRAY_SIZE(h2_config);
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index ac48677..4bdc0a2 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -30,11 +30,12 @@
#include <linux/spi/spi.h>
#include <linux/i2c/tps65010.h>
#include <linux/smc91x.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
#include <asm/setup.h>
#include <asm/page.h>
#include <mach/hardware.h>
-#include <asm/gpio.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -344,6 +345,32 @@ static struct spi_board_info h3_spi_board_info[] __initdata = {
},
};
+static struct gpio_led h3_gpio_led_pins[] = {
+ {
+ .name = "h3:red",
+ .default_trigger = "heartbeat",
+ .gpio = 3,
+ },
+ {
+ .name = "h3:green",
+ .default_trigger = "cpu",
+ .gpio = OMAP_MPUIO(4),
+ },
+};
+
+static struct gpio_led_platform_data h3_gpio_led_data = {
+ .leds = h3_gpio_led_pins,
+ .num_leds = ARRAY_SIZE(h3_gpio_led_pins),
+};
+
+static struct platform_device h3_gpio_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &h3_gpio_led_data,
+ },
+};
+
static struct platform_device *devices[] __initdata = {
&nor_device,
&nand_device,
@@ -351,6 +378,7 @@ static struct platform_device *devices[] __initdata = {
&intlat_device,
&h3_kp_device,
&h3_lcd_device,
+ &h3_gpio_leds,
};
static struct omap_usb_config h3_usb_config __initdata = {
@@ -424,6 +452,10 @@ static void __init h3_init(void)
omap_cfg_reg(E19_1610_KBR4);
omap_cfg_reg(N19_1610_KBR5);
+ /* GPIO based LEDs */
+ omap_cfg_reg(P18_1610_GPIO3);
+ omap_cfg_reg(MPUIO4);
+
platform_add_devices(devices, ARRAY_SIZE(devices));
spi_register_board_info(h3_spi_board_info,
ARRAY_SIZE(h3_spi_board_info));
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e68dfde..6051af1 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -398,10 +398,37 @@ static struct platform_device osk5912_lcd_device = {
.id = -1,
};
+static struct gpio_led mistral_gpio_led_pins[] = {
+ {
+ .name = "mistral:red",
+ .default_trigger = "heartbeat",
+ .gpio = 3,
+ },
+ {
+ .name = "mistral:green",
+ .default_trigger = "cpu",
+ .gpio = OMAP_MPUIO(4),
+ },
+};
+
+static struct gpio_led_platform_data mistral_gpio_led_data = {
+ .leds = mistral_gpio_led_pins,
+ .num_leds = ARRAY_SIZE(mistral_gpio_led_pins),
+};
+
+static struct platform_device mistral_gpio_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &mistral_gpio_led_data,
+ },
+};
+
static struct platform_device *mistral_devices[] __initdata = {
&osk5912_kp_device,
&mistral_bl_device,
&osk5912_lcd_device,
+ &mistral_gpio_leds,
};
static int mistral_get_pendown_state(void)
@@ -526,6 +553,12 @@ static void __init osk_mistral_init(void)
if (gpio_request(2, "lcd_pwr") == 0)
gpio_direction_output(2, 1);
+ /*
+ * GPIO based LEDs
+ */
+ omap_cfg_reg(P18_1610_GPIO3);
+ omap_cfg_reg(MPUIO4);
+
i2c_register_board_info(1, mistral_i2c_board_info,
ARRAY_SIZE(mistral_i2c_board_info));
diff --git a/arch/arm/mach-omap1/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c
deleted file mode 100644
index b4f9be5..0000000
--- a/arch/arm/mach-omap1/leds-h2p2-debug.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * linux/arch/arm/mach-omap1/leds-h2p2-debug.c
- *
- * Copyright 2003 by Texas Instruments Incorporated
- *
- * There are 16 LEDs on the debug board (all green); four may be used
- * for logical 'green', 'amber', 'red', and 'blue' (after "claiming").
- *
- * The "surfer" expansion board and H2 sample board also have two-color
- * green+red LEDs (in parallel), used here for timer and idle indicators.
- */
-#include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/sched.h>
-#include <linux/io.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.h>
-#include <asm/mach-types.h>
-
-#include <plat/fpga.h>
-#include <mach/gpio.h>
-
-#include "leds.h"
-
-
-#define GPIO_LED_RED 3
-#define GPIO_LED_GREEN OMAP_MPUIO(4)
-
-
-#define LED_STATE_ENABLED 0x01
-#define LED_STATE_CLAIMED 0x02
-#define LED_TIMER_ON 0x04
-
-#define GPIO_IDLE GPIO_LED_GREEN
-#define GPIO_TIMER GPIO_LED_RED
-
-
-void h2p2_dbg_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- static struct h2p2_dbg_fpga __iomem *fpga;
- static u16 led_state, hw_led_state;
-
- local_irq_save(flags);
-
- if (!(led_state & LED_STATE_ENABLED) && evt != led_start)
- goto done;
-
- switch (evt) {
- case led_start:
- if (!fpga)
- fpga = ioremap(H2P2_DBG_FPGA_START,
- H2P2_DBG_FPGA_SIZE);
- if (fpga) {
- led_state |= LED_STATE_ENABLED;
- __raw_writew(~0, &fpga->leds);
- }
- break;
-
- case led_stop:
- case led_halted:
- /* all leds off during suspend or shutdown */
-
- if (! machine_is_omap_perseus2()) {
- gpio_set_value(GPIO_TIMER, 0);
- gpio_set_value(GPIO_IDLE, 0);
- }
-
- __raw_writew(~0, &fpga->leds);
- led_state &= ~LED_STATE_ENABLED;
- if (evt == led_halted) {
- iounmap(fpga);
- fpga = NULL;
- }
-
- goto done;
-
- case led_claim:
- led_state |= LED_STATE_CLAIMED;
- hw_led_state = 0;
- break;
-
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer:
- led_state ^= LED_TIMER_ON;
-
- if (machine_is_omap_perseus2())
- hw_led_state ^= H2P2_DBG_FPGA_P2_LED_TIMER;
- else {
- gpio_set_value(GPIO_TIMER, led_state & LED_TIMER_ON);
- goto done;
- }
-
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start:
- if (machine_is_omap_perseus2())
- hw_led_state |= H2P2_DBG_FPGA_P2_LED_IDLE;
- else {
- gpio_set_value(GPIO_IDLE, 1);
- goto done;
- }
-
- break;
-
- case led_idle_end:
- if (machine_is_omap_perseus2())
- hw_led_state &= ~H2P2_DBG_FPGA_P2_LED_IDLE;
- else {
- gpio_set_value(GPIO_IDLE, 0);
- goto done;
- }
-
- break;
-#endif
-
- case led_green_on:
- hw_led_state |= H2P2_DBG_FPGA_LED_GREEN;
- break;
- case led_green_off:
- hw_led_state &= ~H2P2_DBG_FPGA_LED_GREEN;
- break;
-
- case led_amber_on:
- hw_led_state |= H2P2_DBG_FPGA_LED_AMBER;
- break;
- case led_amber_off:
- hw_led_state &= ~H2P2_DBG_FPGA_LED_AMBER;
- break;
-
- case led_red_on:
- hw_led_state |= H2P2_DBG_FPGA_LED_RED;
- break;
- case led_red_off:
- hw_led_state &= ~H2P2_DBG_FPGA_LED_RED;
- break;
-
- case led_blue_on:
- hw_led_state |= H2P2_DBG_FPGA_LED_BLUE;
- break;
- case led_blue_off:
- hw_led_state &= ~H2P2_DBG_FPGA_LED_BLUE;
- break;
-
- default:
- break;
- }
-
-
- /*
- * Actually burn the LEDs
- */
- if (led_state & LED_STATE_ENABLED)
- __raw_writew(~hw_led_state, &fpga->leds);
-
-done:
- local_irq_restore(flags);
-}
diff --git a/arch/arm/mach-omap1/leds-innovator.c b/arch/arm/mach-omap1/leds-innovator.c
deleted file mode 100644
index 9b99c28..0000000
--- a/arch/arm/mach-omap1/leds-innovator.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * linux/arch/arm/mach-omap1/leds-innovator.c
- */
-#include <linux/init.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.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 innovator_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;
- hw_led_state = 0;
- 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:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state ^= 0;
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= 0;
- break;
-
- case led_idle_end:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~0;
- break;
-#endif
-
- case led_halted:
- break;
-
- case led_green_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~0;
- break;
-
- case led_green_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= 0;
- break;
-
- case led_amber_on:
- break;
-
- case led_amber_off:
- break;
-
- case led_red_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~0;
- break;
-
- case led_red_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= 0;
- break;
-
- default:
- break;
- }
-
- local_irq_restore(flags);
-}
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
deleted file mode 100644
index 499d7ad..0000000
--- a/arch/arm/mach-omap1/leds-osk.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * linux/arch/arm/mach-omap1/leds-osk.c
- *
- * LED driver for OSK with optional Mistral QVGA board
- */
-#include <linux/init.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.h>
-
-#include <mach/gpio.h>
-
-#include "leds.h"
-
-
-#define LED_STATE_ENABLED (1 << 0)
-#define LED_STATE_CLAIMED (1 << 1)
-static u8 led_state;
-
-#define TIMER_LED (1 << 3) /* Mistral board */
-#define IDLE_LED (1 << 4) /* Mistral board */
-static u8 hw_led_state;
-
-
-#ifdef CONFIG_OMAP_OSK_MISTRAL
-
-/* For now, all system indicators require the Mistral board, since that
- * LED can be manipulated without a task context. This LED is either red,
- * or green, but not both; it can't give the full "disco led" effect.
- */
-
-#define GPIO_LED_RED 3
-#define GPIO_LED_GREEN OMAP_MPUIO(4)
-
-static void mistral_setled(void)
-{
- int red = 0;
- int green = 0;
-
- if (hw_led_state & TIMER_LED)
- red = 1;
- else if (hw_led_state & IDLE_LED)
- green = 1;
- /* else both sides are disabled */
-
- gpio_set_value(GPIO_LED_GREEN, green);
- gpio_set_value(GPIO_LED_RED, red);
-}
-
-#endif
-
-void osk_leds_event(led_event_t evt)
-{
- unsigned long flags;
- u16 leds;
-
- local_irq_save(flags);
-
- if (!(led_state & LED_STATE_ENABLED) && evt != led_start)
- goto done;
-
- leds = hw_led_state;
- switch (evt) {
- case led_start:
- led_state |= LED_STATE_ENABLED;
- hw_led_state = 0;
- leds = ~0;
- break;
-
- case led_halted:
- case led_stop:
- led_state &= ~LED_STATE_ENABLED;
- hw_led_state = 0;
- break;
-
- case led_claim:
- led_state |= LED_STATE_CLAIMED;
- hw_led_state = 0;
- leds = ~0;
- break;
-
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- hw_led_state = 0;
- break;
-
-#ifdef CONFIG_OMAP_OSK_MISTRAL
-
- case led_timer:
- hw_led_state ^= TIMER_LED;
- mistral_setled();
- break;
-
- case led_idle_start: /* idle == off */
- hw_led_state &= ~IDLE_LED;
- mistral_setled();
- break;
-
- case led_idle_end:
- hw_led_state |= IDLE_LED;
- mistral_setled();
- break;
-
-#endif /* CONFIG_OMAP_OSK_MISTRAL */
-
- default:
- break;
- }
-
- leds ^= hw_led_state;
-
-done:
- local_irq_restore(flags);
-}
diff --git a/arch/arm/mach-omap1/leds.c b/arch/arm/mach-omap1/leds.c
deleted file mode 100644
index 22eb11d..0000000
--- a/arch/arm/mach-omap1/leds.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * linux/arch/arm/mach-omap1/leds.c
- *
- * OMAP LEDs dispatcher
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/leds.h>
-#include <asm/mach-types.h>
-
-#include <mach/gpio.h>
-#include <plat/mux.h>
-
-#include "leds.h"
-
-static int __init
-omap_leds_init(void)
-{
- if (!cpu_class_is_omap1())
- return -ENODEV;
-
- if (machine_is_omap_innovator())
- leds_event = innovator_leds_event;
-
- else if (machine_is_omap_h2()
- || machine_is_omap_h3()
- || machine_is_omap_perseus2())
- leds_event = h2p2_dbg_leds_event;
-
- else if (machine_is_omap_osk())
- leds_event = osk_leds_event;
-
- else
- return -1;
-
- if (machine_is_omap_h2()
- || machine_is_omap_h3()
-#ifdef CONFIG_OMAP_OSK_MISTRAL
- || machine_is_omap_osk()
-#endif
- ) {
-
- /* LED1/LED2 pins can be used as GPIO (as done here), or by
- * the LPG (works even in deep sleep!), to drive a bicolor
- * LED on the H2 sample board, and another on the H2/P2
- * "surfer" expansion board.
- *
- * The same pins drive a LED on the OSK Mistral board, but
- * that's a different kind of LED (just one color at a time).
- */
- omap_cfg_reg(P18_1610_GPIO3);
- if (gpio_request(3, "LED red") == 0)
- gpio_direction_output(3, 1);
- else
- printk(KERN_WARNING "LED: can't get GPIO3/red?\n");
-
- omap_cfg_reg(MPUIO4);
- if (gpio_request(OMAP_MPUIO(4), "LED green") == 0)
- gpio_direction_output(OMAP_MPUIO(4), 1);
- else
- printk(KERN_WARNING "LED: can't get MPUIO4/green?\n");
- }
-
- leds_event(led_start);
- return 0;
-}
-
-__initcall(omap_leds_init);
diff --git a/arch/arm/mach-omap1/leds.h b/arch/arm/mach-omap1/leds.h
deleted file mode 100644
index a1e9fed..0000000
--- a/arch/arm/mach-omap1/leds.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void innovator_leds_event(led_event_t evt);
-extern void h2p2_dbg_leds_event(led_event_t evt);
-extern void osk_leds_event(led_event_t evt);
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 03e1e10..8974eb4 100644
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -47,7 +47,6 @@
#include <asm/system.h>
#include <mach/hardware.h>
-#include <asm/leds.h>
#include <asm/irq.h>
#include <asm/sched_clock.h>
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c
index 13d7b8f..1a8f77f 100644
--- a/arch/arm/mach-omap1/timer32k.c
+++ b/arch/arm/mach-omap1/timer32k.c
@@ -48,7 +48,6 @@
#include <asm/system.h>
#include <mach/hardware.h>
-#include <asm/leds.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 49a4c75..8d4cf6b 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -34,9 +34,14 @@ config OMAP_DEBUG_DEVICES
For debug cards on TI reference boards.
config OMAP_DEBUG_LEDS
- bool
+ def_bool y
depends on OMAP_DEBUG_DEVICES
- default y if LEDS_CLASS
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
+ select LEDS_TRIGGER_DEFAULT_ON
config OMAP_SMARTREFLEX
bool "SmartReflex support"
diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
index fc05b10..bf544e9 100644
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@ -1,6 +1,7 @@
/*
* linux/arch/arm/plat-omap/debug-leds.c
*
+ * Copyright 2011 by Bryan Wu <bryan.wu@canonical.com>
* Copyright 2003 by Texas Instruments Incorporated
*
* This program is free software; you can redistribute it and/or modify
@@ -8,274 +9,111 @@
* published by the Free Software Foundation.
*/
+#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/leds.h>
#include <linux/io.h>
+#include <linux/slab.h>
#include <mach/hardware.h>
-#include <asm/leds.h>
#include <asm/system.h>
#include <asm/mach-types.h>
#include <plat/fpga.h>
-#include <mach/gpio.h>
-
/* Many OMAP development platforms reuse the same "debug board"; these
* platforms include H2, H3, H4, and Perseus2. There are 16 LEDs on the
* debug board (all green), accessed through FPGA registers.
- *
- * The "surfer" expansion board and H2 sample board also have two-color
- * green+red LEDs (in parallel), used here for timer and idle indicators
- * in preference to the ones on the debug board, for a "Disco LED" effect.
- *
- * This driver exports either the original ARM LED API, the new generic
- * one, or both.
- */
-
-static spinlock_t lock;
-static struct h2p2_dbg_fpga __iomem *fpga;
-static u16 led_state, hw_led_state;
-
-
-#ifdef CONFIG_OMAP_DEBUG_LEDS
-#define new_led_api() 1
-#else
-#define new_led_api() 0
-#endif
-
-
-/*-------------------------------------------------------------------------*/
-
-/* original ARM debug LED API:
- * - timer and idle leds (some boards use non-FPGA leds here);
- * - up to 4 generic leds, easily accessed in-kernel (any context)
*/
-#define GPIO_LED_RED 3
-#define GPIO_LED_GREEN OMAP_MPUIO(4)
-
-#define LED_STATE_ENABLED 0x01
-#define LED_STATE_CLAIMED 0x02
-#define LED_TIMER_ON 0x04
-
-#define GPIO_IDLE GPIO_LED_GREEN
-#define GPIO_TIMER GPIO_LED_RED
-
-static void h2p2_dbg_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- spin_lock_irqsave(&lock, flags);
-
- if (!(led_state & LED_STATE_ENABLED) && evt != led_start)
- goto done;
+static struct h2p2_dbg_fpga __iomem *fpga;
- switch (evt) {
- case led_start:
- if (fpga)
- led_state |= LED_STATE_ENABLED;
- break;
-
- case led_stop:
- case led_halted:
- /* all leds off during suspend or shutdown */
-
- if (!(machine_is_omap_perseus2() || machine_is_omap_h4())) {
- gpio_set_value(GPIO_TIMER, 0);
- gpio_set_value(GPIO_IDLE, 0);
- }
-
- __raw_writew(~0, &fpga->leds);
- led_state &= ~LED_STATE_ENABLED;
- goto done;
-
- case led_claim:
- led_state |= LED_STATE_CLAIMED;
- hw_led_state = 0;
- break;
-
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer:
- led_state ^= LED_TIMER_ON;
-
- if (machine_is_omap_perseus2() || machine_is_omap_h4())
- hw_led_state ^= H2P2_DBG_FPGA_P2_LED_TIMER;
- else {
- gpio_set_value(GPIO_TIMER,
- led_state & LED_TIMER_ON);
- goto done;
- }
-
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- /* LED lit iff busy */
- case led_idle_start:
- if (machine_is_omap_perseus2() || machine_is_omap_h4())
- hw_led_state &= ~H2P2_DBG_FPGA_P2_LED_IDLE;
- else {
- gpio_set_value(GPIO_IDLE, 1);
- goto done;
- }
-
- break;
-
- case led_idle_end:
- if (machine_is_omap_perseus2() || machine_is_omap_h4())
- hw_led_state |= H2P2_DBG_FPGA_P2_LED_IDLE;
- else {
- gpio_set_value(GPIO_IDLE, 0);
- goto done;
- }
-
- break;
-#endif
-
- case led_green_on:
- hw_led_state |= H2P2_DBG_FPGA_LED_GREEN;
- break;
- case led_green_off:
- hw_led_state &= ~H2P2_DBG_FPGA_LED_GREEN;
- break;
-
- case led_amber_on:
- hw_led_state |= H2P2_DBG_FPGA_LED_AMBER;
- break;
- case led_amber_off:
- hw_led_state &= ~H2P2_DBG_FPGA_LED_AMBER;
- break;
-
- case led_red_on:
- hw_led_state |= H2P2_DBG_FPGA_LED_RED;
- break;
- case led_red_off:
- hw_led_state &= ~H2P2_DBG_FPGA_LED_RED;
- break;
-
- case led_blue_on:
- hw_led_state |= H2P2_DBG_FPGA_LED_BLUE;
- break;
- case led_blue_off:
- hw_led_state &= ~H2P2_DBG_FPGA_LED_BLUE;
- break;
-
- default:
- break;
- }
-
-
- /*
- * Actually burn the LEDs
- */
- if (led_state & LED_STATE_ENABLED)
- __raw_writew(~hw_led_state, &fpga->leds);
-
-done:
- spin_unlock_irqrestore(&lock, flags);
-}
-
-/*-------------------------------------------------------------------------*/
-
-/* "new" LED API
- * - with syfs access and generic triggering
- * - not readily accessible to in-kernel drivers
- */
+static u16 fpga_led_state;
struct dbg_led {
struct led_classdev cdev;
u16 mask;
};
-static struct dbg_led dbg_leds[] = {
- /* REVISIT at least H2 uses different timer & cpu leds... */
-#ifndef CONFIG_LEDS_TIMER
- { .mask = 1 << 0, .cdev.name = "d4:green",
- .cdev.default_trigger = "heartbeat", },
-#endif
-#ifndef CONFIG_LEDS_CPU
- { .mask = 1 << 1, .cdev.name = "d5:green", }, /* !idle */
-#endif
- { .mask = 1 << 2, .cdev.name = "d6:green", },
- { .mask = 1 << 3, .cdev.name = "d7:green", },
-
- { .mask = 1 << 4, .cdev.name = "d8:green", },
- { .mask = 1 << 5, .cdev.name = "d9:green", },
- { .mask = 1 << 6, .cdev.name = "d10:green", },
- { .mask = 1 << 7, .cdev.name = "d11:green", },
-
- { .mask = 1 << 8, .cdev.name = "d12:green", },
- { .mask = 1 << 9, .cdev.name = "d13:green", },
- { .mask = 1 << 10, .cdev.name = "d14:green", },
- { .mask = 1 << 11, .cdev.name = "d15:green", },
-
-#ifndef CONFIG_LEDS
- { .mask = 1 << 12, .cdev.name = "d16:green", },
- { .mask = 1 << 13, .cdev.name = "d17:green", },
- { .mask = 1 << 14, .cdev.name = "d18:green", },
- { .mask = 1 << 15, .cdev.name = "d19:green", },
-#endif
+static const struct {
+ const char *name;
+ const char *trigger;
+} dbg_leds[] = {
+ { "dbg:d4", "heartbeat", },
+ { "dbg:d5", "cpu", },
+ { "dbg:d6", "default-on", },
+ { "dbg:d7", },
+ { "dbg:d8", },
+ { "dbg:d9", },
+ { "dbg:d10", },
+ { "dbg:d11", },
+ { "dbg:d12", },
+ { "dbg:d13", },
+ { "dbg:d14", },
+ { "dbg:d15", },
+ { "dbg:d16", },
+ { "dbg:d17", },
+ { "dbg:d18", },
+ { "dbg:d19", },
};
-static void
-fpga_led_set(struct led_classdev *cdev, enum led_brightness value)
+/*
+ * The triggers lines up below will only be used if the
+ * LED triggers are compiled in.
+ */
+static void dbg_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
{
- struct dbg_led *led = container_of(cdev, struct dbg_led, cdev);
- unsigned long flags;
+ struct dbg_led *led = container_of(cdev, struct dbg_led, cdev);
+ u16 reg;
- spin_lock_irqsave(&lock, flags);
- if (value == LED_OFF)
- hw_led_state &= ~led->mask;
+ reg = __raw_readw(&fpga->leds);
+ if (b != LED_OFF)
+ reg |= led->mask;
else
- hw_led_state |= led->mask;
- __raw_writew(~hw_led_state, &fpga->leds);
- spin_unlock_irqrestore(&lock, flags);
+ reg &= ~led->mask;
+ __raw_writew(reg, &fpga->leds);
}
-static void __init newled_init(struct device *dev)
+static enum led_brightness dbg_led_get(struct led_classdev *cdev)
{
- unsigned i;
- struct dbg_led *led;
- int status;
+ struct dbg_led *led = container_of(cdev, struct dbg_led, cdev);
+ u16 reg;
- for (i = 0, led = dbg_leds; i < ARRAY_SIZE(dbg_leds); i++, led++) {
- led->cdev.brightness_set = fpga_led_set;
- status = led_classdev_register(dev, &led->cdev);
- if (status < 0)
- break;
- }
- return;
+ reg = __raw_readw(&fpga->leds);
+ return (reg & led->mask) ? LED_FULL : LED_OFF;
}
-
-/*-------------------------------------------------------------------------*/
-
-static int /* __init */ fpga_probe(struct platform_device *pdev)
+static int fpga_probe(struct platform_device *pdev)
{
struct resource *iomem;
-
- spin_lock_init(&lock);
+ int i;
iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!iomem)
return -ENODEV;
fpga = ioremap(iomem->start, H2P2_DBG_FPGA_SIZE);
- __raw_writew(~0, &fpga->leds);
+ __raw_writew(0xff, &fpga->leds);
+
+ for (i = 0; i < ARRAY_SIZE(dbg_leds); i++) {
+ struct dbg_led *led;
+
+ led = kzalloc(sizeof(*led), GFP_KERNEL);
+ if (!led)
+ break;
-#ifdef CONFIG_LEDS
- leds_event = h2p2_dbg_leds_event;
- leds_event(led_start);
-#endif
+ led->cdev.name = dbg_leds[i].name;
+ led->cdev.brightness_set = dbg_led_set;
+ led->cdev.brightness_get = dbg_led_get;
+ led->cdev.default_trigger = dbg_leds[i].trigger;
+ led->mask = BIT(i);
- if (new_led_api()) {
- newled_init(&pdev->dev);
+ if (led_classdev_register(NULL, &led->cdev) < 0) {
+ kfree(led);
+ break;
+ }
}
return 0;
@@ -283,13 +121,15 @@ static int /* __init */ fpga_probe(struct platform_device *pdev)
static int fpga_suspend_noirq(struct device *dev)
{
- __raw_writew(~0, &fpga->leds);
+ fpga_led_state = __raw_readw(&fpga->leds);
+ __raw_writew(0xff, &fpga->leds);
+
return 0;
}
static int fpga_resume_noirq(struct device *dev)
{
- __raw_writew(~hw_led_state, &fpga->leds);
+ __raw_writew(~fpga_led_state, &fpga->leds);
return 0;
}
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (14 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 15/17] mach-omap1: retire custom LED code Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-06 14:04 ` Jochen Friedrich
2011-07-10 9:24 ` Russell King - ARM Linux
2011-07-06 12:34 ` [PATCH 17/17] ARM: use new LEDS CPU trigger stub to replace old one Bryan Wu
2011-07-06 13:13 ` [PATCH 00/17] Introduce a led trigger for CPU activity Eric Miao
17 siblings, 2 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/mach-sa1100/Kconfig | 29 +++++++++
arch/arm/mach-sa1100/Makefile | 10 ---
arch/arm/mach-sa1100/assabet.c | 75 +++++++++++++++++++++++
arch/arm/mach-sa1100/badge4.c | 30 +++++++++
arch/arm/mach-sa1100/cerf.c | 42 +++++++++++++
arch/arm/mach-sa1100/hackkit.c | 32 ++++++++++
arch/arm/mach-sa1100/lart.c | 26 ++++++++
arch/arm/mach-sa1100/leds-assabet.c | 114 -----------------------------------
arch/arm/mach-sa1100/leds-badge4.c | 111 ----------------------------------
arch/arm/mach-sa1100/leds-cerf.c | 110 ---------------------------------
arch/arm/mach-sa1100/leds-hackkit.c | 112 ----------------------------------
arch/arm/mach-sa1100/leds-lart.c | 101 -------------------------------
arch/arm/mach-sa1100/leds-simpad.c | 100 ------------------------------
arch/arm/mach-sa1100/leds.c | 52 ----------------
arch/arm/mach-sa1100/leds.h | 14 ----
arch/arm/mach-sa1100/simpad.c | 48 +++++++++++++++
16 files changed, 282 insertions(+), 724 deletions(-)
delete mode 100644 arch/arm/mach-sa1100/leds-assabet.c
delete mode 100644 arch/arm/mach-sa1100/leds-badge4.c
delete mode 100644 arch/arm/mach-sa1100/leds-cerf.c
delete mode 100644 arch/arm/mach-sa1100/leds-hackkit.c
delete mode 100644 arch/arm/mach-sa1100/leds-lart.c
delete mode 100644 arch/arm/mach-sa1100/leds-simpad.c
delete mode 100644 arch/arm/mach-sa1100/leds.c
delete mode 100644 arch/arm/mach-sa1100/leds.h
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index 42625e4..266fce9 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -5,6 +5,11 @@ menu "SA11x0 Implementations"
config SA1100_ASSABET
bool "Assabet"
select CPU_FREQ_SA1110
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
help
Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
Microprocessor Development Board (also known as the Assabet).
@@ -21,6 +26,12 @@ config ASSABET_NEPONSET
config SA1100_CERF
bool "CerfBoard"
select CPU_FREQ_SA1110
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
+ select LEDS_TRIGGER_DEFAULT_ON
help
The Intrinsyc CerfBoard is based on the StrongARM 1110 (Discontinued).
More information is available at:
@@ -80,6 +91,11 @@ config SA1100_BADGE4
bool "HP Labs BadgePAD 4"
select SA1111
select CPU_FREQ_SA1100
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
help
Say Y here if you want to build a kernel for the HP Laboratories
BadgePAD 4.
@@ -106,6 +122,11 @@ config SA1100_JORNADA720_SSP
config SA1100_HACKKIT
bool "HackKit Core CPU Board"
select CPU_FREQ_SA1100
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
+ select LEDS_TRIGGER_HEARTBEAT
help
Say Y here to support the HackKit Core CPU Board
<http://hackkit.eletztrick.de>;
@@ -113,6 +134,10 @@ config SA1100_HACKKIT
config SA1100_LART
bool "LART"
select CPU_FREQ_SA1100
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_CPU
help
Say Y here if you are using the Linux Advanced Radio Terminal
(also known as the LART). See <http://www.lartmaker.nl/> for
@@ -149,6 +174,10 @@ config SA1100_SHANNON
config SA1100_SIMPAD
bool "Simpad"
select CPU_FREQ_SA1110
+ select NEW_LEDS
+ select LEDS_CLASS
+ select LEDS_TRIGGERS
+ select LEDS_TRIGGER_HEARTBEAT
help
The SIEMENS webpad SIMpad is based on the StrongARM 1110. There
are two different versions CL4 and SL4. CL4 has 32MB RAM and 16MB
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 41252d2..5f5f491 100644
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -7,21 +7,17 @@ obj-y := clock.o generic.o gpio.o irq.o dma.o time.o #nmi-oopser.o
obj-m :=
obj-n :=
obj- :=
-led-y := leds.o
obj-$(CONFIG_CPU_FREQ_SA1100) += cpu-sa1100.o
obj-$(CONFIG_CPU_FREQ_SA1110) += cpu-sa1110.o
# Specific board support
obj-$(CONFIG_SA1100_ASSABET) += assabet.o
-led-$(CONFIG_SA1100_ASSABET) += leds-assabet.o
obj-$(CONFIG_ASSABET_NEPONSET) += neponset.o
obj-$(CONFIG_SA1100_BADGE4) += badge4.o
-led-$(CONFIG_SA1100_BADGE4) += leds-badge4.o
obj-$(CONFIG_SA1100_CERF) += cerf.o
-led-$(CONFIG_SA1100_CERF) += leds-cerf.o
obj-$(CONFIG_SA1100_COLLIE) += collie.o
@@ -29,13 +25,11 @@ obj-$(CONFIG_SA1100_H3100) += h3100.o h3xxx.o
obj-$(CONFIG_SA1100_H3600) += h3600.o h3xxx.o
obj-$(CONFIG_SA1100_HACKKIT) += hackkit.o
-led-$(CONFIG_SA1100_HACKKIT) += leds-hackkit.o
obj-$(CONFIG_SA1100_JORNADA720) += jornada720.o
obj-$(CONFIG_SA1100_JORNADA720_SSP) += jornada720_ssp.o
obj-$(CONFIG_SA1100_LART) += lart.o
-led-$(CONFIG_SA1100_LART) += leds-lart.o
obj-$(CONFIG_SA1100_NANOENGINE) += nanoengine.o
obj-$(CONFIG_PCI_NANOENGINE) += pci-nanoengine.o
@@ -45,10 +39,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)
# Miscellaneous functions
obj-$(CONFIG_PM) += pm.o sleep.o
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index 5778274..13e4e5d 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -19,6 +19,8 @@
#include <linux/mtd/partitions.h>
#include <linux/delay.h>
#include <linux/mm.h>
+#include <linux/leds.h>
+#include <linux/slab.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
@@ -445,6 +447,79 @@ static void __init assabet_map_io(void)
sa1100_register_uart(2, 3);
}
+/* LEDs */
+struct assabet_led {
+ struct led_classdev cdev;
+ u32 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;
+} assabet_leds[] = {
+ { "assabet:red", "cpu",},
+ { "assabet:green", "heartbeat", },
+};
+
+static void assabet_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
+{
+ struct assabet_led *led = container_of(cdev,
+ struct assabet_led, cdev);
+
+ if (b != LED_OFF)
+ ASSABET_BCR_clear(led->mask);
+ else
+ ASSABET_BCR_set(led->mask);
+}
+
+static enum led_brightness assabet_led_get(struct led_classdev *cdev)
+{
+ struct assabet_led *led = container_of(cdev,
+ struct assabet_led, cdev);
+
+ return (ASSABET_BCR & led->mask) ? LED_OFF : LED_FULL;
+}
+
+static int __init assabet_leds_init(void)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(assabet_leds); i++) {
+ struct assabet_led *led;
+
+ led = kzalloc(sizeof(*led), GFP_KERNEL);
+ if (!led)
+ break;
+
+ led->cdev.name = assabet_leds[i].name;
+ led->cdev.brightness_set = assabet_led_set;
+ led->cdev.brightness_get = assabet_led_get;
+ led->cdev.default_trigger = assabet_leds[i].trigger;
+
+ if (!i)
+ led->mask = ASSABET_BCR_LED_RED;
+ else
+ led->mask = ASSABET_BCR_LED_GREEN;
+
+ 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(assabet_leds_init);
MACHINE_START(ASSABET, "Intel-Assabet")
.boot_params = 0xc0000100,
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c
index 4f19ff8..0711c30 100644
--- a/arch/arm/mach-sa1100/badge4.c
+++ b/arch/arm/mach-sa1100/badge4.c
@@ -22,6 +22,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/errno.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
@@ -69,8 +71,36 @@ static struct platform_device sa1111_device = {
.resource = sa1111_resources,
};
+/* LEDs */
+struct gpio_led badge4_gpio_leds[] = {
+ {
+ .name = "badge4:red",
+ .default_trigger = "heartbeat",
+ .gpio = 7,
+ },
+ {
+ .name = "badge4:green",
+ .default_trigger = "cpu",
+ .gpio = 9,
+ },
+};
+
+static struct gpio_led_platform_data badge4_gpio_led_info = {
+ .leds = badge4_gpio_leds,
+ .num_leds = ARRAY_SIZE(badge4_gpio_leds),
+};
+
+static struct platform_device badge4_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &badge4_gpio_led_info,
+ }
+};
+
static struct platform_device *devices[] __initdata = {
&sa1111_device,
+ &badge4_leds;
};
static int __init badge4_sa1111_init(void)
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index 7f3da4b..29c099d 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -17,6 +17,8 @@
#include <linux/irq.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
#include <asm/irq.h>
#include <mach/hardware.h>
@@ -47,8 +49,48 @@ static struct platform_device cerfuart2_device = {
.resource = cerfuart2_resources,
};
+/* LEDs */
+struct gpio_led cerf_gpio_leds[] = {
+ {
+ .name = "cerf:d0",
+ .default_trigger = "heartbeat",
+ .gpio = 0,
+ },
+ {
+ .name = "cerf:d1",
+ .default_trigger = "cpu",
+ .gpio = 1,
+ },
+ {
+ .name = "cerf:d2",
+ .default_trigger = "default-on",
+ .gpio = 2,
+ },
+ {
+ .name = "cerf:d3",
+ .default_trigger = "default-on",
+ .gpio = 3,
+ },
+
+};
+
+static struct gpio_led_platform_data cerf_gpio_led_info = {
+ .leds = cerf_gpio_leds,
+ .num_leds = ARRAY_SIZE(cerf_gpio_leds),
+};
+
+static struct platform_device cerf_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &cerf_gpio_led_info,
+ }
+};
+
+
static struct platform_device *cerf_devices[] __initdata = {
&cerfuart2_device,
+ &cerf_leds,
};
#ifdef CONFIG_SA1100_CERF_FLASH_32MB
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c
index db5e434..1661f2e 100644
--- a/arch/arm/mach-sa1100/hackkit.c
+++ b/arch/arm/mach-sa1100/hackkit.c
@@ -21,6 +21,10 @@
#include <linux/serial_core.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
+#include <linux/tty.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <linux/platform_device.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
@@ -185,9 +189,37 @@ static struct resource hackkit_flash_resource = {
.flags = IORESOURCE_MEM,
};
+/* LEDs */
+struct gpio_led hackkit_gpio_leds[] = {
+ {
+ .name = "hackkit:red",
+ .default_trigger = "cpu",
+ .gpio = 22,
+ },
+ {
+ .name = "hackkit:green",
+ .default_trigger = "heartbeat",
+ .gpio = 23,
+ },
+};
+
+static struct gpio_led_platform_data hackkit_gpio_led_info = {
+ .leds = hackkit_gpio_leds,
+ .num_leds = ARRAY_SIZE(hackkit_gpio_leds),
+};
+
+static struct platform_device hackkit_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &hackkit_gpio_led_info,
+ }
+};
+
static void __init hackkit_init(void)
{
sa11x0_register_mtd(&hackkit_flash_data, &hackkit_flash_resource, 1);
+ platform_device_register(&hackkit_leds);
}
/**********************************************************************
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c
index 7b9556b..1678fa5 100644
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
@@ -5,6 +5,9 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/tty.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <linux/platform_device.h>
#include <mach/hardware.h>
#include <asm/setup.h>
@@ -45,6 +48,27 @@ static struct map_desc lart_io_desc[] __initdata = {
}
};
+/* LEDs */
+struct gpio_led lart_gpio_leds[] = {
+ {
+ .name = "lart:red",
+ .default_trigger = "cpu",
+ .gpio = 23,
+ },
+};
+
+static struct gpio_led_platform_data lart_gpio_led_info = {
+ .leds = lart_gpio_leds,
+ .num_leds = ARRAY_SIZE(lart_gpio_leds),
+};
+
+static struct platform_device lart_leds = {
+ .name = "leds-gpio",
+ .id = -1,
+ .dev = {
+ .platform_data = &lart_gpio_led_info,
+ }
+};
static void __init lart_map_io(void)
{
sa1100_map_io();
@@ -58,6 +82,8 @@ static void __init lart_map_io(void)
GPDR |= GPIO_UART_TXD;
GPDR &= ~GPIO_UART_RXD;
PPAR |= PPAR_UPR;
+
+ platform_device_register(&lart_leds);
}
MACHINE_START(LART, "LART")
diff --git a/arch/arm/mach-sa1100/leds-assabet.c b/arch/arm/mach-sa1100/leds-assabet.c
deleted file mode 100644
index 64e9b4b..0000000
--- a/arch/arm/mach-sa1100/leds-assabet.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * linux/arch/arm/mach-sa1100/leds-assabet.c
- *
- * Copyright (C) 2000 John Dorsey <john+@cs.cmu.edu>
- *
- * Original (leds-footbridge.c) by Russell King
- *
- * Assabet uses the LEDs as follows:
- * - Green - toggles state every 50 timer interrupts
- * - Red - on if system is not idle
- */
-#include <linux/init.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.h>
-#include <mach/assabet.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 ASSABET_BCR_LED_MASK (ASSABET_BCR_LED_GREEN | ASSABET_BCR_LED_RED)
-
-void assabet_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- local_irq_save(flags);
-
- switch (evt) {
- case led_start:
- hw_led_state = ASSABET_BCR_LED_RED | ASSABET_BCR_LED_GREEN;
- led_state = LED_STATE_ENABLED;
- break;
-
- case led_stop:
- led_state &= ~LED_STATE_ENABLED;
- hw_led_state = ASSABET_BCR_LED_RED | ASSABET_BCR_LED_GREEN;
- ASSABET_BCR_frob(ASSABET_BCR_LED_MASK, hw_led_state);
- break;
-
- case led_claim:
- led_state |= LED_STATE_CLAIMED;
- hw_led_state = ASSABET_BCR_LED_RED | ASSABET_BCR_LED_GREEN;
- break;
-
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- hw_led_state = ASSABET_BCR_LED_RED | ASSABET_BCR_LED_GREEN;
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state ^= ASSABET_BCR_LED_GREEN;
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= ASSABET_BCR_LED_RED;
- break;
-
- case led_idle_end:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~ASSABET_BCR_LED_RED;
- break;
-#endif
-
- case led_halted:
- break;
-
- case led_green_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~ASSABET_BCR_LED_GREEN;
- break;
-
- case led_green_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= ASSABET_BCR_LED_GREEN;
- break;
-
- case led_amber_on:
- break;
-
- case led_amber_off:
- break;
-
- case led_red_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~ASSABET_BCR_LED_RED;
- break;
-
- case led_red_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= ASSABET_BCR_LED_RED;
- break;
-
- default:
- break;
- }
-
- if (led_state & LED_STATE_ENABLED)
- ASSABET_BCR_frob(ASSABET_BCR_LED_MASK, hw_led_state);
-
- local_irq_restore(flags);
-}
diff --git a/arch/arm/mach-sa1100/leds-badge4.c b/arch/arm/mach-sa1100/leds-badge4.c
deleted file mode 100644
index cf1e384..0000000
--- a/arch/arm/mach-sa1100/leds-badge4.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * linux/arch/arm/mach-sa1100/leds-badge4.c
- *
- * Author: Christopher Hoover <ch@hpl.hp.com>
- * Copyright (C) 2002 Hewlett-Packard Company
- *
- * 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 <asm/system.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_RED GPIO_GPIO(7)
-#define LED_GREEN GPIO_GPIO(9)
-#define LED_MASK (LED_RED|LED_GREEN)
-
-#define LED_IDLE LED_GREEN
-#define LED_TIMER LED_RED
-
-void badge4_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- local_irq_save(flags);
-
- switch (evt) {
- case led_start:
- GPDR |= LED_MASK;
- hw_led_state = LED_MASK;
- 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_MASK;
- break;
-
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- hw_led_state = LED_MASK;
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state ^= LED_TIMER;
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start:
- /* LED off when system is idle */
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~LED_IDLE;
- break;
-
- case led_idle_end:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= LED_IDLE;
- break;
-#endif
-
- case led_red_on:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~LED_RED;
- break;
-
- case led_red_off:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= LED_RED;
- 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;
-
- default:
- break;
- }
-
- if (led_state & LED_STATE_ENABLED) {
- GPSR = hw_led_state;
- GPCR = hw_led_state ^ LED_MASK;
- }
-
- local_irq_restore(flags);
-}
diff --git a/arch/arm/mach-sa1100/leds-cerf.c b/arch/arm/mach-sa1100/leds-cerf.c
deleted file mode 100644
index 259b48e..0000000
--- a/arch/arm/mach-sa1100/leds-cerf.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * linux/arch/arm/mach-sa1100/leds-cerf.c
- *
- * Author: ???
- */
-#include <linux/init.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.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_D0 GPIO_GPIO(0)
-#define LED_D1 GPIO_GPIO(1)
-#define LED_D2 GPIO_GPIO(2)
-#define LED_D3 GPIO_GPIO(3)
-#define LED_MASK (LED_D0|LED_D1|LED_D2|LED_D3)
-
-void cerf_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- local_irq_save(flags);
-
- switch (evt) {
- case led_start:
- hw_led_state = LED_MASK;
- 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_MASK;
- break;
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- hw_led_state = LED_MASK;
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state ^= LED_D0;
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~LED_D1;
- break;
-
- case led_idle_end:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= LED_D1;
- break;
-#endif
- case led_green_on:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~LED_D2;
- break;
-
- case led_green_off:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= LED_D2;
- break;
-
- case led_amber_on:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~LED_D3;
- break;
-
- case led_amber_off:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= LED_D3;
- break;
-
- case led_red_on:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~LED_D1;
- break;
-
- case led_red_off:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= LED_D1;
- break;
-
- default:
- break;
- }
-
- if (led_state & LED_STATE_ENABLED) {
- GPSR = hw_led_state;
- GPCR = hw_led_state ^ LED_MASK;
- }
-
- local_irq_restore(flags);
-}
diff --git a/arch/arm/mach-sa1100/leds-hackkit.c b/arch/arm/mach-sa1100/leds-hackkit.c
deleted file mode 100644
index 2bce137..0000000
--- a/arch/arm/mach-sa1100/leds-hackkit.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * linux/arch/arm/mach-sa1100/leds-hackkit.c
- *
- * based on leds-lart.c
- *
- * (C) Erik Mouw (J.A.K.Mouw at its.tudelft.nl), April 21, 2000
- * (C) Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>, 2002
- *
- * The HackKit has two leds (GPIO 22/23). The red led (gpio 22) is used
- * as cpu led, the green one is used as timer led.
- */
-#include <linux/init.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.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 GPIO_GPIO23
-#define LED_RED GPIO_GPIO22
-#define LED_MASK (LED_RED | LED_GREEN)
-
-void hackkit_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- local_irq_save(flags);
-
- switch(evt) {
- case led_start:
- /* pin 22/23 are outputs */
- GPDR |= LED_MASK;
- hw_led_state = LED_MASK;
- 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_MASK;
- break;
-
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- hw_led_state = LED_MASK;
- 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:
- /* The LART people like the LED to be off when the
- system is idle... */
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~LED_RED;
- break;
-
- case led_idle_end:
- /* ... and on if the system is not idle */
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= LED_RED;
- break;
-#endif
-
- case led_red_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~LED_RED;
- break;
-
- case led_red_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= LED_RED;
- 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;
-
- default:
- break;
- }
-
- /* Now set the GPIO state, or nothing will happen at all */
- if (led_state & LED_STATE_ENABLED) {
- GPSR = hw_led_state;
- GPCR = hw_led_state ^ LED_MASK;
- }
-
- local_irq_restore(flags);
-}
diff --git a/arch/arm/mach-sa1100/leds-lart.c b/arch/arm/mach-sa1100/leds-lart.c
deleted file mode 100644
index 0505a1f..0000000
--- a/arch/arm/mach-sa1100/leds-lart.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * linux/arch/arm/mach-sa1100/leds-lart.c
- *
- * (C) Erik Mouw (J.A.K.Mouw at its.tudelft.nl), April 21, 2000
- *
- * LART uses the LED as follows:
- * - GPIO23 is the LED, on if system is not idle
- * You can use both CONFIG_LEDS_CPU and CONFIG_LEDS_TIMER at the same
- * time, but in that case the timer events will still dictate the
- * pace of the LED.
- */
-#include <linux/init.h>
-
-#include <mach/hardware.h>
-#include <asm/leds.h>
-#include <asm/system.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_23 GPIO_GPIO23
-#define LED_MASK (LED_23)
-
-void lart_leds_event(led_event_t evt)
-{
- unsigned long flags;
-
- local_irq_save(flags);
-
- switch(evt) {
- case led_start:
- /* pin 23 is output pin */
- GPDR |= LED_23;
- hw_led_state = LED_MASK;
- 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_MASK;
- break;
-
- case led_release:
- led_state &= ~LED_STATE_CLAIMED;
- hw_led_state = LED_MASK;
- break;
-
-#ifdef CONFIG_LEDS_TIMER
- case led_timer:
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state ^= LED_23;
- break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
- case led_idle_start:
- /* The LART people like the LED to be off when the
- system is idle... */
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state &= ~LED_23;
- break;
-
- case led_idle_end:
- /* ... and on if the system is not idle */
- if (!(led_state & LED_STATE_CLAIMED))
- hw_led_state |= LED_23;
- break;
-#endif
-
- case led_red_on:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state &= ~LED_23;
- break;
-
- case led_red_off:
- if (led_state & LED_STATE_CLAIMED)
- hw_led_state |= LED_23;
- break;
-
- default:
- break;
- }
-
- /* Now set the GPIO state, or nothing will happen at all */
- if (led_state & LED_STATE_ENABLED) {
- GPSR = hw_led_state;
- GPCR = hw_led_state ^ LED_MASK;
- }
-
- local_irq_restore(flags);
-}
diff --git a/arch/arm/mach-sa1100/leds-simpad.c b/arch/arm/mach-sa1100/leds-simpad.c
deleted file mode 100644
index d50f4ee..0000000
--- a/arch/arm/mach-sa1100/leds-simpad.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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)
-
-extern void set_cs3_bit(int value);
-extern void clear_cs3_bit(int value);
-
-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)
- set_cs3_bit(LED2_ON);
- else
- clear_cs3_bit(LED2_ON);
-}
-
diff --git a/arch/arm/mach-sa1100/leds.c b/arch/arm/mach-sa1100/leds.c
deleted file mode 100644
index bbfe197..0000000
--- a/arch/arm/mach-sa1100/leds.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * linux/arch/arm/mach-sa1100/leds.c
- *
- * SA1100 LEDs dispatcher
- *
- * Copyright (C) 2001 Nicolas Pitre
- */
-#include <linux/compiler.h>
-#include <linux/init.h>
-
-#include <asm/leds.h>
-#include <asm/mach-types.h>
-
-#include "leds.h"
-
-static int __init
-sa1100_leds_init(void)
-{
- if (machine_is_assabet())
- leds_event = assabet_leds_event;
- if (machine_is_consus())
- leds_event = consus_leds_event;
- if (machine_is_badge4())
- leds_event = badge4_leds_event;
- if (machine_is_brutus())
- leds_event = brutus_leds_event;
- if (machine_is_cerf())
- leds_event = cerf_leds_event;
- if (machine_is_flexanet())
- leds_event = flexanet_leds_event;
- if (machine_is_graphicsclient())
- leds_event = graphicsclient_leds_event;
- if (machine_is_hackkit())
- leds_event = hackkit_leds_event;
- if (machine_is_lart())
- leds_event = lart_leds_event;
- if (machine_is_pfs168())
- leds_event = pfs168_leds_event;
- if (machine_is_graphicsmaster())
- leds_event = graphicsmaster_leds_event;
- if (machine_is_adsbitsy())
- 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;
-}
-
-core_initcall(sa1100_leds_init);
diff --git a/arch/arm/mach-sa1100/leds.h b/arch/arm/mach-sa1100/leds.h
deleted file mode 100644
index 68cc9f7..0000000
--- a/arch/arm/mach-sa1100/leds.h
+++ /dev/null
@@ -1,14 +0,0 @@
-extern void assabet_leds_event(led_event_t evt);
-extern void badge4_leds_event(led_event_t evt);
-extern void consus_leds_event(led_event_t evt);
-extern void brutus_leds_event(led_event_t evt);
-extern void cerf_leds_event(led_event_t evt);
-extern void flexanet_leds_event(led_event_t evt);
-extern void graphicsclient_leds_event(led_event_t evt);
-extern void hackkit_leds_event(led_event_t evt);
-extern void lart_leds_event(led_event_t evt);
-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);
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index cfb7607..6f87258 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -13,6 +13,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/io.h>
+#include <linux/leds.h>
+#include <linux/slab.h>
#include <asm/irq.h>
#include <mach/hardware.h>
@@ -205,7 +207,53 @@ static struct platform_device *devices[] __initdata = {
&simpad_mq200fb
};
+/* LEDs */
+#define LED_GREEN 1
+static void simpad_led_set(struct led_classdev *cdev,
+ enum led_brightness b)
+{
+ if (b != LED_OFF)
+ set_cs3_bit(LED_GREEN);
+ else
+ clear_cs3_bit(LED_GREEN);
+}
+
+static enum led_brightness simpad_led_get(struct led_classdev *cdev)
+{
+ u32 reg = *(CS3BUSTYPE *)(CS3_BASE);
+
+ return (reg & LED_GREEN) ? LED_FULL : LED_OFF;
+}
+
+static int __init simpad_leds_init(void)
+{
+ struct led_classdev *simpad_led;
+ int ret;
+
+ simpad_led = kzalloc(sizeof(*simpad_led), GFP_KERNEL);
+ if (!simpad_led)
+ return -ENOMEM;
+
+ simpad_led->name = "simpad:green";
+ simpad_led->brightness_set = simpad_led_set;
+ simpad_led->brightness_get = simpad_led_get;
+ simpad_led->default_trigger = "heartbeat";
+
+ ret = led_classdev_register(NULL, simpad_led);
+ if (ret < 0) {
+ kfree(simpad_led);
+ return ret;
+ }
+
+ return 0;
+}
+
+/*
+ * Since we may have triggers on any subsystem, defer registration
+ * until after subsystem_init.
+ */
+fs_initcall(simpad_leds_init);
static int __init simpad_init(void)
{
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-06 12:34 ` [PATCH 16/17] mach-sa1100: " Bryan Wu
@ 2011-07-06 14:04 ` Jochen Friedrich
2011-07-07 13:40 ` Bryan Wu
2011-07-10 9:24 ` Russell King - ARM Linux
1 sibling, 1 reply; 66+ messages in thread
From: Jochen Friedrich @ 2011-07-06 14:04 UTC (permalink / raw)
To: linux-arm-kernel
On 06.07.2011 14:34, Bryan Wu wrote:
> diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
> index cfb7607..6f87258 100644
> --- a/arch/arm/mach-sa1100/simpad.c
> +++ b/arch/arm/mach-sa1100/simpad.c
> @@ -13,6 +13,8 @@
> #include<linux/mtd/mtd.h>
> #include<linux/mtd/partitions.h>
> #include<linux/io.h>
> +#include<linux/leds.h>
> +#include<linux/slab.h>
>
> #include<asm/irq.h>
> #include<mach/hardware.h>
> @@ -205,7 +207,53 @@ static struct platform_device *devices[] __initdata = {
> &simpad_mq200fb
> };
>
> +/* LEDs */
> +#define LED_GREEN 1
>
> +static void simpad_led_set(struct led_classdev *cdev,
> + enum led_brightness b)
> +{
> + if (b != LED_OFF)
> + set_cs3_bit(LED_GREEN);
> + else
> + clear_cs3_bit(LED_GREEN);
> +}
> +
> +static enum led_brightness simpad_led_get(struct led_classdev *cdev)
> +{
> + u32 reg = *(CS3BUSTYPE *)(CS3_BASE);
> +
> + return (reg& LED_GREEN) ? LED_FULL : LED_OFF;
> +}
NACK, bit 1 on the CS3 register is PCMCIA power control (write) and
PCMCIA BVD1 (read), but not LED_GREEN. LED2_ON would be correct for
write, but you would need to read cs3_shadow instead of the register
itself for the LED status.
BTW: Some time ago I wrote a similar patch for ARM that converts CS3
functions to GPIOs, wich simplifies the LED stuff even further ;-)
http://www.spinics.net/lists/arm-kernel/msg122479.html
Thanks,
Jochen
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-06 14:04 ` Jochen Friedrich
@ 2011-07-07 13:40 ` Bryan Wu
2011-07-07 16:23 ` Jochen Friedrich
0 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-07 13:40 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 6, 2011 at 10:04 PM, Jochen Friedrich <jochen@scram.de> wrote:
> On 06.07.2011 14:34, Bryan Wu wrote:
>
>> diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
>> index cfb7607..6f87258 100644
>> --- a/arch/arm/mach-sa1100/simpad.c
>> +++ b/arch/arm/mach-sa1100/simpad.c
>> @@ -13,6 +13,8 @@
>> ?#include<linux/mtd/mtd.h>
>> ?#include<linux/mtd/partitions.h>
>> ?#include<linux/io.h>
>> +#include<linux/leds.h>
>> +#include<linux/slab.h>
>>
>> ?#include<asm/irq.h>
>> ?#include<mach/hardware.h>
>> @@ -205,7 +207,53 @@ static struct platform_device *devices[] __initdata =
>> {
>> ? ? ? ?&simpad_mq200fb
>> ?};
>>
>> +/* LEDs */
>> +#define LED_GREEN ? ? ?1
>>
>> +static void simpad_led_set(struct led_classdev *cdev,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? enum led_brightness b)
>> +{
>> + ? ? ? if (b != LED_OFF)
>> + ? ? ? ? ? ? ? set_cs3_bit(LED_GREEN);
>> + ? ? ? else
>> + ? ? ? ? ? ? ? clear_cs3_bit(LED_GREEN);
>> +}
>> +
>> +static enum led_brightness simpad_led_get(struct led_classdev *cdev)
>> +{
>> + ? ? ? u32 reg = *(CS3BUSTYPE *)(CS3_BASE);
>> +
>> + ? ? ? return (reg& ?LED_GREEN) ? LED_FULL : LED_OFF;
>> +}
>
> NACK, bit 1 on the CS3 register is PCMCIA power control (write) and PCMCIA
> BVD1 (read), but not LED_GREEN. LED2_ON would be correct for write, but you
> would need to read cs3_shadow instead of the register itself for the LED
> status.
>
Actually, I'm not familiar with this hardware in details. Thanks for
pointing out.
> BTW: Some time ago I wrote a similar patch for ARM that converts CS3
> functions to GPIOs, wich simplifies the LED stuff even further ;-)
>
> http://www.spinics.net/lists/arm-kernel/msg122479.html
>
This looks good and it's the right way to do that. We need gpiolib
supporting firstly. How's status of your patchset, I guess you're
trying to update it.
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-07 13:40 ` Bryan Wu
@ 2011-07-07 16:23 ` Jochen Friedrich
2011-07-08 3:00 ` Bryan Wu
0 siblings, 1 reply; 66+ messages in thread
From: Jochen Friedrich @ 2011-07-07 16:23 UTC (permalink / raw)
To: linux-arm-kernel
Hi Bryan,
> This looks good and it's the right way to do that. We need gpiolib
> supporting firstly. How's status of your patchset, I guess you're
> trying to update it.
I've resubmitted it yesterday for another review. In parallel, I'll
retest this on top of 3.0-rc5 on real hardware and ask Russell if it's
OK to submit to his patch tracker.
Thanks,
Jochen
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-07 16:23 ` Jochen Friedrich
@ 2011-07-08 3:00 ` Bryan Wu
2011-07-08 16:10 ` Jochen Friedrich
0 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-08 3:00 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 8, 2011 at 12:23 AM, Jochen Friedrich <jochen@scram.de> wrote:
> Hi Bryan,
>
>> This looks good and it's the right way to do that. We need gpiolib
>> supporting firstly. How's status of your patchset, I guess you're
>> trying to update it.
>
> I've resubmitted it yesterday for another review. In parallel, I'll retest
> this on top of 3.0-rc5 on real hardware and ask Russell if it's OK to submit
> to his patch tracker.
>
Great, I will remove my modification of simpad code in my patchset.
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-08 3:00 ` Bryan Wu
@ 2011-07-08 16:10 ` Jochen Friedrich
2011-07-08 17:07 ` Russell King - ARM Linux
0 siblings, 1 reply; 66+ messages in thread
From: Jochen Friedrich @ 2011-07-08 16:10 UTC (permalink / raw)
To: linux-arm-kernel
Hi Bryan,
>> I've resubmitted it yesterday for another review. In parallel, I'll retest
>> this on top of 3.0-rc5 on real hardware and ask Russell if it's OK to submit
>> to his patch tracker.
after fixing ARMv4 support for EABI in OpenWRT once again ;-), I just
successfully retested the patchset on my CL4 SIMpad.
@Russell: is it OK to submit this to the patch tracking system?
> Great, I will remove my modification of simpad code in my patchset.
Thanks,
Jochen
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-08 16:10 ` Jochen Friedrich
@ 2011-07-08 17:07 ` Russell King - ARM Linux
0 siblings, 0 replies; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-08 17:07 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jul 08, 2011 at 06:10:10PM +0200, Jochen Friedrich wrote:
> @Russell: is it OK to submit this to the patch tracking system?
I can't say at the moment as I'm swamped with email. I was already
swamped this morning, but since then some nice person at develtech.com
has misconfigured their M$ Exchange server which has been dumping emails
from the last six months back in my mailbox. The problem is that I've
been out this afternoon and so wasn't around to notice.
I've had to firewall their ISPs mail servers from my system to stop
the deluge, which I think may have also cut at least Wim Van Sebroeck
off.
Nevertheless, the result isn't pretty at this end (so far spent an
hour on it sorting out the mess), and its only luck that I happened
to spot your message.
This is one of the times when I wish M$ didn't make stuff "easy to
use" - the person running that system probably doesn't even realize
what they've done. Computers are dangerous tools in the hands of
people who don't really understand what they're doing.
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-06 12:34 ` [PATCH 16/17] mach-sa1100: " Bryan Wu
2011-07-06 14:04 ` Jochen Friedrich
@ 2011-07-10 9:24 ` Russell King - ARM Linux
2011-07-11 8:28 ` Jochen Friedrich
2011-07-11 14:36 ` Bryan Wu
1 sibling, 2 replies; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-10 9:24 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 06, 2011 at 08:34:46PM +0800, Bryan Wu wrote:
> diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
> index 5778274..13e4e5d 100644
> --- a/arch/arm/mach-sa1100/assabet.c
> +++ b/arch/arm/mach-sa1100/assabet.c
> @@ -19,6 +19,8 @@
> #include <linux/mtd/partitions.h>
> #include <linux/delay.h>
> #include <linux/mm.h>
> +#include <linux/leds.h>
> +#include <linux/slab.h>
>
> #include <mach/hardware.h>
> #include <asm/mach-types.h>
> @@ -445,6 +447,79 @@ static void __init assabet_map_io(void)
> sa1100_register_uart(2, 3);
> }
>
> +/* LEDs */
> +struct assabet_led {
> + struct led_classdev cdev;
> + u32 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;
> +} assabet_leds[] = {
> + { "assabet:red", "cpu",},
> + { "assabet:green", "heartbeat", },
> +};
> +
> +static void assabet_led_set(struct led_classdev *cdev,
> + enum led_brightness b)
> +{
> + struct assabet_led *led = container_of(cdev,
> + struct assabet_led, cdev);
> +
> + if (b != LED_OFF)
> + ASSABET_BCR_clear(led->mask);
> + else
> + ASSABET_BCR_set(led->mask);
> +}
> +
> +static enum led_brightness assabet_led_get(struct led_classdev *cdev)
> +{
> + struct assabet_led *led = container_of(cdev,
> + struct assabet_led, cdev);
> +
> + return (ASSABET_BCR & led->mask) ? LED_OFF : LED_FULL;
> +}
> +
> +static int __init assabet_leds_init(void)
> +{
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(assabet_leds); i++) {
> + struct assabet_led *led;
> +
> + led = kzalloc(sizeof(*led), GFP_KERNEL);
> + if (!led)
> + break;
> +
> + led->cdev.name = assabet_leds[i].name;
> + led->cdev.brightness_set = assabet_led_set;
> + led->cdev.brightness_get = assabet_led_get;
> + led->cdev.default_trigger = assabet_leds[i].trigger;
> +
> + if (!i)
> + led->mask = ASSABET_BCR_LED_RED;
> + else
> + led->mask = ASSABET_BCR_LED_GREEN;
> +
> + 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(assabet_leds_init);
This is buggy. init functions are called irrespective of what platform
we're running on, so this means if assabet is built in to the kernel,
then we'll register its LEDs and try to access the BCR register
irrespective of whether we are on assabet or not.
> diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
> index cfb7607..6f87258 100644
> --- a/arch/arm/mach-sa1100/simpad.c
> +++ b/arch/arm/mach-sa1100/simpad.c
> @@ -13,6 +13,8 @@
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/partitions.h>
> #include <linux/io.h>
> +#include <linux/leds.h>
> +#include <linux/slab.h>
>
> #include <asm/irq.h>
> #include <mach/hardware.h>
> @@ -205,7 +207,53 @@ static struct platform_device *devices[] __initdata = {
> &simpad_mq200fb
> };
>
> +/* LEDs */
> +#define LED_GREEN 1
>
> +static void simpad_led_set(struct led_classdev *cdev,
> + enum led_brightness b)
> +{
> + if (b != LED_OFF)
> + set_cs3_bit(LED_GREEN);
> + else
> + clear_cs3_bit(LED_GREEN);
> +}
> +
> +static enum led_brightness simpad_led_get(struct led_classdev *cdev)
> +{
> + u32 reg = *(CS3BUSTYPE *)(CS3_BASE);
> +
> + return (reg & LED_GREEN) ? LED_FULL : LED_OFF;
> +}
> +
> +static int __init simpad_leds_init(void)
> +{
> + struct led_classdev *simpad_led;
> + int ret;
> +
> + simpad_led = kzalloc(sizeof(*simpad_led), GFP_KERNEL);
> + if (!simpad_led)
> + return -ENOMEM;
> +
> + simpad_led->name = "simpad:green";
> + simpad_led->brightness_set = simpad_led_set;
> + simpad_led->brightness_get = simpad_led_get;
> + simpad_led->default_trigger = "heartbeat";
> +
> + ret = led_classdev_register(NULL, simpad_led);
> + if (ret < 0) {
> + kfree(simpad_led);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +/*
> + * Since we may have triggers on any subsystem, defer registration
> + * until after subsystem_init.
> + */
> +fs_initcall(simpad_leds_init);
Looks like simpad is similarly afflicted. I haven't gone through the
rest to check for similar issues.
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-10 9:24 ` Russell King - ARM Linux
@ 2011-07-11 8:28 ` Jochen Friedrich
2011-07-11 14:38 ` Bryan Wu
2011-07-11 14:36 ` Bryan Wu
1 sibling, 1 reply; 66+ messages in thread
From: Jochen Friedrich @ 2011-07-11 8:28 UTC (permalink / raw)
To: linux-arm-kernel
Hi Russell,
>> +fs_initcall(simpad_leds_init);
>
> Looks like simpad is similarly afflicted. I haven't gone through the
> rest to check for similar issues.
simpad is buggy in other means, as well (wrong bit, read of write-only
register, missing locking). That's why I want to push my CS3 cleanup
patch first, converting a custom IO to standard GPIO ;-)
Thanks,
Jochen
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-11 8:28 ` Jochen Friedrich
@ 2011-07-11 14:38 ` Bryan Wu
0 siblings, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-11 14:38 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 11, 2011 at 4:28 PM, Jochen Friedrich <jochen@scram.de> wrote:
> Hi Russell,
>
>>> +fs_initcall(simpad_leds_init);
>>
>> Looks like simpad is similarly afflicted. ?I haven't gone through the
>> rest to check for similar issues.
>
> simpad is buggy in other means, as well (wrong bit, read of write-only
> register, missing locking). That's why I want to push my CS3 cleanup patch
> first, converting a custom IO to standard GPIO ;-)
>
if you can use this GPIO based gpio_led driver, there is not such
fs_initcall issue.
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-10 9:24 ` Russell King - ARM Linux
2011-07-11 8:28 ` Jochen Friedrich
@ 2011-07-11 14:36 ` Bryan Wu
2011-07-11 21:09 ` Russell King - ARM Linux
1 sibling, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-11 14:36 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 10, 2011 at 5:24 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Jul 06, 2011 at 08:34:46PM +0800, Bryan Wu wrote:
>> diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
>> index 5778274..13e4e5d 100644
>> --- a/arch/arm/mach-sa1100/assabet.c
>> +++ b/arch/arm/mach-sa1100/assabet.c
>> @@ -19,6 +19,8 @@
>> ?#include <linux/mtd/partitions.h>
>> ?#include <linux/delay.h>
>> ?#include <linux/mm.h>
>> +#include <linux/leds.h>
>> +#include <linux/slab.h>
>>
>> ?#include <mach/hardware.h>
>> ?#include <asm/mach-types.h>
>> @@ -445,6 +447,79 @@ static void __init assabet_map_io(void)
>> ? ? ? sa1100_register_uart(2, 3);
>> ?}
>>
>> +/* LEDs */
>> +struct assabet_led {
>> + ? ? struct led_classdev cdev;
>> + ? ? u32 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;
>> +} assabet_leds[] = {
>> + ? ? { "assabet:red", "cpu",},
>> + ? ? { "assabet:green", "heartbeat", },
>> +};
>> +
>> +static void assabet_led_set(struct led_classdev *cdev,
>> + ? ? ? ? ? ? enum led_brightness b)
>> +{
>> + ? ? struct assabet_led *led = container_of(cdev,
>> + ? ? ? ? ? ? ? ? ? ? struct assabet_led, cdev);
>> +
>> + ? ? if (b != LED_OFF)
>> + ? ? ? ? ? ? ASSABET_BCR_clear(led->mask);
>> + ? ? else
>> + ? ? ? ? ? ? ASSABET_BCR_set(led->mask);
>> +}
>> +
>> +static enum led_brightness assabet_led_get(struct led_classdev *cdev)
>> +{
>> + ? ? struct assabet_led *led = container_of(cdev,
>> + ? ? ? ? ? ? ? ? ? ? struct assabet_led, cdev);
>> +
>> + ? ? return (ASSABET_BCR & led->mask) ? LED_OFF : LED_FULL;
>> +}
>> +
>> +static int __init assabet_leds_init(void)
>> +{
>> + ? ? int i;
>> +
>> + ? ? for (i = 0; i < ARRAY_SIZE(assabet_leds); i++) {
>> + ? ? ? ? ? ? struct assabet_led *led;
>> +
>> + ? ? ? ? ? ? led = kzalloc(sizeof(*led), GFP_KERNEL);
>> + ? ? ? ? ? ? if (!led)
>> + ? ? ? ? ? ? ? ? ? ? break;
>> +
>> + ? ? ? ? ? ? led->cdev.name = assabet_leds[i].name;
>> + ? ? ? ? ? ? led->cdev.brightness_set = assabet_led_set;
>> + ? ? ? ? ? ? led->cdev.brightness_get = assabet_led_get;
>> + ? ? ? ? ? ? led->cdev.default_trigger = assabet_leds[i].trigger;
>> +
>> + ? ? ? ? ? ? if (!i)
>> + ? ? ? ? ? ? ? ? ? ? led->mask = ASSABET_BCR_LED_RED;
>> + ? ? ? ? ? ? else
>> + ? ? ? ? ? ? ? ? ? ? led->mask = ASSABET_BCR_LED_GREEN;
>> +
>> + ? ? ? ? ? ? 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(assabet_leds_init);
>
> This is buggy. ?init functions are called irrespective of what platform
> we're running on, so this means if assabet is built in to the kernel,
> then we'll register its LEDs and try to access the BCR register
> irrespective of whether we are on assabet or not.
>
Right, I got it. So if we are going to run a single binary for all the
sa1100 machines, how about we check the machine in each fs_initcall
static int __init assabet_leds_init(void)
{
? ? int i;
if (!machine_is_assabet())
return -ENODEV,
? ? for (i = 0; i < ARRAY_SIZE(assabet_leds); i++) {
? ? ? ? ? ? struct assabet_led *led;
Thanks,
>> diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
>> index cfb7607..6f87258 100644
>> --- a/arch/arm/mach-sa1100/simpad.c
>> +++ b/arch/arm/mach-sa1100/simpad.c
>> @@ -13,6 +13,8 @@
>> ?#include <linux/mtd/mtd.h>
>> ?#include <linux/mtd/partitions.h>
>> ?#include <linux/io.h>
>> +#include <linux/leds.h>
>> +#include <linux/slab.h>
>>
>> ?#include <asm/irq.h>
>> ?#include <mach/hardware.h>
>> @@ -205,7 +207,53 @@ static struct platform_device *devices[] __initdata = {
>> ? ? ? &simpad_mq200fb
>> ?};
>>
>> +/* LEDs */
>> +#define LED_GREEN ? ?1
>>
>> +static void simpad_led_set(struct led_classdev *cdev,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? enum led_brightness b)
>> +{
>> + ? ? if (b != LED_OFF)
>> + ? ? ? ? ? ? set_cs3_bit(LED_GREEN);
>> + ? ? else
>> + ? ? ? ? ? ? clear_cs3_bit(LED_GREEN);
>> +}
>> +
>> +static enum led_brightness simpad_led_get(struct led_classdev *cdev)
>> +{
>> + ? ? u32 reg = *(CS3BUSTYPE *)(CS3_BASE);
>> +
>> + ? ? return (reg & LED_GREEN) ? LED_FULL : LED_OFF;
>> +}
>> +
>> +static int __init simpad_leds_init(void)
>> +{
>> + ? ? struct led_classdev *simpad_led;
>> + ? ? int ret;
>> +
>> + ? ? simpad_led = kzalloc(sizeof(*simpad_led), GFP_KERNEL);
>> + ? ? if (!simpad_led)
>> + ? ? ? ? ? ? return -ENOMEM;
>> +
>> + ? ? simpad_led->name = "simpad:green";
>> + ? ? simpad_led->brightness_set = simpad_led_set;
>> + ? ? simpad_led->brightness_get = simpad_led_get;
>> + ? ? simpad_led->default_trigger = "heartbeat";
>> +
>> + ? ? ret = led_classdev_register(NULL, simpad_led);
>> + ? ? if (ret < 0) {
>> + ? ? ? ? ? ? kfree(simpad_led);
>> + ? ? ? ? ? ? return ret;
>> + ? ? }
>> +
>> + ? ? return 0;
>> +}
>> +
>> +/*
>> + * Since we may have triggers on any subsystem, defer registration
>> + * until after subsystem_init.
>> + */
>> +fs_initcall(simpad_leds_init);
>
> Looks like simpad is similarly afflicted. ?I haven't gone through the
> rest to check for similar issues.
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-11 14:36 ` Bryan Wu
@ 2011-07-11 21:09 ` Russell King - ARM Linux
2011-07-11 21:52 ` Arnd Bergmann
0 siblings, 1 reply; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-11 21:09 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 11, 2011 at 10:36:49PM +0800, Bryan Wu wrote:
> Right, I got it. So if we are going to run a single binary for all the
> sa1100 machines, how about we check the machine in each fs_initcall
>
> static int __init assabet_leds_init(void)
> {
> ? ? int i;
>
> if (!machine_is_assabet())
> return -ENODEV,
>
> ? ? for (i = 0; i < ARRAY_SIZE(assabet_leds); i++) {
> ? ? ? ? ? ? struct assabet_led *led;
Yes, that'll do, thanks.
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-11 21:09 ` Russell King - ARM Linux
@ 2011-07-11 21:52 ` Arnd Bergmann
2011-07-12 0:31 ` Bryan Wu
0 siblings, 1 reply; 66+ messages in thread
From: Arnd Bergmann @ 2011-07-11 21:52 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 11 July 2011, Russell King - ARM Linux wrote:
> On Mon, Jul 11, 2011 at 10:36:49PM +0800, Bryan Wu wrote:
> > Right, I got it. So if we are going to run a single binary for all the
> > sa1100 machines, how about we check the machine in each fs_initcall
> >
> > static int __init assabet_leds_init(void)
> > {
> > int i;
> >
> > if (!machine_is_assabet())
> > return -ENODEV,
> >
> > for (i = 0; i < ARRAY_SIZE(assabet_leds); i++) {
> > struct assabet_led *led;
>
> Yes, that'll do, thanks.
>
Do you think it's worth copying the logic from powerpc for this?
arch/powerpc/include/asm/machdep.h:
#define __define_machine_initcall(mach,level,fn,id) \
static int __init __machine_initcall_##mach##_##fn(void) { \
if (machine_is(mach)) return fn(); \
return 0; \
} \
__define_initcall(level,__machine_initcall_##mach##_##fn,id);
#define machine_core_initcall(mach,fn) __define_machine_initcall(mach,"1",fn,1)
#define machine_core_initcall_sync(mach,fn) __define_machine_initcall(mach,"1s",fn,1s)
#define machine_postcore_initcall(mach,fn) __define_machine_initcall(mach,"2",fn,2)
#define machine_postcore_initcall_sync(mach,fn) __define_machine_initcall(mach,"2s",fn,2s)
#define machine_arch_initcall(mach,fn) __define_machine_initcall(mach,"3",fn,3)
#define machine_arch_initcall_sync(mach,fn) __define_machine_initcall(mach,"3s",fn,3s)
#define machine_subsys_initcall(mach,fn) __define_machine_initcall(mach,"4",fn,4)
#define machine_subsys_initcall_sync(mach,fn) __define_machine_initcall(mach,"4s",fn,4s)
#define machine_fs_initcall(mach,fn) __define_machine_initcall(mach,"5",fn,5)
#define machine_fs_initcall_sync(mach,fn) __define_machine_initcall(mach,"5s",fn,5s)
#define machine_rootfs_initcall(mach,fn) __define_machine_initcall(mach,"rootfs",fn,rootfs)
#define machine_device_initcall(mach,fn) __define_machine_initcall(mach,"6",fn,6)
#define machine_device_initcall_sync(mach,fn) __define_machine_initcall(mach,"6s",fn,6s)
#define machine_late_initcall(mach,fn) __define_machine_initcall(mach,"7",fn,7)
#define machine_late_initcall_sync(mach,fn) __define_machine_initcall(mach,"7s",fn,7s)
I don't really like the magic macros, but my feeling is that it's easier
to do the conversion without introducing subtle bugs this way.
Arnd
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-11 21:52 ` Arnd Bergmann
@ 2011-07-12 0:31 ` Bryan Wu
2011-07-12 7:30 ` Russell King - ARM Linux
0 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-12 0:31 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 12, 2011 at 5:52 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Monday 11 July 2011, Russell King - ARM Linux wrote:
>> On Mon, Jul 11, 2011 at 10:36:49PM +0800, Bryan Wu wrote:
>> > Right, I got it. So if we are going to run a single binary for all the
>> > sa1100 machines, how about we check the machine in each fs_initcall
>> >
>> > static int __init assabet_leds_init(void)
>> > {
>> > ? ? ?int i;
>> >
>> > ? ? ?if (!machine_is_assabet())
>> > ? ? ? ? ? return -ENODEV,
>> >
>> > ? ? ?for (i = 0; i < ARRAY_SIZE(assabet_leds); i++) {
>> > ? ? ? ? ? ? ?struct assabet_led *led;
>>
>> Yes, that'll do, thanks.
>>
>
> Do you think it's worth copying the logic from powerpc for this?
>
>
> arch/powerpc/include/asm/machdep.h:
> #define __define_machine_initcall(mach,level,fn,id) \
> ? ? ? ?static int __init __machine_initcall_##mach##_##fn(void) { \
> ? ? ? ? ? ? ? ?if (machine_is(mach)) return fn(); \
> ? ? ? ? ? ? ? ?return 0; \
> ? ? ? ?} \
> ? ? ? ?__define_initcall(level,__machine_initcall_##mach##_##fn,id);
> #define machine_core_initcall(mach,fn) ? ? ? ? ?__define_machine_initcall(mach,"1",fn,1)
> #define machine_core_initcall_sync(mach,fn) ? ? __define_machine_initcall(mach,"1s",fn,1s)
> #define machine_postcore_initcall(mach,fn) ? ? ?__define_machine_initcall(mach,"2",fn,2)
> #define machine_postcore_initcall_sync(mach,fn) __define_machine_initcall(mach,"2s",fn,2s)
> #define machine_arch_initcall(mach,fn) ? ? ? ? ?__define_machine_initcall(mach,"3",fn,3)
> #define machine_arch_initcall_sync(mach,fn) ? ? __define_machine_initcall(mach,"3s",fn,3s)
> #define machine_subsys_initcall(mach,fn) ? ? ? ?__define_machine_initcall(mach,"4",fn,4)
> #define machine_subsys_initcall_sync(mach,fn) ? __define_machine_initcall(mach,"4s",fn,4s)
> #define machine_fs_initcall(mach,fn) ? ? ? ? ? ?__define_machine_initcall(mach,"5",fn,5)
> #define machine_fs_initcall_sync(mach,fn) ? ? ? __define_machine_initcall(mach,"5s",fn,5s)
> #define machine_rootfs_initcall(mach,fn) ? ? ? ?__define_machine_initcall(mach,"rootfs",fn,rootfs)
> #define machine_device_initcall(mach,fn) ? ? ? ?__define_machine_initcall(mach,"6",fn,6)
> #define machine_device_initcall_sync(mach,fn) ? __define_machine_initcall(mach,"6s",fn,6s)
> #define machine_late_initcall(mach,fn) ? ? ? ? ?__define_machine_initcall(mach,"7",fn,7)
> #define machine_late_initcall_sync(mach,fn) ? ? __define_machine_initcall(mach,"7s",fn,7s)
>
> I don't really like the magic macros, but my feeling is that it's easier
> to do the conversion without introducing subtle bugs this way.
>
I think this is a great idea. what about moving it to include/asm-generic/
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-12 0:31 ` Bryan Wu
@ 2011-07-12 7:30 ` Russell King - ARM Linux
2011-07-12 12:52 ` Arnd Bergmann
0 siblings, 1 reply; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-12 7:30 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 12, 2011 at 08:31:28AM +0800, Bryan Wu wrote:
> I think this is a great idea. what about moving it to include/asm-generic/
Except, instead of:
if (machine_is(mach)) return fn(); \
we'd need:
if (machine_is_##mach()) return fn(); \
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 16/17] mach-sa1100: retire custom LED code
2011-07-12 7:30 ` Russell King - ARM Linux
@ 2011-07-12 12:52 ` Arnd Bergmann
0 siblings, 0 replies; 66+ messages in thread
From: Arnd Bergmann @ 2011-07-12 12:52 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 12 July 2011, Russell King - ARM Linux wrote:
> On Tue, Jul 12, 2011 at 08:31:28AM +0800, Bryan Wu wrote:
> > I think this is a great idea. what about moving it to include/asm-generic/
I wouldn't want to encourage new architectures to actually use this method
until they grow to need it. For most simple architectures, it's probably
better to have a different method of doing machine specific work.
> Except, instead of:
>
> if (machine_is(mach)) return fn(); \
>
> we'd need:
>
> if (machine_is_##mach()) return fn(); \
Right. Maybe we can start simple and just do a single definition at fs_initcall level:
#define machine_initcall(mach,level,fn) \
static int __init __machine_initcall_##mach##_##fn(void) { \
if (machine_is ## mach()) return fn(); \
return 0; \
} \
fs_initcall(,__machine_initcall_##mach##_##fn);
Arnd
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 17/17] ARM: use new LEDS CPU trigger stub to replace old one
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (15 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 16/17] mach-sa1100: " Bryan Wu
@ 2011-07-06 12:34 ` Bryan Wu
2011-07-06 14:26 ` Arnd Bergmann
2011-07-06 13:13 ` [PATCH 00/17] Introduce a led trigger for CPU activity Eric Miao
17 siblings, 1 reply; 66+ messages in thread
From: Bryan Wu @ 2011-07-06 12:34 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/Kconfig | 53 -------------------
arch/arm/include/asm/leds.h | 50 ------------------
arch/arm/kernel/Makefile | 1 -
arch/arm/kernel/leds.c | 119 -------------------------------------------
arch/arm/kernel/process.c | 6 +-
arch/arm/kernel/time.c | 17 ------
6 files changed, 3 insertions(+), 243 deletions(-)
delete mode 100644 arch/arm/include/asm/leds.h
delete mode 100644 arch/arm/kernel/leds.c
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2a37079..7b9b88e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1572,59 +1572,6 @@ config FORCE_MAX_ZONEORDER
This config option is actually maximum order plus one. For example,
a value of 11 means that the largest free memory block is 2^10 pages.
-config LEDS
- bool "Timer and CPU usage LEDs"
- depends on ARCH_CDB89712 || ARCH_EBSA110 || \
- ARCH_EBSA285 || ARCH_INTEGRATOR || \
- ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
- ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
- ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
- ARCH_AT91 || ARCH_DAVINCI || \
- ARCH_KS8695 || MACH_RD88F5182 || ARCH_REALVIEW
- help
- If you say Y here, the LEDs on your machine will be used
- to provide useful information about your current system status.
-
- If you are compiling a kernel for a NetWinder or EBSA-285, you will
- be able to select which LEDs are active using the options below. If
- you are compiling a kernel for the EBSA-110 or the LART however, the
- red LED will simply flash regularly to indicate that the system is
- still functional. It is safe to say Y here if you have a CATS
- system, but the driver will do nothing.
-
-config LEDS_TIMER
- bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) || \
- OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
- || MACH_OMAP_PERSEUS2
- depends on LEDS
- depends on !GENERIC_CLOCKEVENTS
- default y if ARCH_EBSA110
- help
- If you say Y here, one of the system LEDs (the green one on the
- NetWinder, the amber one on the EBSA285, or the red one on the LART)
- will flash regularly to indicate that the system is still
- operational. This is mainly useful to kernel hackers who are
- debugging unstable kernels.
-
- The LART uses the same LED for both Timer LED and CPU usage LED
- functions. You may choose to use both, but the Timer LED function
- will overrule the CPU usage LED.
-
-config LEDS_CPU
- bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
- !ARCH_OMAP) \
- || OMAP_OSK_MISTRAL || MACH_OMAP_H2 \
- || MACH_OMAP_PERSEUS2
- depends on LEDS
- help
- If you say Y here, the red LED will be used to give a good real
- time indication of CPU usage, by lighting whenever the idle task
- is not currently executing.
-
- The LART uses the same LED for both Timer LED and CPU usage LED
- functions. You may choose to use both, but the Timer LED function
- will overrule the CPU usage LED.
-
config ALIGNMENT_TRAP
bool
depends on CPU_CP15_MMU
diff --git a/arch/arm/include/asm/leds.h b/arch/arm/include/asm/leds.h
deleted file mode 100644
index c545739..0000000
--- a/arch/arm/include/asm/leds.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * arch/arm/include/asm/leds.h
- *
- * Copyright (C) 1998 Russell King
- *
- * 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.
- *
- * Event-driven interface for LEDs on machines
- * Added led_start and led_stop- Alex Holden, 28th Dec 1998.
- */
-#ifndef ASM_ARM_LEDS_H
-#define ASM_ARM_LEDS_H
-
-
-typedef enum {
- led_idle_start,
- led_idle_end,
- led_timer,
- led_start,
- led_stop,
- led_claim, /* override idle & timer leds */
- led_release, /* restore idle & timer leds */
- led_start_timer_mode,
- led_stop_timer_mode,
- led_green_on,
- led_green_off,
- led_amber_on,
- led_amber_off,
- led_red_on,
- led_red_off,
- led_blue_on,
- led_blue_off,
- /*
- * I want this between led_timer and led_start, but
- * someone has decided to export this to user space
- */
- led_halted
-} led_event_t;
-
-/* Use this routine to handle LEDs */
-
-#ifdef CONFIG_LEDS
-extern void (*leds_event)(led_event_t);
-#else
-#define leds_event(e)
-#endif
-
-#endif
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index a5b31af..5ef0051 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -19,7 +19,6 @@ obj-y := elf.o entry-armv.o entry-common.o irq.o \
obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += compat.o
-obj-$(CONFIG_LEDS) += leds.o
obj-$(CONFIG_OC_ETM) += etm.o
obj-$(CONFIG_ISA_DMA_API) += dma.o
diff --git a/arch/arm/kernel/leds.c b/arch/arm/kernel/leds.c
deleted file mode 100644
index 0f107dc..0000000
--- a/arch/arm/kernel/leds.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * LED support code, ripped out of arch/arm/kernel/time.c
- *
- * Copyright (C) 1994-2001 Russell King
- *
- * 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/module.h>
-#include <linux/init.h>
-#include <linux/sysdev.h>
-#include <linux/syscore_ops.h>
-
-#include <asm/leds.h>
-
-static void dummy_leds_event(led_event_t evt)
-{
-}
-
-void (*leds_event)(led_event_t) = dummy_leds_event;
-
-struct leds_evt_name {
- const char name[8];
- int on;
- int off;
-};
-
-static const struct leds_evt_name evt_names[] = {
- { "amber", led_amber_on, led_amber_off },
- { "blue", led_blue_on, led_blue_off },
- { "green", led_green_on, led_green_off },
- { "red", led_red_on, led_red_off },
-};
-
-static ssize_t leds_store(struct sys_device *dev,
- struct sysdev_attribute *attr,
- const char *buf, size_t size)
-{
- int ret = -EINVAL, len = strcspn(buf, " ");
-
- if (len > 0 && buf[len] == '\0')
- len--;
-
- if (strncmp(buf, "claim", len) == 0) {
- leds_event(led_claim);
- ret = size;
- } else if (strncmp(buf, "release", len) == 0) {
- leds_event(led_release);
- ret = size;
- } else {
- int i;
-
- for (i = 0; i < ARRAY_SIZE(evt_names); i++) {
- if (strlen(evt_names[i].name) != len ||
- strncmp(buf, evt_names[i].name, len) != 0)
- continue;
- if (strncmp(buf+len, " on", 3) == 0) {
- leds_event(evt_names[i].on);
- ret = size;
- } else if (strncmp(buf+len, " off", 4) == 0) {
- leds_event(evt_names[i].off);
- ret = size;
- }
- break;
- }
- }
- return ret;
-}
-
-static SYSDEV_ATTR(event, 0200, NULL, leds_store);
-
-static struct sysdev_class leds_sysclass = {
- .name = "leds",
-};
-
-static struct sys_device leds_device = {
- .id = 0,
- .cls = &leds_sysclass,
-};
-
-static int leds_suspend(void)
-{
- leds_event(led_stop);
- return 0;
-}
-
-static void leds_resume(void)
-{
- leds_event(led_start);
-}
-
-static void leds_shutdown(void)
-{
- leds_event(led_halted);
-}
-
-static struct syscore_ops leds_syscore_ops = {
- .shutdown = leds_shutdown,
- .suspend = leds_suspend,
- .resume = leds_resume,
-};
-
-static int __init leds_init(void)
-{
- int ret;
- ret = sysdev_class_register(&leds_sysclass);
- if (ret == 0)
- ret = sysdev_register(&leds_device);
- if (ret == 0)
- ret = sysdev_create_file(&leds_device, &attr_event);
- if (ret == 0)
- register_syscore_ops(&leds_syscore_ops);
- return ret;
-}
-
-device_initcall(leds_init);
-
-EXPORT_SYMBOL(leds_event);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 5e1e541..d3b70cc 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -30,9 +30,9 @@
#include <linux/uaccess.h>
#include <linux/random.h>
#include <linux/hw_breakpoint.h>
+#include <linux/leds.h>
#include <asm/cacheflush.h>
-#include <asm/leds.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/thread_notify.h>
@@ -183,7 +183,7 @@ void cpu_idle(void)
/* endless idle loop with no priority at all */
while (1) {
tick_nohz_stop_sched_tick(1);
- leds_event(led_idle_start);
+ ledtrig_cpu(CPU_LED_IDLE_START);
while (!need_resched()) {
#ifdef CONFIG_HOTPLUG_CPU
if (cpu_is_offline(smp_processor_id()))
@@ -207,7 +207,7 @@ void cpu_idle(void)
local_irq_enable();
}
}
- leds_event(led_idle_end);
+ ledtrig_cpu(CPU_LED_IDLE_END);
tick_nohz_restart_sched_tick();
preempt_enable_no_resched();
schedule();
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index cb634c3..a2a0c88 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -27,7 +27,6 @@
#include <linux/mc146818rtc.h>
-#include <asm/leds.h>
#include <asm/thread_info.h>
#include <asm/sched_clock.h>
#include <asm/stacktrace.h>
@@ -84,21 +83,6 @@ u32 arch_gettimeoffset(void)
}
#endif /* CONFIG_ARCH_USES_GETTIMEOFFSET */
-#ifdef CONFIG_LEDS_TIMER
-static inline void do_leds(void)
-{
- static unsigned int count = HZ/2;
-
- if (--count == 0) {
- count = HZ/2;
- leds_event(led_timer);
- }
-}
-#else
-#define do_leds()
-#endif
-
-
#ifndef CONFIG_GENERIC_CLOCKEVENTS
/*
* Kernel system timer support.
@@ -106,7 +90,6 @@ static inline void do_leds(void)
void timer_tick(void)
{
profile_tick(CPU_PROFILING);
- do_leds();
xtime_update(1);
#ifndef CONFIG_SMP
update_process_times(user_mode(get_irq_regs()));
--
1.7.5
^ permalink raw reply related [flat|nested] 66+ messages in thread* [PATCH 17/17] ARM: use new LEDS CPU trigger stub to replace old one
2011-07-06 12:34 ` [PATCH 17/17] ARM: use new LEDS CPU trigger stub to replace old one Bryan Wu
@ 2011-07-06 14:26 ` Arnd Bergmann
0 siblings, 0 replies; 66+ messages in thread
From: Arnd Bergmann @ 2011-07-06 14:26 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 06 July 2011, Bryan Wu wrote:
>
> #include <asm/cacheflush.h>
> -#include <asm/leds.h>
> #include <asm/processor.h>
> #include <asm/system.h>
> #include <asm/thread_notify.h>
> @@ -183,7 +183,7 @@ void cpu_idle(void)
> /* endless idle loop with no priority at all */
> while (1) {
> tick_nohz_stop_sched_tick(1);
> - leds_event(led_idle_start);
> + ledtrig_cpu(CPU_LED_IDLE_START);
> while (!need_resched()) {
> #ifdef CONFIG_HOTPLUG_CPU
> if (cpu_is_offline(smp_processor_id()))
> @@ -207,7 +207,7 @@ void cpu_idle(void)
> local_irq_enable();
> }
> }
> - leds_event(led_idle_end);
> + ledtrig_cpu(CPU_LED_IDLE_END);
> tick_nohz_restart_sched_tick();
> preempt_enable_no_resched();
> schedule();
Nevermind my previous comment about the place where this is used. I've found it now ;-)
Arnd
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 00/17] Introduce a led trigger for CPU activity
2011-07-06 12:34 [PATCH 00/17] Introduce a led trigger for CPU activity Bryan Wu
` (16 preceding siblings ...)
2011-07-06 12:34 ` [PATCH 17/17] ARM: use new LEDS CPU trigger stub to replace old one Bryan Wu
@ 2011-07-06 13:13 ` Eric Miao
2011-07-06 13:16 ` Russell King - ARM Linux
17 siblings, 1 reply; 66+ messages in thread
From: Eric Miao @ 2011-07-06 13:13 UTC (permalink / raw)
To: linux-arm-kernel
> ?drivers/leds/ledtrig-cpu.c ? ? ? ? ? ? ? ? ? ? | ?144 ++++++++++++
> ?include/linux/leds.h ? ? ? ? ? ? ? ? ? ? ? ? ? | ? 15 ++
> ?105 files changed, 1532 insertions(+), 3119 deletions(-)
Not bad, I like the numbers here. This is definitely a good move.
I had long ago wanted to remove those legacy LED code in mach-pxa.
Thanks Bryan.
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 00/17] Introduce a led trigger for CPU activity
2011-07-06 13:13 ` [PATCH 00/17] Introduce a led trigger for CPU activity Eric Miao
@ 2011-07-06 13:16 ` Russell King - ARM Linux
2011-07-06 13:19 ` Eric Miao
` (2 more replies)
0 siblings, 3 replies; 66+ messages in thread
From: Russell King - ARM Linux @ 2011-07-06 13:16 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 06, 2011 at 09:13:14PM +0800, Eric Miao wrote:
> > ?drivers/leds/ledtrig-cpu.c ? ? ? ? ? ? ? ? ? ? | ?144 ++++++++++++
> > ?include/linux/leds.h ? ? ? ? ? ? ? ? ? ? ? ? ? | ? 15 ++
> > ?105 files changed, 1532 insertions(+), 3119 deletions(-)
>
> Not bad, I like the numbers here. This is definitely a good move.
> I had long ago wanted to remove those legacy LED code in mach-pxa.
The down-side is that through these moves we've lost functionality each
time. For example, the blinking heartbeat LED on the Assabet and
Netwinder which I always enabled to let me know whether the machines
were still alove has long since gone.
I hope that this series restores that functionality on those platforms
where it has been lost.
^ permalink raw reply [flat|nested] 66+ messages in thread* [PATCH 00/17] Introduce a led trigger for CPU activity
2011-07-06 13:16 ` Russell King - ARM Linux
@ 2011-07-06 13:19 ` Eric Miao
2011-07-06 13:47 ` Nicolas Pitre
2011-07-07 12:54 ` Bryan Wu
2 siblings, 0 replies; 66+ messages in thread
From: Eric Miao @ 2011-07-06 13:19 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 6, 2011 at 9:16 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Jul 06, 2011 at 09:13:14PM +0800, Eric Miao wrote:
>> > ?drivers/leds/ledtrig-cpu.c ? ? ? ? ? ? ? ? ? ? | ?144 ++++++++++++
>> > ?include/linux/leds.h ? ? ? ? ? ? ? ? ? ? ? ? ? | ? 15 ++
>> > ?105 files changed, 1532 insertions(+), 3119 deletions(-)
>>
>> Not bad, I like the numbers here. This is definitely a good move.
>> I had long ago wanted to remove those legacy LED code in mach-pxa.
>
> The down-side is that through these moves we've lost functionality each
> time. ?For example, the blinking heartbeat LED on the Assabet and
> Netwinder which I always enabled to let me know whether the machines
> were still alove has long since gone.
>
> I hope that this series restores that functionality on those platforms
> where it has been lost.
>
Yeah, I have the same concern. So probably extending the current simple
API to allow a more flexible behavior would be better.
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 00/17] Introduce a led trigger for CPU activity
2011-07-06 13:16 ` Russell King - ARM Linux
2011-07-06 13:19 ` Eric Miao
@ 2011-07-06 13:47 ` Nicolas Pitre
2011-07-07 12:54 ` Bryan Wu
2 siblings, 0 replies; 66+ messages in thread
From: Nicolas Pitre @ 2011-07-06 13:47 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 6 Jul 2011, Russell King - ARM Linux wrote:
> On Wed, Jul 06, 2011 at 09:13:14PM +0800, Eric Miao wrote:
> > > ?drivers/leds/ledtrig-cpu.c ? ? ? ? ? ? ? ? ? ? | ?144 ++++++++++++
> > > ?include/linux/leds.h ? ? ? ? ? ? ? ? ? ? ? ? ? | ? 15 ++
> > > ?105 files changed, 1532 insertions(+), 3119 deletions(-)
> >
> > Not bad, I like the numbers here. This is definitely a good move.
> > I had long ago wanted to remove those legacy LED code in mach-pxa.
>
> The down-side is that through these moves we've lost functionality each
> time. For example, the blinking heartbeat LED on the Assabet and
> Netwinder which I always enabled to let me know whether the machines
> were still alove has long since gone.
There exists a generic heartbeat LED trigger for that. Making it the
default for a particular LED should be trivial.
Nicolas
^ permalink raw reply [flat|nested] 66+ messages in thread
* [PATCH 00/17] Introduce a led trigger for CPU activity
2011-07-06 13:16 ` Russell King - ARM Linux
2011-07-06 13:19 ` Eric Miao
2011-07-06 13:47 ` Nicolas Pitre
@ 2011-07-07 12:54 ` Bryan Wu
2 siblings, 0 replies; 66+ messages in thread
From: Bryan Wu @ 2011-07-07 12:54 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 6, 2011 at 9:16 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Wed, Jul 06, 2011 at 09:13:14PM +0800, Eric Miao wrote:
>> > ?drivers/leds/ledtrig-cpu.c ? ? ? ? ? ? ? ? ? ? | ?144 ++++++++++++
>> > ?include/linux/leds.h ? ? ? ? ? ? ? ? ? ? ? ? ? | ? 15 ++
>> > ?105 files changed, 1532 insertions(+), 3119 deletions(-)
>>
>> Not bad, I like the numbers here. This is definitely a good move.
>> I had long ago wanted to remove those legacy LED code in mach-pxa.
>
> The down-side is that through these moves we've lost functionality each
> time. ?For example, the blinking heartbeat LED on the Assabet and
> Netwinder which I always enabled to let me know whether the machines
> were still alove has long since gone.
>
> I hope that this series restores that functionality on those platforms
> where it has been lost.
>
I chose the 'heartbeat' and 'cpu' triggers as default triggers of
Assabet 2 LEDs.
+/*
+ * 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;
+} assabet_leds[] = {
+ { "assabet:red", "cpu",},
+ { "assabet:green", "heartbeat", },
+};
But it can be changed on the fly via sysfs. Does this replacement make sense?
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 66+ messages in thread