summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo+renesas@jmondi.org>2018-09-13 09:59:51 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-10-04 16:25:33 -0400
commitcac0223c469027b57a2c58bd211241c05ddf0b4d (patch)
tree8d1d2278d3d167e74759034b5ce77199c0f1dfc5 /drivers/media
parent6a3da2e2a43aeb295f2d4541e7e7efb0b6349b3a (diff)
downloadlinux-stable-cac0223c469027b57a2c58bd211241c05ddf0b4d.tar.gz
linux-stable-cac0223c469027b57a2c58bd211241c05ddf0b4d.tar.bz2
linux-stable-cac0223c469027b57a2c58bd211241c05ddf0b4d.zip
media: renesas-ceu: Use default mbus settings
As the v4l2-fwnode now allows drivers to set defaults, and eventually override them by specifying properties in DTS, use defaults for the CEU driver. Also remove endpoint properties from the gr-peach-audiocamerashield as they match the defaults now specified in the driver code (h/vsync-active and bus-width) or are not relevant to the interface as they cannot be configured (pclk-sample). Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/renesas-ceu.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
index 035f1d3f10e5..150196f7cf96 100644
--- a/drivers/media/platform/renesas-ceu.c
+++ b/drivers/media/platform/renesas-ceu.c
@@ -1551,7 +1551,16 @@ static int ceu_parse_dt(struct ceu_device *ceudev)
return ret;
for (i = 0; i < num_ep; i++) {
- struct v4l2_fwnode_endpoint fw_ep = { .bus_type = 0 };
+ struct v4l2_fwnode_endpoint fw_ep = {
+ .bus_type = V4L2_MBUS_PARALLEL,
+ .bus = {
+ .parallel = {
+ .flags = V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+ V4L2_MBUS_VSYNC_ACTIVE_HIGH,
+ .bus_width = 8,
+ },
+ },
+ };
ep = of_graph_get_endpoint_by_regs(of, 0, i);
if (!ep) {
@@ -1564,14 +1573,7 @@ static int ceu_parse_dt(struct ceu_device *ceudev)
ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &fw_ep);
if (ret) {
dev_err(ceudev->dev,
- "Unable to parse endpoint #%u.\n", i);
- goto error_cleanup;
- }
-
- if (fw_ep.bus_type != V4L2_MBUS_PARALLEL) {
- dev_err(ceudev->dev,
- "Only parallel input supported.\n");
- ret = -EINVAL;
+ "Unable to parse endpoint #%u: %d.\n", i, ret);
goto error_cleanup;
}