Commit 40ade0c2 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

pwm: Let the of_xlate callbacks accept references without period 

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 4e77431c

drivers/pwm/core.c

+9 −11
Original line number Diff line number Diff line
@@ -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;



	if (args->args_count > 1)

		pwm->args.period = args->args[1];

	pwm->args.polarity = PWM_POLARITY_NORMAL;



	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;



	if (args->args_count > 1)

		pwm->args.period = args->args[0];

	pwm->args.polarity = PWM_POLARITY_NORMAL;



	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;