The PWM core is now able to initialize the PWM period. Use it and if it is not
configured, use the supplied pwm_period_ns.

Signed-off-by: Alexandre Belloni <alexandre.bell...@free-electrons.com>
---
 drivers/leds/leds-pwm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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)
                        led_dat->cdev.name = cur_led->name;
                        led_dat->cdev.default_trigger = 
cur_led->default_trigger;
                        led_dat->active_low = cur_led->active_low;
-                       led_dat->period = cur_led->pwm_period_ns;
                        led_dat->cdev.brightness_set = led_pwm_set;
                        led_dat->cdev.brightness = LED_OFF;
                        led_dat->cdev.max_brightness = cur_led->max_brightness;
@@ -191,6 +190,10 @@ static int led_pwm_probe(struct platform_device *pdev)
                        if (led_dat->can_sleep)
                                INIT_WORK(&led_dat->work, led_pwm_work);
 
+                       led_dat->period = pwm_get_period(led_dat->pwm);
+                       if (!led_dat->period && (cur_led->pwm_period_ns > 0))
+                               led_dat->period = cur_led->pwm_period_ns;
+
                        ret = led_classdev_register(&pdev->dev, &led_dat->cdev);
                        if (ret < 0)
                                goto err;
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to