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>

diff --git a/arch/arm/boot/dts/gr-peach-audiocamerashield.dtsi b/arch/arm/boot/dts/gr-peach-audiocamerashield.dtsi
index e31a9e3c18a225ef27610828722b08ae75821fa1..8d77579807ecf84cef67aeda3931507cf31c89e1 100644 (file)
--- a/arch/arm/boot/dts/gr-peach-audiocamerashield.dtsi
+++ b/arch/arm/boot/dts/gr-peach-audiocamerashield.dtsi
@@ -69,10 +69,6 @@
 
        port {
                ceu_in: endpoint {
-                       hsync-active = <1>;
-                       vsync-active = <1>;
-                       bus-width = <8>;
-                       pclk-sample = <1>;
                        remote-endpoint = <&mt9v111_out>;
                };
        };

diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
index 035f1d3f10e57dd2d13a5f3fa3fe28d5dace297b..150196f7cf96b16ee3d37e64839b235cebea607d 100644 (file)
--- 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;
                }