From patchwork Thu Jan 19 22:40:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 9527063 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 189046020B for ; Thu, 19 Jan 2017 22:41:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AB4028531 for ; Thu, 19 Jan 2017 22:41:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F20C828670; Thu, 19 Jan 2017 22:41:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75E5028531 for ; Thu, 19 Jan 2017 22:41:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753610AbdASWl3 (ORCPT ); Thu, 19 Jan 2017 17:41:29 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:34764 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753422AbdASWlE (ORCPT ); Thu, 19 Jan 2017 17:41:04 -0500 Received: by mail-pg0-f67.google.com with SMTP id t6so5164847pgt.1; Thu, 19 Jan 2017 14:41:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BA5EF3y7M0Xev+tYZK/MITgUCZOnmE0QHnFqv7oAREc=; b=pVosuiZrKZr4RwJQUPgDCFlRSjtpayWZTxJMHmYfkoZC84e2OZZMmLmLoUO2zRRr5m RBN+k6OHjHxzrWOQM0RdO8iCT5WZArylEGWJt2NSqSMJxWYzKflewuQ0ie8H3h1SBX2h P9d7Ote6Oxsreq0rFykOq7VPBOEOh7CDowxWgsggWdveyXA2sqXqn2OLq6smwofq7iEU n3xM9zOzJ6jj+XF4SKc1ZuGPXpjSaQg0KU+WW/Gg+LDp/bJSgYeGDKK338x1RdS4B96i VevCU+Pyo2hP0tDwX62DkoXymoyOCduzu0JluIAcOcebeF+k2nxAdEKjMswo3TyMbZSE N5Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BA5EF3y7M0Xev+tYZK/MITgUCZOnmE0QHnFqv7oAREc=; b=qO2S27jZsgOMb9z6R7pzqz1Mxp8qkh3zbs9/OhjMlXRx4dqG06Fc9rzJ4uDYSq2jZC 6dNgJ2qq+9CIdMUHvV9FJinnKBid+41tW0E925uE7tS5TE0LMbF4iucM+WWg4CbZJQkq 2Xu7pw2bcxHtOIyw/vq2fILuaCP2uG0+eQ0i1QN7Jdo4Sf5dshU/tq9Ey09tqR61zYBS 4T5p1GcjaO0A7lYBC323Aq28MMHRZg+7EVAb6eZp12DyfLo2/KDwPukbiGOJVmJl2VVO 9GvyPLh63NJiGaV8McJerXc72aJhWslU4N4hiZnB0o9Rxu0at23nYH6ILdHmILsVuPn5 NjsA== X-Gm-Message-State: AIkVDXLun7a3dZw7fmWOEa1Bd14AAQfIeDAnMtpT1Uizzsl8ws5znuUhlstx3L1s8GxJRw== X-Received: by 10.84.192.137 with SMTP id c9mr3068082pld.7.1484865663899; Thu, 19 Jan 2017 14:41:03 -0800 (PST) Received: from dtor-ws.mtv.corp.google.com ([172.22.152.34]) by smtp.gmail.com with ESMTPSA id s136sm11207573pgc.38.2017.01.19.14.41.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 14:41:03 -0800 (PST) From: Dmitry Torokhov To: linux-input@vger.kernel.org Cc: David Lechner , Thierry Reding , linux-kernel@vger.kernel.org, Frieder Schrempf Subject: [PATCH v2 6/7] Input: pwm-beeper - add optional amplifier regulator Date: Thu, 19 Jan 2017 14:40:56 -0800 Message-Id: <20170119224057.9995-6-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170119224057.9995-1-dmitry.torokhov@gmail.com> References: <20170119224057.9995-1-dmitry.torokhov@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Lechner This adds an optional regulator to the pwm-beeper device. This regulator acts as an amplifier. The amplifier is only enabled while beeping in order to reduce power consumption. Tested on LEGO MINDSTORMS EV3, which has a speaker connected to PWM through an amplifier. Signed-off-by: David Lechner Acked-by: Rob Herring Patchwork-Id: 9511151 Signed-off-by: Dmitry Torokhov --- .../devicetree/bindings/input/pwm-beeper.txt | 16 ++++++ drivers/input/misc/pwm-beeper.c | 62 +++++++++++++++++----- 2 files changed, 65 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/input/pwm-beeper.txt b/Documentation/devicetree/bindings/input/pwm-beeper.txt index be332ae4f2d6..529408b4431a 100644 --- a/Documentation/devicetree/bindings/input/pwm-beeper.txt +++ b/Documentation/devicetree/bindings/input/pwm-beeper.txt @@ -5,3 +5,19 @@ Registers a PWM device as beeper. Required properties: - compatible: should be "pwm-beeper" - pwms: phandle to the physical PWM device + +Optional properties: +- amp-supply: phandle to a regulator that acts as an amplifier for the beeper + +Example: + +beeper_amp: amplifier { + compatible = "fixed-regulator"; + gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; +}; + +beeper { + compatible = "pwm-beeper"; + pwms = <&pwm0>; + amp-supply = <&beeper_amp>; +}; diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c index 9964c46468d3..7b213e0ab06c 100644 --- a/drivers/input/misc/pwm-beeper.c +++ b/drivers/input/misc/pwm-beeper.c @@ -14,6 +14,7 @@ */ #include +#include #include #include #include @@ -25,30 +26,59 @@ struct pwm_beeper { struct input_dev *input; struct pwm_device *pwm; + struct regulator *amplifier; struct work_struct work; unsigned long period; bool suspended; + bool amplifier_on; }; #define HZ_TO_NANOSECONDS(x) (1000000000UL/(x)) -static void __pwm_beeper_set(struct pwm_beeper *beeper) +static int pwm_beeper_on(struct pwm_beeper *beeper, unsigned long period) { - unsigned long period = beeper->period; + int error; + + error = pwm_config(beeper->pwm, period / 2, period); + if (error) + return error; + + error = pwm_enable(beeper->pwm); + if (error) + return error; + + if (!beeper->amplifier_on) { + error = regulator_enable(beeper->amplifier); + if (error) { + pwm_disable(beeper->pwm); + return error; + } + + beeper->amplifier_on = true; + } + + return 0; +} - if (period) { - pwm_config(beeper->pwm, period / 2, period); - pwm_enable(beeper->pwm); - } else - pwm_disable(beeper->pwm); +static void pwm_beeper_off(struct pwm_beeper *beeper) +{ + if (beeper->amplifier_on) { + regulator_disable(beeper->amplifier); + beeper->amplifier_on = false; + } + + pwm_disable(beeper->pwm); } static void pwm_beeper_work(struct work_struct *work) { - struct pwm_beeper *beeper = - container_of(work, struct pwm_beeper, work); + struct pwm_beeper *beeper = container_of(work, struct pwm_beeper, work); + unsigned long period = READ_ONCE(beeper->period); - __pwm_beeper_set(beeper); + if (period) + pwm_beeper_on(beeper, period); + else + pwm_beeper_off(beeper); } static int pwm_beeper_event(struct input_dev *input, @@ -83,9 +113,7 @@ static int pwm_beeper_event(struct input_dev *input, static void pwm_beeper_stop(struct pwm_beeper *beeper) { cancel_work_sync(&beeper->work); - - if (beeper->period) - pwm_disable(beeper->pwm); + pwm_beeper_off(beeper); } static void pwm_beeper_close(struct input_dev *input) @@ -119,6 +147,14 @@ static int pwm_beeper_probe(struct platform_device *pdev) */ pwm_apply_args(beeper->pwm); + beeper->amplifier = devm_regulator_get(dev, "amp"); + if (IS_ERR(beeper->amplifier)) { + error = PTR_ERR(beeper->amplifier); + if (error != -EPROBE_DEFER) + dev_err(dev, "Failed to get amp regulator\n"); + return error; + } + INIT_WORK(&beeper->work, pwm_beeper_work); beeper->input = devm_input_allocate_device(dev);