Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2de8b411 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: pwm-beeper - switch to using "atomic" PWM API 



The "atomic" API allows us to configure PWM period and duty cycle and
enable it in one call.

Reviewed-by: default avatarThierry Reding <thierry.reding@gmail.com>
Tested-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9e549244

drivers/input/misc/pwm-beeper.c

+17 −9
Original line number Diff line number Diff line
@@ -37,13 +37,16 @@ struct pwm_beeper { 


static int pwm_beeper_on(struct pwm_beeper *beeper, unsigned long period)

{

	struct pwm_state state;

	int error;



	error = pwm_config(beeper->pwm, period / 2, period);

	if (error)

		return error;

	pwm_get_state(beeper->pwm, &state);



	state.enabled = true;

	state.period = period;

	pwm_set_relative_duty_cycle(&state, 50, 100);



	error = pwm_enable(beeper->pwm);

	error = pwm_apply_state(beeper->pwm, &state);

	if (error)

		return error;
@@ -127,6 +130,7 @@ static int pwm_beeper_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct pwm_beeper *beeper;

	struct pwm_state state;

	int error;



	beeper = devm_kzalloc(dev, sizeof(*beeper), GFP_KERNEL);
@@ -142,11 +146,15 @@ static int pwm_beeper_probe(struct platform_device *pdev) 
		return error;

	}



	/*

	 * FIXME: pwm_apply_args() should be removed when switching to

	 * the atomic PWM API.

	 */

	pwm_apply_args(beeper->pwm);

	/* Sync up PWM state and ensure it is off. */

	pwm_init_state(beeper->pwm, &state);

	state.enabled = false;

	error = pwm_apply_state(beeper->pwm, &state);

	if (error) {

		dev_err(dev, "failed to apply initial PWM state: %d\n",

			error);

		return error;

	}



	beeper->amplifier = devm_regulator_get(dev, "amp");

	if (IS_ERR(beeper->amplifier)) {