Message ID | 20240415094133.210580-2-hdegoede@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | media: hi556: Add reset / clk / regulator support | expand |
Hi Hans, On Mon, Apr 15, 2024 at 11:41:30AM +0200, Hans de Goede wrote: > With ipu bridge, endpoints may only be created when ipu bridge has > initialised. This may happen after the sensor driver has first probed. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/media/i2c/hi556.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/i2c/hi556.c b/drivers/media/i2c/hi556.c > index 38c77d515786..96bae9914d52 100644 > --- a/drivers/media/i2c/hi556.c > +++ b/drivers/media/i2c/hi556.c > @@ -1206,8 +1206,13 @@ static int hi556_check_hwcfg(struct device *dev) > int ret = 0; > unsigned int i, j; > > - if (!fwnode) > - return -ENXIO; > + /* > + * Sometimes the fwnode graph is initialized by the bridge driver, > + * wait for this. > + */ > + ep = fwnode_graph_get_next_endpoint(fwnode, NULL); > + if (!ep) > + return -EPROBE_DEFER; > > ret = fwnode_property_read_u32(fwnode, "clock-frequency", &mclk); > if (ret) { The endpoint needs to be put here. It might be more practical to parse the endpoint right away so the error handling becomes easier. > @@ -1220,10 +1225,6 @@ static int hi556_check_hwcfg(struct device *dev) > return -EINVAL; > } > > - ep = fwnode_graph_get_next_endpoint(fwnode, NULL); > - if (!ep) > - return -ENXIO; > - > ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); > fwnode_handle_put(ep); > if (ret)
diff --git a/drivers/media/i2c/hi556.c b/drivers/media/i2c/hi556.c index 38c77d515786..96bae9914d52 100644 --- a/drivers/media/i2c/hi556.c +++ b/drivers/media/i2c/hi556.c @@ -1206,8 +1206,13 @@ static int hi556_check_hwcfg(struct device *dev) int ret = 0; unsigned int i, j; - if (!fwnode) - return -ENXIO; + /* + * Sometimes the fwnode graph is initialized by the bridge driver, + * wait for this. + */ + ep = fwnode_graph_get_next_endpoint(fwnode, NULL); + if (!ep) + return -EPROBE_DEFER; ret = fwnode_property_read_u32(fwnode, "clock-frequency", &mclk); if (ret) { @@ -1220,10 +1225,6 @@ static int hi556_check_hwcfg(struct device *dev) return -EINVAL; } - ep = fwnode_graph_get_next_endpoint(fwnode, NULL); - if (!ep) - return -ENXIO; - ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); fwnode_handle_put(ep); if (ret)
With ipu bridge, endpoints may only be created when ipu bridge has initialised. This may happen after the sensor driver has first probed. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/media/i2c/hi556.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)