diff options
| author |   Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-05-19 22:42:32 +0200 |
|---|---|---|
| committer |   Thierry Reding <thierry.reding@gmail.com> | 2014-05-21 09:03:07 +0200 |
| commit | 3796ce1d4d4b330a75005c5eda105603ce9d4071 (patch) | |
| tree | fdaed3c8281bee1e5bba3400d2f5ca7aecb47ce1 | |
| parent | pwm: twl: Really disable twl6030 PWMs (diff) | |
| download | linux-dev-3796ce1d4d4b330a75005c5eda105603ce9d4071.tar.xz linux-dev-3796ce1d4d4b330a75005c5eda105603ce9d4071.zip | |
pwm: add period and polarity to struct pwm_lookup
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>
| -rw-r--r-- | drivers/pwm/core.c | 8 | ||||
| -rw-r--r-- | include/linux/pwm.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index a80471399c20..4b66bf09ee55 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -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; } diff --git a/include/linux/pwm.h b/include/linux/pwm.h index 4717f54051cb..2f45e2fe5b93 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -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) \ |