Input: cyapa - add regulator vcc support
authorDudley Du <dudl@cypress.com>
Thu, 30 Jul 2015 18:19:18 +0000 (11:19 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 30 Jul 2015 18:33:59 +0000 (11:33 -0700)
We need to power up the chip before we can initialize it.

On systems that delegate task of powering up regulators to firmware we
assume that we'll be simply given a dummy regulator.

Signed-off-by: Dudley Du <dudl@cypress.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/cyapa.c
drivers/input/mouse/cyapa.h

index 6195ccb3cfdee247e2fc9ec0aded60c5d6f32827..1479ca996647746cd453c075d244b4ad75fb28de 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <linux/pm_runtime.h>
@@ -1241,6 +1242,13 @@ static void cyapa_remove_sysfs_group(void *data)
        sysfs_remove_group(&cyapa->client->dev.kobj, &cyapa_sysfs_group);
 }
 
+static void cyapa_disable_regulator(void *data)
+{
+       struct cyapa *cyapa = data;
+
+       regulator_disable(cyapa->vcc);
+}
+
 static int cyapa_probe(struct i2c_client *client,
                       const struct i2c_device_id *dev_id)
 {
@@ -1274,6 +1282,27 @@ static int cyapa_probe(struct i2c_client *client,
        sprintf(cyapa->phys, "i2c-%d-%04x/input0", client->adapter->nr,
                client->addr);
 
+       cyapa->vcc = devm_regulator_get(dev, "vcc");
+       if (IS_ERR(cyapa->vcc)) {
+               error = PTR_ERR(cyapa->vcc);
+               dev_err(dev, "failed to get vcc regulator: %d\n", error);
+               return error;
+       }
+
+       error = regulator_enable(cyapa->vcc);
+       if (error) {
+               dev_err(dev, "failed to enable regulator: %d\n", error);
+               return error;
+       }
+
+       error = devm_add_action(dev, cyapa_disable_regulator, cyapa);
+       if (error) {
+               cyapa_disable_regulator(cyapa);
+               dev_err(dev, "failed to add disable regulator action: %d\n",
+                       error);
+               return error;
+       }
+
        error = cyapa_initialize(cyapa);
        if (error) {
                dev_err(dev, "failed to detect and initialize tp device.\n");
index af12536405901cee8648f1ca548441d0a19a91b0..b812bba8cdd7d7a57c45e0e58abadc99f069d149 100644 (file)
@@ -321,6 +321,7 @@ struct cyapa {
        u8 status[BL_STATUS_SIZE];
        bool operational; /* true: ready for data reporting; false: not. */
 
+       struct regulator *vcc;
        struct i2c_client *client;
        struct input_dev *input;
        char phys[32];  /* Device physical location */