Commit 44e756fa authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab

media: microchip-csi2dc: Remove VC support for now

As part of removing mbus config flags, remove VC flag use in the
microchip-csi2dc driver. The support can be reintroduced later on as part
of the streams patches.

[mchehab: patch accepted by Eugen:  https://lore.kernel.org/linux-media/c0676a4e-803f-9f1c-542b-4b007705ef3d@microchip.com/, so add an accepted-by tag]
Accepted-by: default avatarEugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 4abb2130
...@@ -348,24 +348,15 @@ static int csi2dc_get_mbus_config(struct csi2dc_device *csi2dc) ...@@ -348,24 +348,15 @@ static int csi2dc_get_mbus_config(struct csi2dc_device *csi2dc)
if (ret == -ENOIOCTLCMD) { if (ret == -ENOIOCTLCMD) {
dev_dbg(csi2dc->dev, dev_dbg(csi2dc->dev,
"no remote mbus configuration available\n"); "no remote mbus configuration available\n");
goto csi2dc_get_mbus_config_defaults; return 0;
} }
if (ret) { if (ret) {
dev_err(csi2dc->dev, dev_err(csi2dc->dev,
"failed to get remote mbus configuration\n"); "failed to get remote mbus configuration\n");
goto csi2dc_get_mbus_config_defaults; return 0;
} }
if (mbus_config.flags & V4L2_MBUS_CSI2_CHANNEL_0)
csi2dc->vc = 0;
else if (mbus_config.flags & V4L2_MBUS_CSI2_CHANNEL_1)
csi2dc->vc = 1;
else if (mbus_config.flags & V4L2_MBUS_CSI2_CHANNEL_2)
csi2dc->vc = 2;
else if (mbus_config.flags & V4L2_MBUS_CSI2_CHANNEL_3)
csi2dc->vc = 3;
dev_dbg(csi2dc->dev, "subdev sending on channel %d\n", csi2dc->vc); dev_dbg(csi2dc->dev, "subdev sending on channel %d\n", csi2dc->vc);
csi2dc->clk_gated = mbus_config.flags & csi2dc->clk_gated = mbus_config.flags &
...@@ -375,11 +366,6 @@ static int csi2dc_get_mbus_config(struct csi2dc_device *csi2dc) ...@@ -375,11 +366,6 @@ static int csi2dc_get_mbus_config(struct csi2dc_device *csi2dc)
csi2dc->clk_gated ? "gated" : "free running"); csi2dc->clk_gated ? "gated" : "free running");
return 0; return 0;
csi2dc_get_mbus_config_defaults:
csi2dc->vc = 0; /* Virtual ID 0 by default */
return 0;
} }
static void csi2dc_vp_update(struct csi2dc_device *csi2dc) static void csi2dc_vp_update(struct csi2dc_device *csi2dc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment