| Message ID | 20200310134603.30260-3-robert.foss@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: ov8856: Add sensor modes & devicetree support | expand |
On Tue, Mar 10, 2020 at 10:47 AM Robert Foss <robert.foss@linaro.org> wrote: > +static int __ov8856_power_on(struct ov8856 *ov8856) > +{ > + struct i2c_client *client = v4l2_get_subdevdata(&ov8856->sd); > + int ret; > + > + ret = clk_prepare_enable(ov8856->xvclk); > + if (ret < 0) { > + dev_err(&client->dev, "failed to enable xvclk\n"); > + return ret; > + } > + > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > + > + ret = regulator_bulk_enable(OV8856_NUM_SUPPLIES, ov8856->supplies); > + if (ret < 0) { > + dev_err(&client->dev, "failed to enable regulators\n"); > + goto disable_clk; > + } > + > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_HIGH); To power it up you probably only need: gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, 0); And use reset-gpios as active low in your device tree. Assuming the reset-gpios is active low like other OmniVision sensors. > + > + usleep_range(1500, 1800); > + > + return 0; > + > +disable_clk: > + clk_disable_unprepare(ov8856->xvclk); > + > + return ret; > +} > + > +static void __ov8856_power_off(struct ov8856 *ov8856) > +{ > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > + regulator_bulk_disable(OV8856_NUM_SUPPLIES, ov8856->supplies); > + clk_disable_unprepare(ov8856->xvclk); > +} > + > + Unneede extra blank line. > v4l2_i2c_subdev_init(&ov8856->sd, client, &ov8856_subdev_ops); > + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); > + if (IS_ERR(ov8856->xvclk)) { > + dev_err(&client->dev, "failed to get xvclk\n"); > + return -EINVAL; You should better return the real error insteald PTR_ERR(ov8856->xvclk). This way defer probe could work. > + } > + > + ret = clk_set_rate(ov8856->xvclk, OV8856_XVCLK_24); > + if (ret < 0) { > + dev_err(&client->dev, "failed to set xvclk rate (24MHz)\n"); > + return ret; > + } > + > + ov8856->n_shutdn_gpio = devm_gpiod_get(&client->dev, "reset", > + GPIOD_OUT_LOW); > + if (IS_ERR(ov8856->n_shutdn_gpio)) { > + dev_err(&client->dev, "failed to get reset-gpios\n"); > + return -EINVAL; Please return the real error.
On Tue, Mar 10, 2020 at 02:46:02PM +0100, Robert Foss wrote: > Add devicetree match table, and enable ov8856_probe() > to initialize power, clocks and reset pins. ... > +#define OV8856_NUM_SUPPLIES ARRAY_SIZE(ov8856_supply_names) Use ARRAY_SIZE() directly. Have you seen Sakari's comments? Sakari, do I have déjà vu or you indeed commented this driver? ... > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_HIGH); Yes, seems this one is inverted. ... > +{ > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > + regulator_bulk_disable(OV8856_NUM_SUPPLIES, ov8856->supplies); > + clk_disable_unprepare(ov8856->xvclk); > +} > + > + One blank line is enough. ... > + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); > + if (IS_ERR(ov8856->xvclk)) { > + dev_err(&client->dev, "failed to get xvclk\n"); > + return -EINVAL; > + } Previously it worked without clock provider, now you make a dependency. This won't work.
On Tue, 10 Mar 2020 at 15:03, Fabio Estevam <festevam@gmail.com> wrote: > > On Tue, Mar 10, 2020 at 10:47 AM Robert Foss <robert.foss@linaro.org> wrote: > > > +static int __ov8856_power_on(struct ov8856 *ov8856) > > +{ > > + struct i2c_client *client = v4l2_get_subdevdata(&ov8856->sd); > > + int ret; > > + > > + ret = clk_prepare_enable(ov8856->xvclk); > > + if (ret < 0) { > > + dev_err(&client->dev, "failed to enable xvclk\n"); > > + return ret; > > + } > > + > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > + > > + ret = regulator_bulk_enable(OV8856_NUM_SUPPLIES, ov8856->supplies); > > + if (ret < 0) { > > + dev_err(&client->dev, "failed to enable regulators\n"); > > + goto disable_clk; > > + } > > + > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_HIGH); > > To power it up you probably only need: > > gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, 0); > > And use reset-gpios as active low in your device tree. Assuming the > reset-gpios is active low like other OmniVision sensors. Ack. > > > + > > + usleep_range(1500, 1800); > > + > > + return 0; > > + > > +disable_clk: > > + clk_disable_unprepare(ov8856->xvclk); > > + > > + return ret; > > +} > > + > > +static void __ov8856_power_off(struct ov8856 *ov8856) > > +{ > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > + regulator_bulk_disable(OV8856_NUM_SUPPLIES, ov8856->supplies); > > + clk_disable_unprepare(ov8856->xvclk); > > +} > > + > > + > > Unneede extra blank line. Ack. > > > v4l2_i2c_subdev_init(&ov8856->sd, client, &ov8856_subdev_ops); > > + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); > > + if (IS_ERR(ov8856->xvclk)) { > > + dev_err(&client->dev, "failed to get xvclk\n"); > > + return -EINVAL; > > You should better return the real error insteald > PTR_ERR(ov8856->xvclk). This way defer probe could work. > Ack. > > + } > > + > > + ret = clk_set_rate(ov8856->xvclk, OV8856_XVCLK_24); > > + if (ret < 0) { > > + dev_err(&client->dev, "failed to set xvclk rate (24MHz)\n"); > > + return ret; > > + } > > + > > + ov8856->n_shutdn_gpio = devm_gpiod_get(&client->dev, "reset", > > + GPIOD_OUT_LOW); > > + if (IS_ERR(ov8856->n_shutdn_gpio)) { > > + dev_err(&client->dev, "failed to get reset-gpios\n"); > > + return -EINVAL; > > Please return the real error. Ack.
Hi Andy, On Tue, 10 Mar 2020 at 15:26, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Tue, Mar 10, 2020 at 02:46:02PM +0100, Robert Foss wrote: > > Add devicetree match table, and enable ov8856_probe() > > to initialize power, clocks and reset pins. > > ... > > > +#define OV8856_NUM_SUPPLIES ARRAY_SIZE(ov8856_supply_names) > > Use ARRAY_SIZE() directly. Ack. > > Have you seen Sakari's comments? > Sakari, do I have déją vu or you indeed commented this driver? Yes, I may have missed some part of it, so please tell me if I have. There is a patchset floating around that implements a larger chunk of functionality, including a couple of new modes. This is based on that series. > > ... > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_HIGH); > > Yes, seems this one is inverted. > > ... > > > +{ > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > + regulator_bulk_disable(OV8856_NUM_SUPPLIES, ov8856->supplies); > > + clk_disable_unprepare(ov8856->xvclk); > > +} > > + > > + > > One blank line is enough. > > ... > > > + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); > > + if (IS_ERR(ov8856->xvclk)) { > > + dev_err(&client->dev, "failed to get xvclk\n"); > > + return -EINVAL; > > + } > > Previously it worked without clock provider, now you make a dependency. > > This won't work. So the ideal behavior would be to only use the xclk if it is provided?
On Tue, Mar 10, 2020 at 04:55:20PM +0100, Robert Foss wrote: > On Tue, 10 Mar 2020 at 15:26, Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > On Tue, Mar 10, 2020 at 02:46:02PM +0100, Robert Foss wrote: ... > > > + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); > > > + if (IS_ERR(ov8856->xvclk)) { > > > + dev_err(&client->dev, "failed to get xvclk\n"); > > > + return -EINVAL; > > > + } > > > > Previously it worked without clock provider, now you make a dependency. > > > > This won't work. > > So the ideal behavior would be to only use the xclk if it is provided? Yes, make it optional.
Hi Robert, On Tue, Mar 10, 2020 at 04:55:20PM +0100, Robert Foss wrote: > Hi Andy, > > On Tue, 10 Mar 2020 at 15:26, Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > > > On Tue, Mar 10, 2020 at 02:46:02PM +0100, Robert Foss wrote: > > > Add devicetree match table, and enable ov8856_probe() > > > to initialize power, clocks and reset pins. > > > > ... > > > > > +#define OV8856_NUM_SUPPLIES ARRAY_SIZE(ov8856_supply_names) > > > > Use ARRAY_SIZE() directly. > > Ack. > > > > > Have you seen Sakari's comments? > > Sakari, do I have déją vu or you indeed commented this driver? > > Yes, I may have missed some part of it, so please tell me if I have. > > There is a patchset floating around that implements a larger chunk of > functionality, > including a couple of new modes. This is based on that series. Please see earlier comments given against an earlier variant of this set. They're on LMML. > > > > > ... > > > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_HIGH); > > > > Yes, seems this one is inverted. > > > > ... > > > > > +{ > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > > + regulator_bulk_disable(OV8856_NUM_SUPPLIES, ov8856->supplies); > > > + clk_disable_unprepare(ov8856->xvclk); > > > +} > > > + > > > + > > > > One blank line is enough. > > > > ... > > > > > + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); > > > + if (IS_ERR(ov8856->xvclk)) { > > > + dev_err(&client->dev, "failed to get xvclk\n"); > > > + return -EINVAL; > > > + } > > > > Previously it worked without clock provider, now you make a dependency. > > > > This won't work. > > So the ideal behavior would be to only use the xclk if it is provided? See e.g. the smiapp driver on how to do this so it continues to work on ACPI. I think it'd be also appropriate to add the usleep() after lifting reset only if the reset GPIO is defined for the device. Also do consider dropping some people from the distribution. For many this is just noise.
Hey Sakari, On Wed, 11 Mar 2020 at 12:49, Sakari Ailus <sakari.ailus@iki.fi> wrote: > > Hi Robert, > > On Tue, Mar 10, 2020 at 04:55:20PM +0100, Robert Foss wrote: > > Hi Andy, > > > > On Tue, 10 Mar 2020 at 15:26, Andy Shevchenko > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > > On Tue, Mar 10, 2020 at 02:46:02PM +0100, Robert Foss wrote: > > > > Add devicetree match table, and enable ov8856_probe() > > > > to initialize power, clocks and reset pins. > > > > > > ... > > > > > > > +#define OV8856_NUM_SUPPLIES ARRAY_SIZE(ov8856_supply_names) > > > > > > Use ARRAY_SIZE() directly. > > > > Ack. > > > > > > > > Have you seen Sakari's comments? > > > Sakari, do I have déją vu or you indeed commented this driver? > > > > Yes, I may have missed some part of it, so please tell me if I have. > > > > There is a patchset floating around that implements a larger chunk of > > functionality, > > including a couple of new modes. This is based on that series. > > Please see earlier comments given against an earlier variant of this set. > They're on LMML. > > > > > > > > > ... > > > > > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > > > > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_HIGH); > > > > > > Yes, seems this one is inverted. > > > > > > ... > > > > > > > +{ > > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > > > + regulator_bulk_disable(OV8856_NUM_SUPPLIES, ov8856->supplies); > > > > + clk_disable_unprepare(ov8856->xvclk); > > > > +} > > > > + > > > > + > > > > > > One blank line is enough. > > > > > > ... > > > > > > > + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); > > > > + if (IS_ERR(ov8856->xvclk)) { > > > > + dev_err(&client->dev, "failed to get xvclk\n"); > > > > + return -EINVAL; > > > > + } > > > > > > Previously it worked without clock provider, now you make a dependency. > > > > > > This won't work. > > > > So the ideal behavior would be to only use the xclk if it is provided? > > See e.g. the smiapp driver on how to do this so it continues to work on > ACPI. Thanks for the pointer! > > I think it'd be also appropriate to add the usleep() after lifting reset > only if the reset GPIO is defined for the device. Ack
On Wed, Mar 11, 2020 at 02:32:30PM +0100, Robert Foss wrote: > Hey Sakari, > > On Wed, 11 Mar 2020 at 12:49, Sakari Ailus <sakari.ailus@iki.fi> wrote: > > > > Hi Robert, > > > > On Tue, Mar 10, 2020 at 04:55:20PM +0100, Robert Foss wrote: > > > Hi Andy, > > > > > > On Tue, 10 Mar 2020 at 15:26, Andy Shevchenko > > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > > > > On Tue, Mar 10, 2020 at 02:46:02PM +0100, Robert Foss wrote: > > > > > Add devicetree match table, and enable ov8856_probe() > > > > > to initialize power, clocks and reset pins. > > > > > > > > ... > > > > > > > > > +#define OV8856_NUM_SUPPLIES ARRAY_SIZE(ov8856_supply_names) > > > > > > > > Use ARRAY_SIZE() directly. > > > > > > Ack. > > > > > > > > > > > Have you seen Sakari's comments? > > > > Sakari, do I have déją vu or you indeed commented this driver? > > > > > > Yes, I may have missed some part of it, so please tell me if I have. > > > > > > There is a patchset floating around that implements a larger chunk of > > > functionality, > > > including a couple of new modes. This is based on that series. > > > > Please see earlier comments given against an earlier variant of this set. > > They're on LMML. > > > > > > > > > > > > > ... > > > > > > > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > > > > > > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_HIGH); > > > > > > > > Yes, seems this one is inverted. > > > > > > > > ... > > > > > > > > > +{ > > > > > + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); > > > > > + regulator_bulk_disable(OV8856_NUM_SUPPLIES, ov8856->supplies); > > > > > + clk_disable_unprepare(ov8856->xvclk); > > > > > +} > > > > > + > > > > > + > > > > > > > > One blank line is enough. > > > > > > > > ... > > > > > > > > > + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); > > > > > + if (IS_ERR(ov8856->xvclk)) { > > > > > + dev_err(&client->dev, "failed to get xvclk\n"); > > > > > + return -EINVAL; > > > > > + } > > > > > > > > Previously it worked without clock provider, now you make a dependency. > > > > > > > > This won't work. > > > > > > So the ideal behavior would be to only use the xclk if it is provided? > > > > See e.g. the smiapp driver on how to do this so it continues to work on > > ACPI. > > Thanks for the pointer! > > > > > I think it'd be also appropriate to add the usleep() after lifting reset > > only if the reset GPIO is defined for the device. > > Ack On second thought, that probably applies if any of the resources needed for powering the device on are defined. It could be that there's no reset GPIO but a regulator is still there, in which case a delay is needed.
diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c index 8655842af275..1769acdfaa44 100644 --- 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> @@ -19,6 +22,8 @@ #define OV8856_LINK_FREQ_180MHZ 180000000ULL #define OV8856_SCLK 144000000ULL #define OV8856_MCLK 19200000 +#define OV8856_XVCLK_19_2 19200000 +#define OV8856_XVCLK_24 24000000 #define OV8856_DATA_LANES 4 #define OV8856_RGB_DEPTH 10 @@ -64,6 +69,14 @@ #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 */ +}; + +#define OV8856_NUM_SUPPLIES ARRAY_SIZE(ov8856_supply_names) + enum { OV8856_LINK_FREQ_720MBPS, OV8856_LINK_FREQ_360MBPS, @@ -566,6 +579,10 @@ struct ov8856 { struct media_pad pad; struct v4l2_ctrl_handler ctrl_handler; + struct clk *xvclk; + struct gpio_desc *n_shutdn_gpio; + struct regulator_bulk_data supplies[OV8856_NUM_SUPPLIES]; + /* V4L2 Controls */ struct v4l2_ctrl *link_freq; struct v4l2_ctrl *pixel_rate; @@ -908,6 +925,45 @@ 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; + + ret = clk_prepare_enable(ov8856->xvclk); + if (ret < 0) { + dev_err(&client->dev, "failed to enable xvclk\n"); + return ret; + } + + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); + + ret = regulator_bulk_enable(OV8856_NUM_SUPPLIES, ov8856->supplies); + if (ret < 0) { + dev_err(&client->dev, "failed to enable regulators\n"); + goto disable_clk; + } + + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_HIGH); + + usleep_range(1500, 1800); + + return 0; + +disable_clk: + clk_disable_unprepare(ov8856->xvclk); + + return ret; +} + +static void __ov8856_power_off(struct ov8856 *ov8856) +{ + gpiod_set_value_cansleep(ov8856->n_shutdn_gpio, GPIOD_OUT_LOW); + regulator_bulk_disable(OV8856_NUM_SUPPLIES, ov8856->supplies); + clk_disable_unprepare(ov8856->xvclk); +} + + static int __maybe_unused ov8856_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -1175,7 +1231,7 @@ static int ov8856_remove(struct i2c_client *client) static int ov8856_probe(struct i2c_client *client) { struct ov8856 *ov8856; - int ret; + int i, ret; ret = ov8856_check_hwcfg(&client->dev); if (ret) { @@ -1189,10 +1245,45 @@ static int ov8856_probe(struct i2c_client *client) return -ENOMEM; v4l2_i2c_subdev_init(&ov8856->sd, client, &ov8856_subdev_ops); + ov8856->xvclk = devm_clk_get(&client->dev, "xvclk"); + if (IS_ERR(ov8856->xvclk)) { + dev_err(&client->dev, "failed to get xvclk\n"); + return -EINVAL; + } + + ret = clk_set_rate(ov8856->xvclk, OV8856_XVCLK_24); + if (ret < 0) { + dev_err(&client->dev, "failed to set xvclk rate (24MHz)\n"); + return ret; + } + + ov8856->n_shutdn_gpio = devm_gpiod_get(&client->dev, "reset", + GPIOD_OUT_LOW); + if (IS_ERR(ov8856->n_shutdn_gpio)) { + dev_err(&client->dev, "failed to get reset-gpios\n"); + return -EINVAL; + } + + for (i = 0; i < OV8856_NUM_SUPPLIES; i++) + ov8856->supplies[i].supply = ov8856_supply_names[i]; + + ret = devm_regulator_bulk_get(&client->dev, OV8856_NUM_SUPPLIES, + ov8856->supplies); + if (ret) { + dev_warn(&client->dev, "failed to get regulators\n"); + return ret; + } + + ret = __ov8856_power_on(ov8856); + if (ret) { + dev_warn(&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 +1329,9 @@ static int ov8856_probe(struct i2c_client *client) v4l2_ctrl_handler_free(ov8856->sd.ctrl_handler); mutex_destroy(&ov8856->mutex); +probe_power_off: + __ov8856_power_off(ov8856); + return ret; } @@ -1254,11 +1348,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,
Add devicetree match table, and enable ov8856_probe() to initialize power, clocks and reset pins. Signed-off-by: Robert Foss <robert.foss@linaro.org> --- drivers/media/i2c/ov8856.c | 105 ++++++++++++++++++++++++++++++++++++- 1 file changed, 103 insertions(+), 2 deletions(-)