From: Linus Walleij <linus.walleij@linaro.org>
To: Ferruh Yigit <fery@cypress.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Javier Martinez Canillas <javier@dowhile0.org>
Cc: Henrik Rydberg <rydberg@bitmath.org>,
linux-input@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 2/7] Input: cyttsp - Obtain regulators
Date: Tue, 30 Mar 2021 10:54:19 +0200 [thread overview]
Message-ID: <20210330085424.2244653-3-linus.walleij@linaro.org> (raw)
In-Reply-To: <20210330085424.2244653-1-linus.walleij@linaro.org>
The CYTTSP TMA340 chips have two supplies: VCPIN and
VDD for analog and digital voltage respectively.
Add some minimal code to obtain and enable these
regulators if need be.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/input/touchscreen/cyttsp_core.c | 30 +++++++++++++++++++++++--
drivers/input/touchscreen/cyttsp_core.h | 2 ++
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/drivers/input/touchscreen/cyttsp_core.c b/drivers/input/touchscreen/cyttsp_core.c
index b9772192b5ea..a19d7cce95ca 100644
--- a/drivers/input/touchscreen/cyttsp_core.c
+++ b/drivers/input/touchscreen/cyttsp_core.c
@@ -22,6 +22,7 @@
#include <linux/slab.h>
#include <linux/property.h>
#include <linux/gpio/consumer.h>
+#include <linux/regulator/consumer.h>
#include "cyttsp_core.h"
@@ -621,6 +622,19 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops,
ts->bus_ops = bus_ops;
ts->irq = irq;
+ /*
+ * VCPIN is the analog voltage supply
+ * VDD is the digital voltage supply
+ */
+ ts->regulators[0].supply = "vcpin";
+ ts->regulators[1].supply = "vdd";
+ error = devm_regulator_bulk_get(dev, ARRAY_SIZE(ts->regulators),
+ ts->regulators);
+ if (error) {
+ dev_err(dev, "Failed to get regulators: %d\n", error);
+ return ERR_PTR(error);
+ }
+
ts->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(ts->reset_gpio)) {
error = PTR_ERR(ts->reset_gpio);
@@ -666,20 +680,32 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops,
disable_irq(ts->irq);
+ error = regulator_bulk_enable(ARRAY_SIZE(ts->regulators),
+ ts->regulators);
+ if (error) {
+ dev_err(dev, "Cannot enable regulators: %d\n", error);
+ return ERR_PTR(error);
+ }
+
cyttsp_hard_reset(ts);
error = cyttsp_power_on(ts);
if (error)
- return ERR_PTR(error);
+ goto err_dis_reg;
error = input_register_device(input_dev);
if (error) {
dev_err(ts->dev, "failed to register input device: %d\n",
error);
- return ERR_PTR(error);
+ goto err_dis_reg;
}
return ts;
+
+err_dis_reg:
+ regulator_bulk_disable(ARRAY_SIZE(ts->regulators),
+ ts->regulators);
+ return ERR_PTR(error);
}
EXPORT_SYMBOL_GPL(cyttsp_probe);
diff --git a/drivers/input/touchscreen/cyttsp_core.h b/drivers/input/touchscreen/cyttsp_core.h
index 8c651336ac12..c102a094e888 100644
--- a/drivers/input/touchscreen/cyttsp_core.h
+++ b/drivers/input/touchscreen/cyttsp_core.h
@@ -23,6 +23,7 @@
#include <linux/types.h>
#include <linux/device.h>
#include <linux/input/cyttsp.h>
+#include <linux/regulator/consumer.h>
#define CY_NUM_RETRY 16 /* max number of retries for read ops */
@@ -123,6 +124,7 @@ struct cyttsp {
enum cyttsp_state state;
bool suspended;
+ struct regulator_bulk_data regulators[2];
struct gpio_desc *reset_gpio;
bool use_hndshk;
u8 act_dist;
--
2.29.2
next prev parent reply other threads:[~2021-03-30 8:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-30 8:54 [PATCH 0/7] Input: cyttsp - First round of modernizations Linus Walleij
2021-03-30 8:54 ` [PATCH 1/7] Input: cyttsp - Probe from compatibles Linus Walleij
2021-03-30 10:51 ` Javier Martinez Canillas
2021-03-30 8:54 ` Linus Walleij [this message]
2021-03-30 10:54 ` [PATCH 2/7] Input: cyttsp - Obtain regulators Javier Martinez Canillas
2021-03-30 8:54 ` [PATCH 3/7] Input: cyttsp - Error message on boot mode exit error Linus Walleij
2021-03-30 10:56 ` Javier Martinez Canillas
2021-03-30 8:54 ` [PATCH 4/7] Input: cyttsp - Reduce reset pulse timings Linus Walleij
2021-03-30 10:57 ` Javier Martinez Canillas
2021-03-30 8:54 ` [PATCH 5/7] Input: cyttsp - Drop the phys path Linus Walleij
2021-03-30 11:00 ` Javier Martinez Canillas
2021-03-30 8:54 ` [PATCH 6/7] Input: cyttsp - Set abs params for ABS_MT_TOUCH_MAJOR Linus Walleij
2021-03-30 11:00 ` Javier Martinez Canillas
2021-03-30 8:54 ` [PATCH 7/7] Input: cyttsp - Flag the device properly Linus Walleij
2021-03-30 11:01 ` Javier Martinez Canillas
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=20210330085424.2244653-3-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=dmitry.torokhov@gmail.com \
--cc=fery@cypress.com \
--cc=javier@dowhile0.org \
--cc=linux-input@vger.kernel.org \
--cc=rydberg@bitmath.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).