Commit 9f65192d authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: ccs: Fix obtaining bus information from firmware 



Let v4l2_fwnode_endpoint_alloc_parse to figure out the type of the data
bus. As the old bindings did not require the "bus-type" property, we need
to rely on guessing between CSI-2 D-PHY and CCP2. Setting the type to
CSI-2 D-PHY will parse just that and succeed even if no data-lanes are
set.

Also add a comment on the matter to the driver to avoid breaking this in
the future.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 7b1dd0f8

drivers/media/i2c/ccs/ccs-core.c

+6 −7
Original line number Diff line number Diff line
@@ -2853,7 +2853,7 @@ static int __maybe_unused ccs_resume(struct device *dev) 
static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev)

{

	struct ccs_hwconfig *hwcfg = &sensor->hwcfg;

	struct v4l2_fwnode_endpoint bus_cfg = { .bus_type = 0 };

	struct v4l2_fwnode_endpoint bus_cfg = { .bus_type = V4L2_MBUS_UNKNOWN };

	struct fwnode_handle *ep;

	struct fwnode_handle *fwnode = dev_fwnode(dev);

	u32 rotation;
@@ -2864,13 +2864,11 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev) 
	if (!ep)

		return -ENODEV;



	bus_cfg.bus_type = V4L2_MBUS_CSI2_DPHY;

	rval = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg);

	if (rval == -ENXIO) {

		bus_cfg = (struct v4l2_fwnode_endpoint)

			{ .bus_type = V4L2_MBUS_CCP2 };

	/*

	 * Note that we do need to rely on detecting the bus type between CSI-2

	 * D-PHY and CCP2 as the old bindings did not require it.

	 */

	rval = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg);

	}

	if (rval)

		goto out_err;
@@ -2879,6 +2877,7 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev) 
		hwcfg->csi_signalling_mode = CCS_CSI_SIGNALING_MODE_CSI_2_DPHY;

		hwcfg->lanes = bus_cfg.bus.mipi_csi2.num_data_lanes;

		break;

	case V4L2_MBUS_CSI1:

	case V4L2_MBUS_CCP2:

		hwcfg->csi_signalling_mode = (bus_cfg.bus.mipi_csi1.strobe) ?

		SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE :