diff options
| -rw-r--r-- | drivers/pwm/core.c | 7 | ||||
| -rw-r--r-- | include/pwm.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index cc33dec363..360520195a 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -181,12 +181,13 @@ struct pwm_device *pwm_request(const char *devname) } EXPORT_SYMBOL_GPL(pwm_request); -static struct pwm_device *of_node_to_pwm_device(struct device_node *np) +static struct pwm_device *of_node_to_pwm_device(struct device_node *np, int id) { struct pwm_device *pwm; list_for_each_entry(pwm, &pwm_list, node) { - if (pwm->hwdev && pwm->hwdev->device_node == np) + if (pwm->hwdev && pwm->hwdev->device_node == np && + pwm->chip->id == id) return pwm; } @@ -210,7 +211,7 @@ struct pwm_device *of_pwm_request(struct device_node *np, const char *con_id) return ERR_PTR(ret); } - pwm = of_node_to_pwm_device(args.np); + pwm = of_node_to_pwm_device(args.np, args.args[0]); if (IS_ERR(pwm)) { pr_debug("%s(): PWM chip not found\n", __func__); return pwm; diff --git a/include/pwm.h b/include/pwm.h index 59d86d497d..911c760839 100644 --- a/include/pwm.h +++ b/include/pwm.h @@ -57,12 +57,14 @@ struct pwm_ops { /** * struct pwm_chip - abstract a PWM + * @id: The id of this pwm * @devname: unique identifier for this pwm * @ops: The callbacks for this PWM * @duty_ns: The duty cycle of the PWM, in nano-seconds * @period_ns: The period of the PWM, in nano-seconds */ struct pwm_chip { + int id; const char *devname; struct pwm_ops *ops; int duty_ns; |