media: ov8856: Add devicetree support

Add match table, enable ov8856_probe() to support
both ACPI and DT modes.

ACPI and DT modes are primarily distinguished from
by checking for ACPI mode and by having resource like
be NULL.

Signed-off-by: Robert Foss <robert.foss@linaro.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c
index 8655842af2755886620480d1120f8d251b6d06f6..efc3e231c9b76306dfdf68c957064abb562a94fd 100644 (file)
--- a/drivers/media/i2c/ov8856.c
+++ b/drivers/media/i2c/ov8856.c
@@ -3,10 +3,13 @@
 
 #include <asm/unaligned.h>
 #include <linux/acpi.h>
+#include <linux/clk.h>
 #include <linux/delay.h>
+#include <linux/gpio/consumer.h>
 #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>
@@ -18,7 +21,7 @@
 #define OV8856_LINK_FREQ_360MHZ                360000000ULL
 #define OV8856_LINK_FREQ_180MHZ                180000000ULL
 #define OV8856_SCLK                    144000000ULL
-#define OV8856_MCLK                    19200000
+#define OV8856_XVCLK_19_2              19200000
 #define OV8856_DATA_LANES              4
 #define OV8856_RGB_DEPTH               10
 
@@ -64,6 +67,12 @@
 
 #define to_ov8856(_sd)                 container_of(_sd, struct ov8856, sd)
 
+static const char * const ov8856_supply_names[] = {
+       "dovdd",        /* Digital I/O power */
+       "avdd",         /* Analog power */
+       "dvdd",         /* Digital core power */
+};
+
 enum {
        OV8856_LINK_FREQ_720MBPS,
        OV8856_LINK_FREQ_360MBPS,
@@ -566,6 +575,10 @@ struct ov8856 {
        struct media_pad pad;
        struct v4l2_ctrl_handler ctrl_handler;
 
+       struct clk              *xvclk;
+       struct gpio_desc        *reset_gpio;
+       struct regulator_bulk_data supplies[ARRAY_SIZE(ov8856_supply_names)];
+
        /* V4L2 Controls */
        struct v4l2_ctrl *link_freq;
        struct v4l2_ctrl *pixel_rate;
@@ -908,6 +921,57 @@ static int ov8856_set_stream(struct v4l2_subdev *sd, int enable)
        return ret;
 }
 
+static int __ov8856_power_on(struct ov8856 *ov8856)
+{
+       struct i2c_client *client = v4l2_get_subdevdata(&ov8856->sd);
+       int ret;
+
+       if (is_acpi_node(dev_fwnode(&client->dev)))
+               return 0;
+
+       ret = clk_prepare_enable(ov8856->xvclk);
+       if (ret < 0) {
+               dev_err(&client->dev, "failed to enable xvclk\n");
+               return ret;
+       }
+
+       if (ov8856->reset_gpio) {
+               gpiod_set_value_cansleep(ov8856->reset_gpio, 1);
+               usleep_range(1000, 2000);
+       }
+
+       ret = regulator_bulk_enable(ARRAY_SIZE(ov8856_supply_names),
+                                   ov8856->supplies);
+       if (ret < 0) {
+               dev_err(&client->dev, "failed to enable regulators\n");
+               goto disable_clk;
+       }
+
+       gpiod_set_value_cansleep(ov8856->reset_gpio, 0);
+       usleep_range(1500, 1800);
+
+       return 0;
+
+disable_clk:
+       gpiod_set_value_cansleep(ov8856->reset_gpio, 1);
+       clk_disable_unprepare(ov8856->xvclk);
+
+       return ret;
+}
+
+static void __ov8856_power_off(struct ov8856 *ov8856)
+{
+       struct i2c_client *client = v4l2_get_subdevdata(&ov8856->sd);
+
+       if (is_acpi_node(dev_fwnode(&client->dev)))
+               return;
+
+       gpiod_set_value_cansleep(ov8856->reset_gpio, 1);
+       regulator_bulk_disable(ARRAY_SIZE(ov8856_supply_names),
+                              ov8856->supplies);
+       clk_disable_unprepare(ov8856->xvclk);
+}
+
 static int __maybe_unused ov8856_suspend(struct device *dev)
 {
        struct i2c_client *client = to_i2c_client(dev);
@@ -918,6 +982,7 @@ static int __maybe_unused ov8856_suspend(struct device *dev)
        if (ov8856->streaming)
                ov8856_stop_streaming(ov8856);
 
+       __ov8856_power_off(ov8856);
        mutex_unlock(&ov8856->mutex);
 
        return 0;
@@ -931,6 +996,8 @@ static int __maybe_unused ov8856_resume(struct device *dev)
        int ret;
 
        mutex_lock(&ov8856->mutex);
+
+       __ov8856_power_on(ov8856);
        if (ov8856->streaming) {
                ret = ov8856_start_streaming(ov8856);
                if (ret) {
@@ -1092,29 +1159,53 @@ static int ov8856_identify_module(struct ov8856 *ov8856)
        return 0;
 }
 
-static int ov8856_check_hwcfg(struct device *dev)
+static int ov8856_get_hwcfg(struct ov8856 *ov8856, struct device *dev)
 {
        struct fwnode_handle *ep;
        struct fwnode_handle *fwnode = dev_fwnode(dev);
        struct v4l2_fwnode_endpoint bus_cfg = {
                .bus_type = V4L2_MBUS_CSI2_DPHY
        };
-       u32 mclk;
+       u32 xvclk_rate;
        int ret;
        unsigned int i, j;
 
        if (!fwnode)
                return -ENXIO;
 
-       ret = fwnode_property_read_u32(fwnode, "clock-frequency", &mclk);
+       ret = fwnode_property_read_u32(fwnode, "clock-frequency", &xvclk_rate);
        if (ret)
                return ret;
 
-       if (mclk != OV8856_MCLK) {
-               dev_err(dev, "external clock %d is not supported", mclk);
-               return -EINVAL;
+       if (!is_acpi_node(fwnode)) {
+               ov8856->xvclk = devm_clk_get(dev, "xvclk");
+               if (IS_ERR(ov8856->xvclk)) {
+                       dev_err(dev, "could not get xvclk clock (%pe)\n",
+                               ov8856->xvclk);
+                       return PTR_ERR(ov8856->xvclk);
+               }
+
+               clk_set_rate(ov8856->xvclk, xvclk_rate);
+               xvclk_rate = clk_get_rate(ov8856->xvclk);
        }
 
+       if (xvclk_rate != OV8856_XVCLK_19_2)
+               dev_warn(dev, "external clock rate %u is unsupported",
+                        xvclk_rate);
+
+       ov8856->reset_gpio = devm_gpiod_get_optional(dev, "reset",
+                                                    GPIOD_OUT_LOW);
+       if (IS_ERR(ov8856->reset_gpio))
+               return PTR_ERR(ov8856->reset_gpio);
+
+       for (i = 0; i < ARRAY_SIZE(ov8856_supply_names); i++)
+               ov8856->supplies[i].supply = ov8856_supply_names[i];
+
+       ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ov8856_supply_names),
+                                     ov8856->supplies);
+       if (ret)
+               return ret;
+
        ep = fwnode_graph_get_next_endpoint(fwnode, NULL);
        if (!ep)
                return -ENXIO;
@@ -1169,6 +1260,8 @@ static int ov8856_remove(struct i2c_client *client)
        pm_runtime_disable(&client->dev);
        mutex_destroy(&ov8856->mutex);
 
+       __ov8856_power_off(ov8856);
+
        return 0;
 }
 
@@ -1177,22 +1270,29 @@ static int ov8856_probe(struct i2c_client *client)
        struct ov8856 *ov8856;
        int ret;
 
-       ret = ov8856_check_hwcfg(&client->dev);
+       ov8856 = devm_kzalloc(&client->dev, sizeof(*ov8856), GFP_KERNEL);
+       if (!ov8856)
+               return -ENOMEM;
+
+       ret = ov8856_get_hwcfg(ov8856, &client->dev);
        if (ret) {
-               dev_err(&client->dev, "failed to check HW configuration: %d",
+               dev_err(&client->dev, "failed to get HW configuration: %d",
                        ret);
                return ret;
        }
 
-       ov8856 = devm_kzalloc(&client->dev, sizeof(*ov8856), GFP_KERNEL);
-       if (!ov8856)
-               return -ENOMEM;
-
        v4l2_i2c_subdev_init(&ov8856->sd, client, &ov8856_subdev_ops);
+
+       ret = __ov8856_power_on(ov8856);
+       if (ret) {
+               dev_err(&client->dev, "failed to power on\n");
+               return ret;
+       }
+
        ret = ov8856_identify_module(ov8856);
        if (ret) {
                dev_err(&client->dev, "failed to find sensor: %d", ret);
-               return ret;
+               goto probe_power_off;
        }
 
        mutex_init(&ov8856->mutex);
@@ -1238,6 +1338,9 @@ probe_error_v4l2_ctrl_handler_free:
        v4l2_ctrl_handler_free(ov8856->sd.ctrl_handler);
        mutex_destroy(&ov8856->mutex);
 
+probe_power_off:
+       __ov8856_power_off(ov8856);
+
        return ret;
 }
 
@@ -1254,11 +1357,18 @@ static const struct acpi_device_id ov8856_acpi_ids[] = {
 MODULE_DEVICE_TABLE(acpi, ov8856_acpi_ids);
 #endif
 
+static const struct of_device_id ov8856_of_match[] = {
+       { .compatible = "ovti,ov8856" },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, ov8856_of_match);
+
 static struct i2c_driver ov8856_i2c_driver = {
        .driver = {
                .name = "ov8856",
                .pm = &ov8856_pm_ops,
                .acpi_match_table = ACPI_PTR(ov8856_acpi_ids),
+               .of_match_table = ov8856_of_match,
        },
        .probe_new = ov8856_probe,
        .remove = ov8856_remove,