From: Ondrej Jirman <megous@megous.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>
Cc: Ondrej Jirman <megous@megous.com>, Luca Weiss <luca@z3ntu.xyz>,
Tomas Novotny <tomas@novotny.cz>,
linux-input@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 2/4] input: gpio-vibra: Allow to use vcc-supply alone to control the vibrator
Date: Thu, 30 Jul 2020 15:24:44 +0200 [thread overview]
Message-ID: <20200730132446.3139980-3-megous@megous.com> (raw)
In-Reply-To: <20200730132446.3139980-1-megous@megous.com>
Make enable-gpio optional to allow using this driver with boards that
have vibrator connected to a power supply without intermediate gpio
based enable circuitry.
Also avoid a case where neither regulator nor enable gpio is specified,
and bail out in probe in such a case.
Signed-off-by: Ondrej Jirman <megous@megous.com>
---
drivers/input/misc/gpio-vibra.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/input/misc/gpio-vibra.c b/drivers/input/misc/gpio-vibra.c
index f79f75595dd7..87508c3939e9 100644
--- a/drivers/input/misc/gpio-vibra.c
+++ b/drivers/input/misc/gpio-vibra.c
@@ -39,7 +39,7 @@ static int gpio_vibrator_start(struct gpio_vibrator *vibrator)
struct device *pdev = vibrator->input->dev.parent;
int err;
- if (!vibrator->vcc_on) {
+ if (vibrator->vcc && !vibrator->vcc_on) {
err = regulator_enable(vibrator->vcc);
if (err) {
dev_err(pdev, "failed to enable regulator: %d\n", err);
@@ -57,7 +57,7 @@ static void gpio_vibrator_stop(struct gpio_vibrator *vibrator)
{
gpiod_set_value_cansleep(vibrator->gpio, 0);
- if (vibrator->vcc_on) {
+ if (vibrator->vcc && vibrator->vcc_on) {
regulator_disable(vibrator->vcc);
vibrator->vcc_on = false;
}
@@ -112,16 +112,19 @@ static int gpio_vibrator_probe(struct platform_device *pdev)
if (!vibrator->input)
return -ENOMEM;
- vibrator->vcc = devm_regulator_get(&pdev->dev, "vcc");
+ vibrator->vcc = devm_regulator_get_optional(&pdev->dev, "vcc");
err = PTR_ERR_OR_ZERO(vibrator->vcc);
- if (err) {
+ if (err == -ENODEV) {
+ vibrator->vcc = NULL;
+ } else if (err) {
if (err != -EPROBE_DEFER)
dev_err(&pdev->dev, "Failed to request regulator: %d\n",
err);
return err;
}
- vibrator->gpio = devm_gpiod_get(&pdev->dev, "enable", GPIOD_OUT_LOW);
+ vibrator->gpio = devm_gpiod_get_optional(&pdev->dev, "enable",
+ GPIOD_OUT_LOW);
err = PTR_ERR_OR_ZERO(vibrator->gpio);
if (err) {
if (err != -EPROBE_DEFER)
@@ -130,6 +133,11 @@ static int gpio_vibrator_probe(struct platform_device *pdev)
return err;
}
+ if (!vibrator->vcc && !vibrator->gpio) {
+ dev_err(&pdev->dev, "Neither gpio nor regulator provided\n");
+ return -EINVAL;
+ }
+
INIT_WORK(&vibrator->play_work, gpio_vibrator_play_work);
vibrator->input->name = "gpio-vibrator";
--
2.27.0
next prev parent reply other threads:[~2020-07-30 13:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 13:24 [PATCH v5 0/4] Add support for vibrator motor for TBS A711 Tablet Ondrej Jirman
2020-07-30 13:24 ` [PATCH v5 1/4] dt-bindings: input: gpio-vibrator: Don't require enable-gpios Ondrej Jirman
2020-07-30 13:24 ` Ondrej Jirman [this message]
2020-07-30 13:24 ` [PATCH v5 3/4] ARM: dts: sun8i-a83t-tbs-a711: Add support for the vibrator motor Ondrej Jirman
2020-07-31 5:41 ` Marco Felsch
2020-07-30 13:24 ` [PATCH v5 4/4] ARM: dts: sun8i-a83t-tbs-a711: Increase voltage on the vibrator Ondrej Jirman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200730132446.3139980-3-megous@megous.com \
--to=megous@megous.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luca@z3ntu.xyz \
--cc=mark.rutland@arm.com \
--cc=mripard@kernel.org \
--cc=robh+dt@kernel.org \
--cc=tomas@novotny.cz \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).