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>

diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
index 7d0aaed1e23a881ab28997b09df13e372d538c36..aa770ec1e8928cc6b8f8eeaf9d6daea314e46d65 100644 (file)
--- 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;