From: Hans de Goede Date: Thu, 3 Aug 2023 09:33:31 +0000 (+0200) Subject: media: ov2680: Wait for endpoint fwnode before continuing with probe() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=83634470b0eee34e22d8703408a7808d430ee606;p=linux.git media: ov2680: Wait for endpoint fwnode before continuing with probe() Defer probe() until the endpoint fwnode is available. This is necessary on ACPI platforms where the bridge code creating the fwnodes may also e.g. set the "clock-frequency" device property and add GPIO mappings. Acked-by: Rui Miguel Silva Reviewed-by: Daniel Scally Signed-off-by: Hans de Goede Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c index a8c257f3bcd6c..d4664581b49bc 100644 --- a/drivers/media/i2c/ov2680.c +++ b/drivers/media/i2c/ov2680.c @@ -717,10 +717,22 @@ static int ov2680_check_id(struct ov2680_dev *sensor) static int ov2680_parse_dt(struct ov2680_dev *sensor) { struct device *dev = sensor->dev; + struct fwnode_handle *ep_fwnode; struct gpio_desc *gpio; unsigned int rate = 0; int i, ret; + /* + * Sometimes the fwnode graph is initialized by the bridge driver. + * Bridge drivers doing this may also add GPIO mappings, wait for this. + */ + ep_fwnode = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL); + if (!ep_fwnode) + return dev_err_probe(dev, -EPROBE_DEFER, + "waiting for fwnode graph endpoint\n"); + + fwnode_handle_put(ep_fwnode); + /* * The pin we want is named XSHUTDN in the datasheet. Linux sensor * drivers have standardized on using "powerdown" as con-id name @@ -801,7 +813,7 @@ static int ov2680_probe(struct i2c_client *client) ret = ov2680_parse_dt(sensor); if (ret < 0) - return -EINVAL; + return ret; ret = ov2680_mode_init(sensor); if (ret < 0)