All of lore.kernel.org
 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
Cc: linux-kernel@vger.kernel.org, alistair23@gmail.com,
	Alistair Francis <alistair@alistair23.me>
Subject: [PATCH v4 08/10] Input: wacom_i2c - Add support for vdd regulator
Date: Thu, 25 Mar 2021 21:52:28 -0400	[thread overview]
Message-ID: <20210326015229.141-8-alistair@alistair23.me> (raw)
In-Reply-To: <20210326015229.141-1-alistair@alistair23.me>

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

Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
v4:
 - Don't double allocate wac_i2c

 drivers/input/touchscreen/wacom_i2c.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 28004b1180c9..c78195b6b3b1 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>
@@ -57,6 +58,7 @@ struct wacom_i2c {
 	struct input_dev *input;
 	struct reset_control *rstc;
 	struct touchscreen_properties props;
+	struct regulator *vdd;
 	u8 data[WACOM_QUERY_SIZE];
 	bool prox;
 	int tool;
@@ -222,6 +224,20 @@ static int wacom_i2c_probe(struct i2c_client *client,
 		goto err_free_mem;
 	}
 
+	wac_i2c->vdd = regulator_get(&client->dev, "vdd");
+	if (IS_ERR(wac_i2c->vdd)) {
+		error = PTR_ERR(wac_i2c->vdd);
+		kfree(wac_i2c);
+		return error;
+	}
+
+	error = regulator_enable(wac_i2c->vdd);
+	if (error) {
+		regulator_put(wac_i2c->vdd);
+		kfree(wac_i2c);
+		return error;
+	}
+
 	wac_i2c->client = client;
 	wac_i2c->input = input;
 	wac_i2c->rstc = rstc;
@@ -281,6 +297,8 @@ static int wacom_i2c_probe(struct i2c_client *client,
 err_free_irq:
 	free_irq(client->irq, wac_i2c);
 err_free_mem:
+	regulator_disable(wac_i2c->vdd);
+	regulator_put(wac_i2c->vdd);
 	input_free_device(input);
 	kfree(wac_i2c);
 
-- 
2.31.0


  parent reply	other threads:[~2021-03-26  1:53 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-26  1:52 [PATCH v4 01/10] dt-bindings: Add Wacom to vendor bindings Alistair Francis
2021-03-26  1:52 ` [PATCH v4 02/10] dt-bindings: touchscreen: Initial commit of wacom,generic Alistair Francis
2021-03-26  1:52 ` [PATCH v4 03/10] Input: wacom_i2c - Add device tree support to wacom_i2c Alistair Francis
2021-03-29 19:11   ` Dmitry Torokhov
2021-03-26  1:52 ` [PATCH v4 04/10] Input: wacom_i2c - Add touchscren properties Alistair Francis
2021-03-29 19:08   ` Dmitry Torokhov
2021-03-30  0:00     ` Alistair Francis
2021-03-26  1:52 ` [PATCH v4 05/10] Input: wacom_i2c - Add support for distance and tilt x/y Alistair Francis
2021-03-29 19:12   ` Dmitry Torokhov
2021-03-26  1:52 ` [PATCH v4 06/10] Input: wacom_i2c - Clean up the query device fields Alistair Francis
2021-03-26  1:52 ` [PATCH v4 07/10] Input: wacom_i2c - Add support for reset control Alistair Francis
2021-03-29 20:33   ` Dmitry Torokhov
2021-04-27  5:56     ` Alistair Francis
2021-03-26  1:52 ` Alistair Francis [this message]
2021-03-26  1:52 ` [PATCH v4 09/10] ARM: imx_v6_v7_defconfig: Enable Wacom I2C 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=20210326015229.141-8-alistair@alistair23.me \
    --to=alistair@alistair23.me \
    --cc=alistair23@gmail.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-imx@nxp.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.