diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-05-19 16:42:41 -0400 |
---|---|---|
committer | Thierry Reding <thierry.reding@gmail.com> | 2014-05-21 05:19:45 -0400 |
commit | 81225bed32739752df61b5821bbf3f9be70e434d (patch) | |
tree | 77683ae1cde1fd6c7508290f7683017c74f6440d /drivers | |
parent | 9becf5001130bcd24f57584e48467050e85eee03 (diff) |
leds: leds-pwm: retrieve configured PWM period
The PWM core is now able to initialize the PWM period from a lookup
table defined by board files. Use it if available and fallback to the
value supplied in pwm_period_ns.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/leds/leds-pwm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c index 7d0aaed1e23a..aa770ec1e892 100644 --- a/drivers/leds/leds-pwm.c +++ b/drivers/leds/leds-pwm.c | |||
@@ -181,7 +181,6 @@ static int led_pwm_probe(struct platform_device *pdev) | |||
181 | led_dat->cdev.name = cur_led->name; | 181 | led_dat->cdev.name = cur_led->name; |
182 | led_dat->cdev.default_trigger = cur_led->default_trigger; | 182 | led_dat->cdev.default_trigger = cur_led->default_trigger; |
183 | led_dat->active_low = cur_led->active_low; | 183 | led_dat->active_low = cur_led->active_low; |
184 | led_dat->period = cur_led->pwm_period_ns; | ||
185 | led_dat->cdev.brightness_set = led_pwm_set; | 184 | led_dat->cdev.brightness_set = led_pwm_set; |
186 | led_dat->cdev.brightness = LED_OFF; | 185 | led_dat->cdev.brightness = LED_OFF; |
187 | led_dat->cdev.max_brightness = cur_led->max_brightness; | 186 | led_dat->cdev.max_brightness = cur_led->max_brightness; |
@@ -191,6 +190,10 @@ static int led_pwm_probe(struct platform_device *pdev) | |||
191 | if (led_dat->can_sleep) | 190 | if (led_dat->can_sleep) |
192 | INIT_WORK(&led_dat->work, led_pwm_work); | 191 | INIT_WORK(&led_dat->work, led_pwm_work); |
193 | 192 | ||
193 | led_dat->period = pwm_get_period(led_dat->pwm); | ||
194 | if (!led_dat->period && (cur_led->pwm_period_ns > 0)) | ||
195 | led_dat->period = cur_led->pwm_period_ns; | ||
196 | |||
194 | ret = led_classdev_register(&pdev->dev, &led_dat->cdev); | 197 | ret = led_classdev_register(&pdev->dev, &led_dat->cdev); |
195 | if (ret < 0) | 198 | if (ret < 0) |
196 | goto err; | 199 | goto err; |