media: ov13b10: Support multiple regulators

The OV13B10 sensor driver currently handles a single regulator called
avdd, however the sensor can be supplied by up to three regulators.
Update the driver to handle all of them together using the regulator
bulk API.

Signed-off-by: Arun T <arun.t@intel.com>
Reviewed-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

diff --git a/drivers/media/i2c/ov13b10.c b/drivers/media/i2c/ov13b10.c
index 5421874732bcd2f9bdffd9db6656ee87d6a33b01..b0d34141a13a9368b647dc0ac9f17741a53a152f 100644 (file)
--- a/drivers/media/i2c/ov13b10.c
+++ b/drivers/media/i2c/ov13b10.c
@@ -8,6 +8,7 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
+#include <linux/regulator/consumer.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-fwnode.h>
@@ -699,6 +700,12 @@ static const struct ov13b10_mode supported_2_lanes_modes[] = {
        },
 };
 
+static const char * const ov13b10_supply_names[] = {
+       "dovdd",        /* Digital I/O power */
+       "avdd",         /* Analog power */
+       "dvdd",         /* Digital core power */
+};
+
 struct ov13b10 {
        struct device *dev;
 
@@ -708,7 +715,7 @@ struct ov13b10 {
        struct v4l2_ctrl_handler ctrl_handler;
 
        struct clk *img_clk;
-       struct regulator *avdd;
+       struct regulator_bulk_data supplies[ARRAY_SIZE(ov13b10_supply_names)];
        struct gpio_desc *reset;
 
        /* V4L2 Controls */
@@ -1194,9 +1201,8 @@ static int ov13b10_power_off(struct device *dev)
        struct ov13b10 *ov13b10 = to_ov13b10(sd);
 
        gpiod_set_value_cansleep(ov13b10->reset, 1);
-
-       if (ov13b10->avdd)
-               regulator_disable(ov13b10->avdd);
+       regulator_bulk_disable(ARRAY_SIZE(ov13b10_supply_names),
+                              ov13b10->supplies);
 
        clk_disable_unprepare(ov13b10->img_clk);
 
@@ -1214,14 +1220,12 @@ static int ov13b10_power_on(struct device *dev)
                dev_err(dev, "failed to enable imaging clock: %d", ret);
                return ret;
        }
-
-       if (ov13b10->avdd) {
-               ret = regulator_enable(ov13b10->avdd);
-               if (ret < 0) {
-                       dev_err(dev, "failed to enable avdd: %d", ret);
-                       clk_disable_unprepare(ov13b10->img_clk);
-                       return ret;
-               }
+       ret = regulator_bulk_enable(ARRAY_SIZE(ov13b10_supply_names),
+                                   ov13b10->supplies);
+       if (ret < 0) {
+               dev_err(dev, "failed to enable regulators\n");
+               clk_disable_unprepare(ov13b10->img_clk);
+               return ret;
        }
 
        gpiod_set_value_cansleep(ov13b10->reset, 0);
@@ -1475,7 +1479,8 @@ static int ov13b10_get_pm_resources(struct ov13b10 *ov13b)
        unsigned long freq;
        int ret;
 
-       ov13b->reset = devm_gpiod_get_optional(ov13b->dev, "reset", GPIOD_OUT_LOW);
+       ov13b->reset = devm_gpiod_get_optional(ov13b->dev, "reset",
+                                              GPIOD_OUT_LOW);
        if (IS_ERR(ov13b->reset))
                return dev_err_probe(ov13b->dev, PTR_ERR(ov13b->reset),
                                     "failed to get reset gpio\n");
@@ -1491,15 +1496,15 @@ static int ov13b10_get_pm_resources(struct ov13b10 *ov13b)
                                     "external clock %lu is not supported\n",
                                     freq);
 
-       ov13b->avdd = devm_regulator_get_optional(ov13b->dev, "avdd");
-       if (IS_ERR(ov13b->avdd)) {
-               ret = PTR_ERR(ov13b->avdd);
-               ov13b->avdd = NULL;
-               if (ret != -ENODEV)
-                       return dev_err_probe(ov13b->dev, ret,
-                                            "failed to get avdd regulator\n");
-       }
+       for (unsigned int i = 0; i < ARRAY_SIZE(ov13b10_supply_names); i++)
+               ov13b->supplies[i].supply = ov13b10_supply_names[i];
 
+       ret = devm_regulator_bulk_get(ov13b->dev,
+                                     ARRAY_SIZE(ov13b10_supply_names),
+                                     ov13b->supplies);
+       if (ret)
+               return dev_err_probe(ov13b->dev, ret,
+                                    "failed to get regulators\n");
        return 0;
 }