linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alistair Francis <alistair@alistair23.me>
To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org,
	linux-imx@nxp.com, kernel@pengutronix.de, pinglinux@gmail.com,
	tatsunosuke.tobita@wacom.com, junkpainting@gmail.com,
	ping.cheng@wacom.com
Cc: linux-kernel@vger.kernel.org, alistair23@gmail.com,
	robh+dt@kernel.org, devicetree@vger.kernel.org,
	Alistair Francis <alistair@alistair23.me>
Subject: [PATCH v9 07/11] Input: wacom_i2c - Add support for vdd regulator
Date: Thu, 19 Aug 2021 01:49:31 +1000	[thread overview]
Message-ID: <20210818154935.1154-8-alistair@alistair23.me> (raw)
In-Reply-To: <20210818154935.1154-1-alistair@alistair23.me>

Add support for a VDD regulator. This allows the kernel to probe the
Wacom-I2C device on the rM2.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
 drivers/input/touchscreen/wacom_i2c.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 33a3ba110171..fd486b8ef2cc 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -13,6 +13,7 @@
 #include <linux/irq.h>
 #include <linux/input/touchscreen.h>
 #include <linux/interrupt.h>
+#include <linux/regulator/consumer.h>
 #include <linux/reset.h>
 #include <linux/of.h>
 #include <asm/unaligned.h>
@@ -59,6 +60,7 @@ struct wacom_i2c {
 	struct input_dev *input;
 	struct touchscreen_properties props;
 	struct wacom_features features;
+	struct regulator *vdd;
 	u8 data[WACOM_QUERY_SIZE];
 	bool prox;
 	int tool;
@@ -220,6 +222,16 @@ static int wacom_i2c_probe(struct i2c_client *client,
 	if (!wac_i2c)
 		return -ENOMEM;
 
+	wac_i2c->vdd = regulator_get(&client->dev, "vdd");
+	if (IS_ERR(wac_i2c->vdd))
+		return PTR_ERR(wac_i2c->vdd);
+
+	error = regulator_enable(wac_i2c->vdd);
+	if (error) {
+		regulator_put(wac_i2c->vdd);
+		return error;
+	}
+
 	features = &wac_i2c->features;
 	error = wacom_query_device(client, features);
 	if (error)
@@ -228,8 +240,11 @@ static int wacom_i2c_probe(struct i2c_client *client,
 	wac_i2c->client = client;
 
 	input = devm_input_allocate_device(dev);
-	if (!input)
+	if (!input) {
+		regulator_disable(wac_i2c->vdd);
+		regulator_put(wac_i2c->vdd);
 		return -ENOMEM;
+	}
 
 	wac_i2c->input = input;
 
@@ -264,6 +279,8 @@ static int wacom_i2c_probe(struct i2c_client *client,
 					  IRQF_ONESHOT, "wacom_i2c", wac_i2c);
 	if (error) {
 		dev_err(dev, "Failed to request IRQ: %d\n", error);
+		regulator_disable(wac_i2c->vdd);
+		regulator_put(wac_i2c->vdd);
 		return error;
 	}
 
@@ -273,6 +290,8 @@ static int wacom_i2c_probe(struct i2c_client *client,
 	error = input_register_device(wac_i2c->input);
 	if (error) {
 		dev_err(dev, "Failed to register input device: %d\n", error);
+		regulator_disable(wac_i2c->vdd);
+		regulator_put(wac_i2c->vdd);
 		return error;
 	}
 
-- 
2.31.1


  parent reply	other threads:[~2021-08-19 11:21 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-18 15:49 [PATCH v9 00/11] Add Wacom I2C support to rM2 Alistair Francis
2021-08-18 15:49 ` [PATCH v9 01/11] dt-bindings: Add Wacom to vendor bindings Alistair Francis
2021-08-18 15:49 ` [PATCH v9 02/11] dt-bindings: touchscreen: Initial commit of wacom,i2c Alistair Francis
2021-08-18 15:49 ` [PATCH v9 03/11] Input: wacom_i2c - Add device tree support to wacom_i2c Alistair Francis
2021-08-18 15:49 ` [PATCH v9 04/11] Input: wacom_i2c - Add touchscren properties Alistair Francis
2021-08-18 15:49 ` [PATCH v9 05/11] Input: wacom_i2c - Add support for distance and tilt x/y Alistair Francis
2021-08-23  7:06   ` Ahmad Fatoum
2021-08-18 15:49 ` [PATCH v9 06/11] Input: wacom_i2c - Clean up the query device fields Alistair Francis
2021-08-18 15:49 ` Alistair Francis [this message]
2021-08-18 15:49 ` [PATCH v9 08/11] Input: wacom_i2c - Use macros for the bit masks Alistair Francis
2021-08-18 15:49 ` [PATCH v9 09/11] Input: wacom_i2c - Allow flipping the values from the DT Alistair Francis
2021-08-23 18:15   ` Rob Herring
2021-08-18 15:49 ` [PATCH v9 10/11] ARM: imx_v6_v7_defconfig: Enable Wacom I2C Alistair Francis
2021-08-18 15:49 ` [PATCH v9 11/11] ARM: dts: imx7d: remarkable2: add wacom digitizer device Alistair Francis

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=20210818154935.1154-8-alistair@alistair23.me \
    --to=alistair@alistair23.me \
    --cc=alistair23@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=junkpainting@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-imx@nxp.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ping.cheng@wacom.com \
    --cc=pinglinux@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=tatsunosuke.tobita@wacom.com \
    /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).