aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-05-19 16:42:32 -0400
committerThierry Reding <thierry.reding@gmail.com>2014-05-21 03:03:07 -0400
commit3796ce1d4d4b330a75005c5eda105603ce9d4071 (patch)
treefdaed3c8281bee1e5bba3400d2f5ca7aecb47ce1
parent9c88669c2cfc91158f157b5584103ff7e5b6bedb (diff)
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.c8
-rw-r--r--include/linux/pwm.h2
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)
661 } 661 }
662 } 662 }
663 663
664 mutex_unlock(&pwm_lookup_lock);
665
664 if (chip) 666 if (chip)
665 pwm = pwm_request_from_chip(chip, index, con_id ?: dev_id); 667 pwm = pwm_request_from_chip(chip, index, con_id ?: dev_id);
668 if (IS_ERR(pwm))
669 return pwm;
670
671 pwm_set_period(pwm, p->period);
672 pwm_set_polarity(pwm, p->polarity);
666 673
667 mutex_unlock(&pwm_lookup_lock);
668 674
669 return pwm; 675 return pwm;
670} 676}
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 {
274 unsigned int index; 274 unsigned int index;
275 const char *dev_id; 275 const char *dev_id;
276 const char *con_id; 276 const char *con_id;
277 unsigned int period;
278 enum pwm_polarity polarity;
277}; 279};
278 280
279#define PWM_LOOKUP(_provider, _index, _dev_id, _con_id) \ 281#define PWM_LOOKUP(_provider, _index, _dev_id, _con_id) \