aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorNuno Sá <nuno.sa@analog.com>2022-08-30 21:13:10 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2022-08-30 21:16:33 -0700
commit73d4a5423ecee8e108056134c53f82c7a95a90d5 (patch)
tree3a20603e3e75ec7cb37588ebc40cdd801c5f41bf /drivers/input
parentInput: adp5588-keys - add optional reset gpio (diff)
downloadlinux-dev-73d4a5423ecee8e108056134c53f82c7a95a90d5.tar.xz
linux-dev-73d4a5423ecee8e108056134c53f82c7a95a90d5.zip
Input: adp5588-keys - add regulator support
Support feeding VCC through a regulator. Signed-off-by: Nuno Sá <nuno.sa@analog.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Link: https://lore.kernel.org/r/20220829131553.690063-10-nuno.sa@analog.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/adp5588-keys.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 950abc1c25a3..1db6b28db7ba 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -24,6 +24,7 @@
#include <linux/pinctrl/pinconf-generic.h>
#include <linux/platform_device.h>
#include <linux/pm.h>
+#include <linux/regulator/consumer.h>
#include <linux/slab.h>
#include <linux/timekeeping.h>
@@ -712,12 +713,18 @@ static int adp5588_fw_parse(struct adp5588_kpad *kpad)
return 0;
}
+static void adp5588_disable_regulator(void *reg)
+{
+ regulator_disable(reg);
+}
+
static int adp5588_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct adp5588_kpad *kpad;
struct input_dev *input;
struct gpio_desc *gpio;
+ struct regulator *vcc;
unsigned int revid;
int ret;
int error;
@@ -743,6 +750,19 @@ static int adp5588_probe(struct i2c_client *client,
if (error)
return error;
+ vcc = devm_regulator_get(&client->dev, "vcc");
+ if (IS_ERR(vcc))
+ return PTR_ERR(vcc);
+
+ error = regulator_enable(vcc);
+ if (error)
+ return error;
+
+ error = devm_add_action_or_reset(&client->dev,
+ adp5588_disable_regulator, vcc);
+ if (error)
+ return error;
+
gpio = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_HIGH);
if (IS_ERR(gpio))
return PTR_ERR(gpio);