Merge tag 'pwm/for-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm fixes from Thierry Reding: "One more fix for some fallout observed after the introduction of the atomic API" * tag 'pwm/for-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: pwm: Fix pwm_apply_args()
This commit is contained in:
@@ -464,6 +464,8 @@ static inline bool pwm_can_sleep(struct pwm_device *pwm)
|
||||
|
||||
static inline void pwm_apply_args(struct pwm_device *pwm)
|
||||
{
|
||||
struct pwm_state state = { };
|
||||
|
||||
/*
|
||||
* PWM users calling pwm_apply_args() expect to have a fresh config
|
||||
* where the polarity and period are set according to pwm_args info.
|
||||
@@ -476,18 +478,20 @@ static inline void pwm_apply_args(struct pwm_device *pwm)
|
||||
* at startup (even if they are actually enabled), thus authorizing
|
||||
* polarity setting.
|
||||
*
|
||||
* Instead of setting ->enabled to false, we call pwm_disable()
|
||||
* before pwm_set_polarity() to ensure that everything is configured
|
||||
* as expected, and the PWM is really disabled when the user request
|
||||
* it.
|
||||
* To fulfill this requirement, we apply a new state which disables
|
||||
* the PWM device and set the reference period and polarity config.
|
||||
*
|
||||
* Note that PWM users requiring a smooth handover between the
|
||||
* bootloader and the kernel (like critical regulators controlled by
|
||||
* PWM devices) will have to switch to the atomic API and avoid calling
|
||||
* pwm_apply_args().
|
||||
*/
|
||||
pwm_disable(pwm);
|
||||
pwm_set_polarity(pwm, pwm->args.polarity);
|
||||
|
||||
state.enabled = false;
|
||||
state.polarity = pwm->args.polarity;
|
||||
state.period = pwm->args.period;
|
||||
|
||||
pwm_apply_state(pwm, &state);
|
||||
}
|
||||
|
||||
struct pwm_lookup {
|
||||
|
Reference in New Issue
Block a user