Commit 5e93d778 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Thierry Reding
Browse files

pwm: twl: Implement .apply() callback 



To eventually get rid of all legacy drivers convert this driver to the
modern world implementing .apply(). This just pushes down a slightly
optimized variant of how legacy drivers are handled in the core.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent e45a178e

drivers/pwm/pwm-twl.c

+54 −8
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ static inline struct twl_pwm_chip *to_twl(struct pwm_chip *chip) 
}



static int twl_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,

			      int duty_ns, int period_ns)

			  u64 duty_ns, u64 period_ns)

{

	int duty_cycle = DIV_ROUND_UP(duty_ns * TWL_PWM_MAX, period_ns) + 1;

	int duty_cycle = DIV64_U64_ROUND_UP(duty_ns * TWL_PWM_MAX, period_ns) + 1;

	u8 pwm_config[2] = { 1, 0 };

	int base, ret;
@@ -279,19 +279,65 @@ static void twl6030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) 
	mutex_unlock(&twl->mutex);

}



static int twl4030_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,

			     const struct pwm_state *state)

{

	int err;



	if (state->polarity != PWM_POLARITY_NORMAL)

		return -EINVAL;



	if (!state->enabled) {

		if (pwm->state.enabled)

			twl4030_pwm_disable(chip, pwm);



		return 0;

	}



	err = twl_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);

	if (err)

		return err;



	if (!pwm->state.enabled)

		err = twl4030_pwm_enable(chip, pwm);



	return err;

}



static int twl6030_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,

			     const struct pwm_state *state)

{

	int err;



	if (state->polarity != PWM_POLARITY_NORMAL)

		return -EINVAL;



	if (!state->enabled) {

		if (pwm->state.enabled)

			twl6030_pwm_disable(chip, pwm);



		return 0;

	}



	err = twl_pwm_config(pwm->chip, pwm, state->duty_cycle, state->period);

	if (err)

		return err;



	if (!pwm->state.enabled)

		err = twl6030_pwm_enable(chip, pwm);



	return err;

}



static const struct pwm_ops twl4030_pwm_ops = {

	.config = twl_pwm_config,

	.enable = twl4030_pwm_enable,

	.disable = twl4030_pwm_disable,

	.apply = twl4030_pwm_apply,

	.request = twl4030_pwm_request,

	.free = twl4030_pwm_free,

	.owner = THIS_MODULE,

};



static const struct pwm_ops twl6030_pwm_ops = {

	.config = twl_pwm_config,

	.enable = twl6030_pwm_enable,

	.disable = twl6030_pwm_disable,

	.apply = twl6030_pwm_apply,

	.owner = THIS_MODULE,

};