Commit 912dd91e authored by Daniel Stone's avatar Daniel Stone Committed by Tony Lindgren

LED: OMAP PWM: Use work queue for brightness

It isn't safe to schedule from a LED brightness_set handler, so use a work queue.
Signed-off-by: default avatarDaniel Stone <daniel.stone@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ca640909
...@@ -16,17 +16,20 @@ ...@@ -16,17 +16,20 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/sched.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/arch/board.h> #include <asm/arch/board.h>
#include <asm/arch/dmtimer.h> #include <asm/arch/dmtimer.h>
struct omap_pwm_led { struct omap_pwm_led {
struct led_classdev cdev; struct led_classdev cdev;
struct work_struct work;
struct omap_pwm_led_platform_data *pdata; struct omap_pwm_led_platform_data *pdata;
struct omap_dm_timer *intensity_timer; struct omap_dm_timer *intensity_timer;
struct omap_dm_timer *blink_timer; struct omap_dm_timer *blink_timer;
int powered; int powered;
unsigned int on_period, off_period; unsigned int on_period, off_period;
enum led_brightness brightness;
}; };
static inline struct omap_pwm_led *pdev_to_omap_pwm_led(struct platform_device *pdev) static inline struct omap_pwm_led *pdev_to_omap_pwm_led(struct platform_device *pdev)
...@@ -39,6 +42,11 @@ static inline struct omap_pwm_led *cdev_to_omap_pwm_led(struct led_classdev *led ...@@ -39,6 +42,11 @@ static inline struct omap_pwm_led *cdev_to_omap_pwm_led(struct led_classdev *led
return container_of(led_cdev, struct omap_pwm_led, cdev); return container_of(led_cdev, struct omap_pwm_led, cdev);
} }
static inline struct omap_pwm_led *work_to_omap_pwm_led(struct work_struct *work)
{
return container_of(work, struct omap_pwm_led, work);
}
static void omap_pwm_led_set_blink(struct omap_pwm_led *led) static void omap_pwm_led_set_blink(struct omap_pwm_led *led)
{ {
if (!led->powered) if (!led->powered)
...@@ -134,9 +142,17 @@ static void omap_pwm_led_set(struct led_classdev *led_cdev, ...@@ -134,9 +142,17 @@ static void omap_pwm_led_set(struct led_classdev *led_cdev,
{ {
struct omap_pwm_led *led = cdev_to_omap_pwm_led(led_cdev); struct omap_pwm_led *led = cdev_to_omap_pwm_led(led_cdev);
if (value != LED_OFF) { led->brightness = value;
schedule_work(&led->work);
}
static void omap_pwm_led_work(struct work_struct *work)
{
struct omap_pwm_led *led = work_to_omap_pwm_led(work);
if (led->brightness != LED_OFF) {
omap_pwm_led_power_on(led); omap_pwm_led_power_on(led);
omap_pwm_led_set_pwm_cycle(led, value); omap_pwm_led_set_pwm_cycle(led, led->brightness);
} else { } else {
omap_pwm_led_power_off(led); omap_pwm_led_power_off(led);
} }
...@@ -232,6 +248,8 @@ static int omap_pwm_led_probe(struct platform_device *pdev) ...@@ -232,6 +248,8 @@ static int omap_pwm_led_probe(struct platform_device *pdev)
led->cdev.default_trigger = NULL; led->cdev.default_trigger = NULL;
led->cdev.name = pdata->name; led->cdev.name = pdata->name;
led->pdata = pdata; led->pdata = pdata;
led->brightness = LED_OFF;
INIT_WORK(&led->work, omap_pwm_led_work);
dev_info(&pdev->dev, "OMAP PWM LED (%s) at GP timer %d/%d\n", dev_info(&pdev->dev, "OMAP PWM LED (%s) at GP timer %d/%d\n",
pdata->name, pdata->intensity_timer, pdata->blink_timer); pdata->name, pdata->intensity_timer, pdata->blink_timer);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment