* [PATCH 0/2] media: ov7670: Add entity init and power operation @ 2017-08-10 9:06 Wenyou Yang 2017-08-10 9:06 ` [PATCH 1/2] media: ov7670: Add entity pads initialization Wenyou Yang 2017-08-10 9:06 ` [PATCH 2/2] media: ov7670: Add the s_power operation Wenyou Yang 0 siblings, 2 replies; 6+ messages in thread From: Wenyou Yang @ 2017-08-10 9:06 UTC (permalink / raw) To: Jonathan Corbet Cc: Nicolas Ferre, linux-kernel, linux-arm-kernel, Linux Media Mailing List, Mauro Carvalho Chehab, Wenyou Yang This patch set is to add the media entity pads initialization and add the s_power operation. Wenyou Yang (2): media: ov7670: Add entity pads initialization media: ov7670: Add the s_power operation drivers/media/i2c/ov7670.c | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) -- 2.13.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] media: ov7670: Add entity pads initialization 2017-08-10 9:06 [PATCH 0/2] media: ov7670: Add entity init and power operation Wenyou Yang @ 2017-08-10 9:06 ` Wenyou Yang 2017-08-15 16:23 ` Sakari Ailus 2017-08-10 9:06 ` [PATCH 2/2] media: ov7670: Add the s_power operation Wenyou Yang 1 sibling, 1 reply; 6+ messages in thread From: Wenyou Yang @ 2017-08-10 9:06 UTC (permalink / raw) To: Jonathan Corbet Cc: Nicolas Ferre, linux-kernel, linux-arm-kernel, Linux Media Mailing List, Mauro Carvalho Chehab, Wenyou Yang Add the media entity pads initialization. Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com> --- drivers/media/i2c/ov7670.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c index e88549f0e704..5c8460ee65c3 100644 --- a/drivers/media/i2c/ov7670.c +++ b/drivers/media/i2c/ov7670.c @@ -213,6 +213,7 @@ struct ov7670_devtype { struct ov7670_format_struct; /* coming later */ struct ov7670_info { struct v4l2_subdev sd; + struct media_pad pad; struct v4l2_ctrl_handler hdl; struct { /* gain cluster */ @@ -1688,14 +1689,23 @@ static int ov7670_probe(struct i2c_client *client, v4l2_ctrl_auto_cluster(2, &info->auto_exposure, V4L2_EXPOSURE_MANUAL, false); v4l2_ctrl_cluster(2, &info->saturation); + + info->pad.flags = MEDIA_PAD_FL_SOURCE; + info->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; + ret = media_entity_pads_init(&info->sd.entity, 1, &info->pad); + if (ret < 0) + goto hdl_free; + v4l2_ctrl_handler_setup(&info->hdl); ret = v4l2_async_register_subdev(&info->sd); if (ret < 0) - goto hdl_free; + goto entity_cleanup; return 0; +entity_cleanup: + media_entity_cleanup(&info->sd.entity); hdl_free: v4l2_ctrl_handler_free(&info->hdl); clk_disable: @@ -1712,6 +1722,7 @@ static int ov7670_remove(struct i2c_client *client) v4l2_device_unregister_subdev(sd); v4l2_ctrl_handler_free(&info->hdl); clk_disable_unprepare(info->clk); + media_entity_cleanup(&info->sd.entity); return 0; } -- 2.13.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] media: ov7670: Add entity pads initialization 2017-08-10 9:06 ` [PATCH 1/2] media: ov7670: Add entity pads initialization Wenyou Yang @ 2017-08-15 16:23 ` Sakari Ailus 2017-08-17 1:38 ` Yang, Wenyou 0 siblings, 1 reply; 6+ messages in thread From: Sakari Ailus @ 2017-08-15 16:23 UTC (permalink / raw) To: Wenyou Yang Cc: Jonathan Corbet, Nicolas Ferre, linux-kernel, linux-arm-kernel, Linux Media Mailing List, Mauro Carvalho Chehab Hi Wenyou, On Thu, Aug 10, 2017 at 05:06:44PM +0800, Wenyou Yang wrote: > Add the media entity pads initialization. > > Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com> The patch itself seems fine. However the driver is lacking support for get_fmt which I think would be necessary for the user space API to work properly. Without sub-device nodes it might not have been an issue with certain master drivers. Could you add that in v2, in a separate patch before this one, please? > --- > > drivers/media/i2c/ov7670.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c > index e88549f0e704..5c8460ee65c3 100644 > --- a/drivers/media/i2c/ov7670.c > +++ b/drivers/media/i2c/ov7670.c > @@ -213,6 +213,7 @@ struct ov7670_devtype { > struct ov7670_format_struct; /* coming later */ > struct ov7670_info { > struct v4l2_subdev sd; > + struct media_pad pad; > struct v4l2_ctrl_handler hdl; > struct { > /* gain cluster */ > @@ -1688,14 +1689,23 @@ static int ov7670_probe(struct i2c_client *client, > v4l2_ctrl_auto_cluster(2, &info->auto_exposure, > V4L2_EXPOSURE_MANUAL, false); > v4l2_ctrl_cluster(2, &info->saturation); > + > + info->pad.flags = MEDIA_PAD_FL_SOURCE; > + info->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; > + ret = media_entity_pads_init(&info->sd.entity, 1, &info->pad); > + if (ret < 0) > + goto hdl_free; > + > v4l2_ctrl_handler_setup(&info->hdl); > > ret = v4l2_async_register_subdev(&info->sd); > if (ret < 0) > - goto hdl_free; > + goto entity_cleanup; > > return 0; > > +entity_cleanup: > + media_entity_cleanup(&info->sd.entity); > hdl_free: > v4l2_ctrl_handler_free(&info->hdl); > clk_disable: > @@ -1712,6 +1722,7 @@ static int ov7670_remove(struct i2c_client *client) > v4l2_device_unregister_subdev(sd); > v4l2_ctrl_handler_free(&info->hdl); > clk_disable_unprepare(info->clk); > + media_entity_cleanup(&info->sd.entity); > return 0; > } > > -- > 2.13.0 > -- Sakari Ailus e-mail: sakari.ailus@iki.fi ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] media: ov7670: Add entity pads initialization 2017-08-15 16:23 ` Sakari Ailus @ 2017-08-17 1:38 ` Yang, Wenyou 0 siblings, 0 replies; 6+ messages in thread From: Yang, Wenyou @ 2017-08-17 1:38 UTC (permalink / raw) To: Sakari Ailus Cc: Jonathan Corbet, Nicolas Ferre, linux-kernel, linux-arm-kernel, Linux Media Mailing List, Mauro Carvalho Chehab Hi Sakari, On 2017/8/16 0:23, Sakari Ailus wrote: > Hi Wenyou, > > On Thu, Aug 10, 2017 at 05:06:44PM +0800, Wenyou Yang wrote: >> Add the media entity pads initialization. >> >> Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com> > The patch itself seems fine. However the driver is lacking support for > get_fmt which I think would be necessary for the user space API to work > properly. Without sub-device nodes it might not have been an issue with > certain master drivers. > > Could you add that in v2, in a separate patch before this one, please? Okay, I will do. Thank you for your review. > >> --- >> >> drivers/media/i2c/ov7670.c | 13 ++++++++++++- >> 1 file changed, 12 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c >> index e88549f0e704..5c8460ee65c3 100644 >> --- a/drivers/media/i2c/ov7670.c >> +++ b/drivers/media/i2c/ov7670.c >> @@ -213,6 +213,7 @@ struct ov7670_devtype { >> struct ov7670_format_struct; /* coming later */ >> struct ov7670_info { >> struct v4l2_subdev sd; >> + struct media_pad pad; >> struct v4l2_ctrl_handler hdl; >> struct { >> /* gain cluster */ >> @@ -1688,14 +1689,23 @@ static int ov7670_probe(struct i2c_client *client, >> v4l2_ctrl_auto_cluster(2, &info->auto_exposure, >> V4L2_EXPOSURE_MANUAL, false); >> v4l2_ctrl_cluster(2, &info->saturation); >> + >> + info->pad.flags = MEDIA_PAD_FL_SOURCE; >> + info->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; >> + ret = media_entity_pads_init(&info->sd.entity, 1, &info->pad); >> + if (ret < 0) >> + goto hdl_free; >> + >> v4l2_ctrl_handler_setup(&info->hdl); >> >> ret = v4l2_async_register_subdev(&info->sd); >> if (ret < 0) >> - goto hdl_free; >> + goto entity_cleanup; >> >> return 0; >> >> +entity_cleanup: >> + media_entity_cleanup(&info->sd.entity); >> hdl_free: >> v4l2_ctrl_handler_free(&info->hdl); >> clk_disable: >> @@ -1712,6 +1722,7 @@ static int ov7670_remove(struct i2c_client *client) >> v4l2_device_unregister_subdev(sd); >> v4l2_ctrl_handler_free(&info->hdl); >> clk_disable_unprepare(info->clk); >> + media_entity_cleanup(&info->sd.entity); >> return 0; >> } >> >> -- >> 2.13.0 >> Best Regards, Wenyou Yang ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] media: ov7670: Add the s_power operation 2017-08-10 9:06 [PATCH 0/2] media: ov7670: Add entity init and power operation Wenyou Yang 2017-08-10 9:06 ` [PATCH 1/2] media: ov7670: Add entity pads initialization Wenyou Yang @ 2017-08-10 9:06 ` Wenyou Yang 2017-08-15 16:36 ` Sakari Ailus 1 sibling, 1 reply; 6+ messages in thread From: Wenyou Yang @ 2017-08-10 9:06 UTC (permalink / raw) To: Jonathan Corbet Cc: Nicolas Ferre, linux-kernel, linux-arm-kernel, Linux Media Mailing List, Mauro Carvalho Chehab, Wenyou Yang Add the s_power operation which is responsible for manipulating the power dowm mode through the PWDN pin and the reset operation through the RESET pin. Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com> --- drivers/media/i2c/ov7670.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c index 5c8460ee65c3..5ed79ccfaf91 100644 --- a/drivers/media/i2c/ov7670.c +++ b/drivers/media/i2c/ov7670.c @@ -1506,6 +1506,22 @@ static int ov7670_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regis } #endif +static int ov7670_s_power(struct v4l2_subdev *sd, int on) +{ + struct ov7670_info *info = to_state(sd); + + if (info->pwdn_gpio) + gpiod_direction_output(info->pwdn_gpio, !on); + if (on && info->resetb_gpio) { + gpiod_set_value(info->resetb_gpio, 1); + usleep_range(500, 1000); + gpiod_set_value(info->resetb_gpio, 0); + usleep_range(3000, 5000); + } + + return 0; +} + /* ----------------------------------------------------------------------- */ static const struct v4l2_subdev_core_ops ov7670_core_ops = { @@ -1515,6 +1531,7 @@ static const struct v4l2_subdev_core_ops ov7670_core_ops = { .g_register = ov7670_g_register, .s_register = ov7670_s_register, #endif + .s_power = ov7670_s_power, }; static const struct v4l2_subdev_video_ops ov7670_video_ops = { @@ -1568,8 +1585,6 @@ static int ov7670_init_gpio(struct i2c_client *client, struct ov7670_info *info) return PTR_ERR(info->resetb_gpio); } - usleep_range(3000, 5000); - return 0; } @@ -1630,13 +1645,19 @@ static int ov7670_probe(struct i2c_client *client, goto clk_disable; } + ret = ov7670_init_gpio(client, info); + if (ret) + goto clk_disable; + + ov7670_s_power(sd, 1); + /* Make sure it's an ov7670 */ ret = ov7670_detect(sd); if (ret) { v4l_dbg(1, debug, client, "chip found @ 0x%x (%s) is not an ov7670 chip.\n", client->addr << 1, client->adapter->name); - goto clk_disable; + goto power_off; } v4l_info(client, "chip found @ 0x%02x (%s)\n", client->addr << 1, client->adapter->name); @@ -1708,6 +1729,8 @@ static int ov7670_probe(struct i2c_client *client, media_entity_cleanup(&info->sd.entity); hdl_free: v4l2_ctrl_handler_free(&info->hdl); +power_off: + ov7670_s_power(sd, 0); clk_disable: clk_disable_unprepare(info->clk); return ret; @@ -1723,6 +1746,7 @@ static int ov7670_remove(struct i2c_client *client) v4l2_ctrl_handler_free(&info->hdl); clk_disable_unprepare(info->clk); media_entity_cleanup(&info->sd.entity); + ov7670_s_power(sd, 0); return 0; } -- 2.13.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] media: ov7670: Add the s_power operation 2017-08-10 9:06 ` [PATCH 2/2] media: ov7670: Add the s_power operation Wenyou Yang @ 2017-08-15 16:36 ` Sakari Ailus 0 siblings, 0 replies; 6+ messages in thread From: Sakari Ailus @ 2017-08-15 16:36 UTC (permalink / raw) To: Wenyou Yang Cc: Jonathan Corbet, Nicolas Ferre, linux-kernel, linux-arm-kernel, Linux Media Mailing List, Mauro Carvalho Chehab Hi Wenyou, On Thu, Aug 10, 2017 at 05:06:45PM +0800, Wenyou Yang wrote: > Add the s_power operation which is responsible for manipulating the > power dowm mode through the PWDN pin and the reset operation through > the RESET pin. > > Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com> > --- > > drivers/media/i2c/ov7670.c | 30 +++++++++++++++++++++++++++--- > 1 file changed, 27 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c > index 5c8460ee65c3..5ed79ccfaf91 100644 > --- a/drivers/media/i2c/ov7670.c > +++ b/drivers/media/i2c/ov7670.c > @@ -1506,6 +1506,22 @@ static int ov7670_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regis > } > #endif > > +static int ov7670_s_power(struct v4l2_subdev *sd, int on) > +{ > + struct ov7670_info *info = to_state(sd); > + > + if (info->pwdn_gpio) > + gpiod_direction_output(info->pwdn_gpio, !on); gpiod_direction_output() can cope with NULL gpio_desc. > + if (on && info->resetb_gpio) { > + gpiod_set_value(info->resetb_gpio, 1); > + usleep_range(500, 1000); > + gpiod_set_value(info->resetb_gpio, 0); > + usleep_range(3000, 5000); > + } > + > + return 0; > +} > + > /* ----------------------------------------------------------------------- */ > > static const struct v4l2_subdev_core_ops ov7670_core_ops = { > @@ -1515,6 +1531,7 @@ static const struct v4l2_subdev_core_ops ov7670_core_ops = { > .g_register = ov7670_g_register, > .s_register = ov7670_s_register, > #endif > + .s_power = ov7670_s_power, > }; > > static const struct v4l2_subdev_video_ops ov7670_video_ops = { > @@ -1568,8 +1585,6 @@ static int ov7670_init_gpio(struct i2c_client *client, struct ov7670_info *info) > return PTR_ERR(info->resetb_gpio); > } > > - usleep_range(3000, 5000); > - > return 0; > } > > @@ -1630,13 +1645,19 @@ static int ov7670_probe(struct i2c_client *client, > goto clk_disable; > } > > + ret = ov7670_init_gpio(client, info); ov7670_init_gpio() is already called a few lines above this. Was this intended? > + if (ret) > + goto clk_disable; > + > + ov7670_s_power(sd, 1); > + > /* Make sure it's an ov7670 */ > ret = ov7670_detect(sd); > if (ret) { > v4l_dbg(1, debug, client, > "chip found @ 0x%x (%s) is not an ov7670 chip.\n", > client->addr << 1, client->adapter->name); > - goto clk_disable; > + goto power_off; > } > v4l_info(client, "chip found @ 0x%02x (%s)\n", > client->addr << 1, client->adapter->name); > @@ -1708,6 +1729,8 @@ static int ov7670_probe(struct i2c_client *client, > media_entity_cleanup(&info->sd.entity); > hdl_free: > v4l2_ctrl_handler_free(&info->hdl); > +power_off: > + ov7670_s_power(sd, 0); > clk_disable: > clk_disable_unprepare(info->clk); > return ret; > @@ -1723,6 +1746,7 @@ static int ov7670_remove(struct i2c_client *client) > v4l2_ctrl_handler_free(&info->hdl); > clk_disable_unprepare(info->clk); > media_entity_cleanup(&info->sd.entity); > + ov7670_s_power(sd, 0); > return 0; > } > -- Sakari Ailus e-mail: sakari.ailus@iki.fi ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-17 1:38 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-08-10 9:06 [PATCH 0/2] media: ov7670: Add entity init and power operation Wenyou Yang 2017-08-10 9:06 ` [PATCH 1/2] media: ov7670: Add entity pads initialization Wenyou Yang 2017-08-15 16:23 ` Sakari Ailus 2017-08-17 1:38 ` Yang, Wenyou 2017-08-10 9:06 ` [PATCH 2/2] media: ov7670: Add the s_power operation Wenyou Yang 2017-08-15 16:36 ` Sakari Ailus
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®