pwm: add period and polarity to struct pwm_lookup
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Mon, 19 May 2014 20:42:32 +0000 (22:42 +0200)
committerThierry Reding <thierry.reding@gmail.com>
Wed, 21 May 2014 07:03:07 +0000 (09:03 +0200)
Add period and polarity members to struct pwm_lookup so that platforms
using the lookup table can be treated the same way as those using the
device tree.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
drivers/pwm/core.c
include/linux/pwm.h

index a80471399c20314edb69442bac0fe57cf06efec9..4b66bf09ee550fc391b8b22155dc4610ae649022 100644 (file)
@@ -661,10 +661,16 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
                }
        }
 
+       mutex_unlock(&pwm_lookup_lock);
+
        if (chip)
                pwm = pwm_request_from_chip(chip, index, con_id ?: dev_id);
+       if (IS_ERR(pwm))
+               return pwm;
+
+       pwm_set_period(pwm, p->period);
+       pwm_set_polarity(pwm, p->polarity);
 
-       mutex_unlock(&pwm_lookup_lock);
 
        return pwm;
 }
index 4717f54051cb70543c745ff7ebba1aad5ed23a7f..2f45e2fe5b939964a94e8a3040b264091fe79057 100644 (file)
@@ -274,6 +274,8 @@ struct pwm_lookup {
        unsigned int index;
        const char *dev_id;
        const char *con_id;
+       unsigned int period;
+       enum pwm_polarity polarity;
 };
 
 #define PWM_LOOKUP(_provider, _index, _dev_id, _con_id)        \