openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Sakari Ailus 2020-09-30 18:20:42 +02:00 committed by Mauro Carvalho Chehab
parent 7b1dd0f850
commit 9f65192d8d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/i2c/ccs/ccs-core.c
View File

@ -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) static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev)
{ {
struct ccs_hwconfig *hwcfg = &sensor->hwcfg; 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 *ep;
struct fwnode_handle *fwnode = dev_fwnode(dev); struct fwnode_handle *fwnode = dev_fwnode(dev);
u32 rotation; u32 rotation;
@ -2864,13 +2864,11 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev)
if (!ep) if (!ep)
return -ENODEV; return -ENODEV;
bus_cfg.bus_type = V4L2_MBUS_CSI2_DPHY; /*
* 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); rval = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg);
if (rval == -ENXIO) {
bus_cfg = (struct v4l2_fwnode_endpoint)
{ .bus_type = V4L2_MBUS_CCP2 };
rval = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg);
}
if (rval) if (rval)
goto out_err; 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->csi_signalling_mode = CCS_CSI_SIGNALING_MODE_CSI_2_DPHY;
hwcfg->lanes = bus_cfg.bus.mipi_csi2.num_data_lanes; hwcfg->lanes = bus_cfg.bus.mipi_csi2.num_data_lanes;
break; break;
case V4L2_MBUS_CSI1:
case V4L2_MBUS_CCP2: case V4L2_MBUS_CCP2:
hwcfg->csi_signalling_mode = (bus_cfg.bus.mipi_csi1.strobe) ? hwcfg->csi_signalling_mode = (bus_cfg.bus.mipi_csi1.strobe) ?
SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE : SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE :