diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-12-21 04:43:58 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@gmail.com> | 2013-02-01 20:47:05 -0500 |
commit | 8eb9612799605a7988d1c97cdc5980a5b8f04c56 (patch) | |
tree | 3fbeba200bb259f11fa4fafd7e60d22b86010a32 | |
parent | d4c0c4705bef1134339b038872ece3705a2783e0 (diff) |
pwm: core: Rename of_pwm_request() to of_pwm_get() and export it
Allow client driver to use of_pwm_get() to get the PWM they need. This
is needed for drivers which handle more than one PWM separately, like
leds-pwm driver, which have:
pwmleds {
compatible = "pwm-leds";
kpad {
label = "omap4::keypad";
pwms = <&twl_pwm 0 7812500>;
max-brightness = <127>;
};
charging {
label = "omap4:green:chrg";
pwms = <&twl_pwmled 0 7812500>;
max-brightness = <255>;
};
};
in the dts files.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
-rw-r--r-- | drivers/pwm/core.c | 8 | ||||
-rw-r--r-- | include/linux/pwm.h | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 903138b18842..3cb741dc2038 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c | |||
@@ -471,7 +471,7 @@ static struct pwm_chip *of_node_to_pwmchip(struct device_node *np) | |||
471 | } | 471 | } |
472 | 472 | ||
473 | /** | 473 | /** |
474 | * of_pwm_request() - request a PWM via the PWM framework | 474 | * of_pwm_get() - request a PWM via the PWM framework |
475 | * @np: device node to get the PWM from | 475 | * @np: device node to get the PWM from |
476 | * @con_id: consumer name | 476 | * @con_id: consumer name |
477 | * | 477 | * |
@@ -486,8 +486,7 @@ static struct pwm_chip *of_node_to_pwmchip(struct device_node *np) | |||
486 | * becomes mandatory for devices that look up the PWM device via the con_id | 486 | * becomes mandatory for devices that look up the PWM device via the con_id |
487 | * parameter. | 487 | * parameter. |
488 | */ | 488 | */ |
489 | static struct pwm_device *of_pwm_request(struct device_node *np, | 489 | struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id) |
490 | const char *con_id) | ||
491 | { | 490 | { |
492 | struct pwm_device *pwm = NULL; | 491 | struct pwm_device *pwm = NULL; |
493 | struct of_phandle_args args; | 492 | struct of_phandle_args args; |
@@ -545,6 +544,7 @@ put: | |||
545 | 544 | ||
546 | return pwm; | 545 | return pwm; |
547 | } | 546 | } |
547 | EXPORT_SYMBOL_GPL(of_pwm_get); | ||
548 | 548 | ||
549 | /** | 549 | /** |
550 | * pwm_add_table() - register PWM device consumers | 550 | * pwm_add_table() - register PWM device consumers |
@@ -587,7 +587,7 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) | |||
587 | 587 | ||
588 | /* look up via DT first */ | 588 | /* look up via DT first */ |
589 | if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node) | 589 | if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node) |
590 | return of_pwm_request(dev->of_node, con_id); | 590 | return of_pwm_get(dev->of_node, con_id); |
591 | 591 | ||
592 | /* | 592 | /* |
593 | * We look up the provider in the static table typically provided by | 593 | * We look up the provider in the static table typically provided by |
diff --git a/include/linux/pwm.h b/include/linux/pwm.h index cc908a5396f8..76a1959f2b23 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h | |||
@@ -175,6 +175,7 @@ struct pwm_device *of_pwm_xlate_with_flags(struct pwm_chip *pc, | |||
175 | const struct of_phandle_args *args); | 175 | const struct of_phandle_args *args); |
176 | 176 | ||
177 | struct pwm_device *pwm_get(struct device *dev, const char *con_id); | 177 | struct pwm_device *pwm_get(struct device *dev, const char *con_id); |
178 | struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id); | ||
178 | void pwm_put(struct pwm_device *pwm); | 179 | void pwm_put(struct pwm_device *pwm); |
179 | 180 | ||
180 | struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id); | 181 | struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id); |
@@ -213,6 +214,12 @@ static inline struct pwm_device *pwm_get(struct device *dev, | |||
213 | return ERR_PTR(-ENODEV); | 214 | return ERR_PTR(-ENODEV); |
214 | } | 215 | } |
215 | 216 | ||
217 | static inline struct pwm_device *of_pwm_get(struct device_node *np, | ||
218 | const char *con_id) | ||
219 | { | ||
220 | return ERR_PTR(-ENODEV); | ||
221 | } | ||
222 | |||
216 | static inline void pwm_put(struct pwm_device *pwm) | 223 | static inline void pwm_put(struct pwm_device *pwm) |
217 | { | 224 | { |
218 | } | 225 | } |