Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1563177

[PATCH v2 7/7] Input: pwm-beeper - switch to using "atomic" PWM API

Show all headers | View raw

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

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/misc/pwm-beeper.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c
index 7b213e0ab06c..3408dc666afa 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);
@@ -141,11 +145,14 @@ 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\n");
+		return error;
+	}
 
 	beeper->amplifier = devm_regulator_get(dev, "amp");
 	if (IS_ERR(beeper->amplifier)) {
-- 
2.11.0.483.g087da7b7c-goog

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/7] Input: pwm-beeper - remove calls to legacy pwm_request API Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-19 23:50 +0100
  [PATCH v2 5/7] Input: pwm-beeper - suppress error message on probe defer Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-19 23:50 +0100
    Re: [PATCH v2 5/7] Input: pwm-beeper - suppress error message on  probe defer Thierry Reding <thierry.reding@gmail.com> - 2017-01-20 11:20 +0100
      Re: [PATCH v2 5/7] Input: pwm-beeper - suppress error message on  probe defer David Lechner <david@lechnology.com> - 2017-01-20 19:50 +0100
  [PATCH v2 2/7] Input: pwm-beeper - switch to using managed resources Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-19 23:50 +0100
    Re: [PATCH v2 2/7] Input: pwm-beeper - switch to using managed  resources Thierry Reding <thierry.reding@gmail.com> - 2017-01-20 11:20 +0100
  [PATCH v2 6/7] Input: pwm-beeper - add optional amplifier regulator Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-19 23:50 +0100
    Re: [PATCH v2 6/7] Input: pwm-beeper - add optional amplifier  regulator Thierry Reding <thierry.reding@gmail.com> - 2017-01-20 11:20 +0100
      Re: [PATCH v2 6/7] Input: pwm-beeper - add optional amplifier  regulator Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-20 18:50 +0100
  [PATCH v2 4/7] Input: pwm-beeper - fix race when suspending Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-19 23:50 +0100
    Re: [PATCH v2 4/7] Input: pwm-beeper - fix race when suspending Thierry Reding <thierry.reding@gmail.com> - 2017-01-20 11:20 +0100
  [PATCH v2 3/7] Input: pwm-beeper - use input_set_capability() Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-19 23:50 +0100
    Re: [PATCH v2 3/7] Input: pwm-beeper - use input_set_capability() Thierry Reding <thierry.reding@gmail.com> - 2017-01-20 11:20 +0100
  [PATCH v2 7/7] Input: pwm-beeper - switch to using "atomic" PWM API Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2017-01-19 23:50 +0100
    Re: [PATCH v2 7/7] Input: pwm-beeper - switch to using "atomic" PWM  API Thierry Reding <thierry.reding@gmail.com> - 2017-01-20 11:40 +0100
  Re: [PATCH v2 1/7] Input: pwm-beeper - remove calls to legacy  pwm_request API Thierry Reding <thierry.reding@gmail.com> - 2017-01-20 11:10 +0100
  Re: [PATCH v2 1/7] Input: pwm-beeper - remove calls to legacy  pwm_request API David Lechner <david@lechnology.com> - 2017-01-20 20:40 +0100

csiph-web