Merge branch 'for-4.19/i2c-hid' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 20 Aug 2018 16:07:01 +0000 (18:07 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 20 Aug 2018 16:07:01 +0000 (18:07 +0200)
Low voltage support for i2c-hid

Documentation/devicetree/bindings/input/hid-over-i2c.txt
drivers/hid/i2c-hid/i2c-hid.c
include/linux/platform_data/i2c-hid.h

index 4d3da9d91de4e1a73213767a13ae9dd12441711f..89e6ab89ba388541a76caf5893d5ee194bc33503 100644 (file)
@@ -26,7 +26,8 @@ device-specific compatible properties, which should be used in addition to the
 
 - compatible:
   * "wacom,w9013" (Wacom W9013 digitizer). Supports:
-    - vdd-supply
+    - vdd-supply (3.3V)
+    - vddl-supply (1.8V)
     - post-power-on-delay-ms
 
 - vdd-supply: phandle of the regulator that provides the supply voltage.
index eae0cb3ddec668e8d2f82b1d571bb826b0fb1dd5..2ce194a84868e0fe5e133e241a0de368dfe3becf 100644 (file)
@@ -1002,18 +1002,18 @@ static int i2c_hid_probe(struct i2c_client *client,
                return client->irq;
        }
 
-       ihid = kzalloc(sizeof(struct i2c_hid), GFP_KERNEL);
+       ihid = devm_kzalloc(&client->dev, sizeof(*ihid), GFP_KERNEL);
        if (!ihid)
                return -ENOMEM;
 
        if (client->dev.of_node) {
                ret = i2c_hid_of_probe(client, &ihid->pdata);
                if (ret)
-                       goto err;
+                       return ret;
        } else if (!platform_data) {
                ret = i2c_hid_acpi_pdata(client, &ihid->pdata);
                if (ret)
-                       goto err;
+                       return ret;
        } else {
                ihid->pdata = *platform_data;
        }
@@ -1021,21 +1021,20 @@ static int i2c_hid_probe(struct i2c_client *client,
        /* Parse platform agnostic common properties from ACPI / device tree */
        i2c_hid_fwnode_probe(client, &ihid->pdata);
 
-       ihid->pdata.supply = devm_regulator_get(&client->dev, "vdd");
-       if (IS_ERR(ihid->pdata.supply)) {
-               ret = PTR_ERR(ihid->pdata.supply);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&client->dev, "Failed to get regulator: %d\n",
-                               ret);
-               goto err;
-       }
+       ihid->pdata.supplies[0].supply = "vdd";
+       ihid->pdata.supplies[1].supply = "vddl";
+
+       ret = devm_regulator_bulk_get(&client->dev,
+                                     ARRAY_SIZE(ihid->pdata.supplies),
+                                     ihid->pdata.supplies);
+       if (ret)
+               return ret;
+
+       ret = regulator_bulk_enable(ARRAY_SIZE(ihid->pdata.supplies),
+                                   ihid->pdata.supplies);
+       if (ret < 0)
+               return ret;
 
-       ret = regulator_enable(ihid->pdata.supply);
-       if (ret < 0) {
-               dev_err(&client->dev, "Failed to enable regulator: %d\n",
-                       ret);
-               goto err;
-       }
        if (ihid->pdata.post_power_delay_ms)
                msleep(ihid->pdata.post_power_delay_ms);
 
@@ -1122,11 +1121,9 @@ err_pm:
        pm_runtime_disable(&client->dev);
 
 err_regulator:
-       regulator_disable(ihid->pdata.supply);
-
-err:
+       regulator_bulk_disable(ARRAY_SIZE(ihid->pdata.supplies),
+                              ihid->pdata.supplies);
        i2c_hid_free_buffers(ihid);
-       kfree(ihid);
        return ret;
 }
 
@@ -1148,9 +1145,8 @@ static int i2c_hid_remove(struct i2c_client *client)
        if (ihid->bufsize)
                i2c_hid_free_buffers(ihid);
 
-       regulator_disable(ihid->pdata.supply);
-
-       kfree(ihid);
+       regulator_bulk_disable(ARRAY_SIZE(ihid->pdata.supplies),
+                              ihid->pdata.supplies);
 
        return 0;
 }
@@ -1201,9 +1197,8 @@ static int i2c_hid_suspend(struct device *dev)
                        hid_warn(hid, "Failed to enable irq wake: %d\n",
                                wake_status);
        } else {
-               ret = regulator_disable(ihid->pdata.supply);
-               if (ret < 0)
-                       hid_warn(hid, "Failed to disable supply: %d\n", ret);
+               regulator_bulk_disable(ARRAY_SIZE(ihid->pdata.supplies),
+                                      ihid->pdata.supplies);
        }
 
        return 0;
@@ -1218,9 +1213,11 @@ static int i2c_hid_resume(struct device *dev)
        int wake_status;
 
        if (!device_may_wakeup(&client->dev)) {
-               ret = regulator_enable(ihid->pdata.supply);
-               if (ret < 0)
-                       hid_warn(hid, "Failed to enable supply: %d\n", ret);
+               ret = regulator_bulk_enable(ARRAY_SIZE(ihid->pdata.supplies),
+                                           ihid->pdata.supplies);
+               if (ret)
+                       hid_warn(hid, "Failed to enable supplies: %d\n", ret);
+
                if (ihid->pdata.post_power_delay_ms)
                        msleep(ihid->pdata.post_power_delay_ms);
        } else if (ihid->irq_wake_enabled) {
index 1fb088239d12b9f4a5a849a2ce662343743c8bd9..c628bb5e10610c59f2464675088966f2e7036b91 100644 (file)
 #ifndef __LINUX_I2C_HID_H
 #define __LINUX_I2C_HID_H
 
+#include <linux/regulator/consumer.h>
 #include <linux/types.h>
 
-struct regulator;
-
 /**
  * struct i2chid_platform_data - used by hid over i2c implementation.
  * @hid_descriptor_address: i2c register where the HID descriptor is stored.
- * @supply: regulator for powering on the device.
+ * @supplies: regulators for powering on the device.
  * @post_power_delay_ms: delay after powering on before device is usable.
  *
  * Note that it is the responsibility of the platform driver (or the acpi 5.0
@@ -35,7 +34,7 @@ struct regulator;
  */
 struct i2c_hid_platform_data {
        u16 hid_descriptor_address;
-       struct regulator *supply;
+       struct regulator_bulk_data supplies[2];
        int post_power_delay_ms;
 };