mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Jacopo Mondi 2018-09-13 09:59:51 -04:00 committed by Mauro Carvalho Chehab
parent 6a3da2e2a4
commit cac0223c46
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/gr-peach-audiocamerashield.dtsi
View File

@ -69,10 +69,6 @@
port {
ceu_in: endpoint {
hsync-active = <1>;
vsync-active = <1>;
bus-width = <8>;
pclk-sample = <1>;
remote-endpoint = <&mt9v111_out>;
};
};

20
drivers/media/platform/renesas-ceu.c
View File

@ -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;
}