summaryrefslogtreecommitdiff
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-19 13:52:49 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-22 00:26:36 -0800
commit2de8b4110c82c243530a68381a1c39a4fe05c14f (patch)
tree523add2ef629c3e70a7eb515aa18069ff1eea78c /drivers/input/misc
parent9e54924432783bfb21e905e0bf7042556bcb4b90 (diff)
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: Thierry Reding <thierry.reding@gmail.com> Tested-by: David Lechner <david@lechnology.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/pwm-beeper.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index ad9b231e8468..e53801dbd560 100644
--- a/drivers/input/misc/pwm-beeper.c
+++ b/drivers/input/misc/pwm-beeper.c
@@ -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);
- error = pwm_enable(beeper->pwm);
+ state.enabled = true;
+ state.period = period;
+ pwm_set_relative_duty_cycle(&state, 50, 100);
+
+ 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)) {