diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2024-01-10 00:34:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-30 10:49:18 +0300 |
| commit | f1cf38947558e07b1c96750174fd6845bd095dc4 (patch) | |
| tree | 8bae47d83fcbeced1105b033241e175b5e1d90ee /drivers/pwm | |
| parent | 3dcb2582ac5aa6cfd9c06cc809c2a104a9f9e9ce (diff) | |
| download | linux-f1cf38947558e07b1c96750174fd6845bd095dc4.tar.xz | |
pwm: Let the of_xlate callbacks accept references without period
[ Upstream commit 40ade0c2e7940becad70a0643ba90488b905b468 ]
With this extension of_pwm_xlate_with_flags() is suitable to replace the
custom xlate function of the pwm-clps711x driver.
While touching these very similar functions align their implementations.
Link: https://lore.kernel.org/r/127622315d07d9d419ae8e6373c7e5be7fab7a62.1704835845.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Stable-dep-of: 3e551115aee0 ("pwm: meson: Add check for error from clk_round_rate()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/pwm')
| -rw-r--r-- | drivers/pwm/core.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 31f210872a07..606d9ef0c709 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -107,8 +107,8 @@ of_pwm_xlate_with_flags(struct pwm_chip *chip, const struct of_phandle_args *arg { struct pwm_device *pwm; - /* flags in the third cell are optional */ - if (args->args_count < 2) + /* period in the second cell and flags in the third cell are optional */ + if (args->args_count < 1) return ERR_PTR(-EINVAL); if (args->args[0] >= chip->npwm) @@ -118,9 +118,10 @@ of_pwm_xlate_with_flags(struct pwm_chip *chip, const struct of_phandle_args *arg if (IS_ERR(pwm)) return pwm; - pwm->args.period = args->args[1]; - pwm->args.polarity = PWM_POLARITY_NORMAL; + if (args->args_count > 1) + pwm->args.period = args->args[1]; + pwm->args.polarity = PWM_POLARITY_NORMAL; if (args->args_count > 2 && args->args[2] & PWM_POLARITY_INVERTED) pwm->args.polarity = PWM_POLARITY_INVERSED; @@ -133,18 +134,15 @@ of_pwm_single_xlate(struct pwm_chip *chip, const struct of_phandle_args *args) { struct pwm_device *pwm; - /* validate that one cell is specified, optionally with flags */ - if (args->args_count != 1 && args->args_count != 2) - return ERR_PTR(-EINVAL); - pwm = pwm_request_from_chip(chip, 0, NULL); if (IS_ERR(pwm)) return pwm; - pwm->args.period = args->args[0]; - pwm->args.polarity = PWM_POLARITY_NORMAL; + if (args->args_count > 1) + pwm->args.period = args->args[0]; - if (args->args_count == 2 && args->args[1] & PWM_POLARITY_INVERTED) + pwm->args.polarity = PWM_POLARITY_NORMAL; + if (args->args_count > 1 && args->args[1] & PWM_POLARITY_INVERTED) pwm->args.polarity = PWM_POLARITY_INVERSED; return pwm; |