diff mbox series

[v3,09/23] v4l: fwnode: Make use of newly specified bus types

Message ID 20180912212942.19641-10-sakari.ailus@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series V4L2 fwnode rework; support for default configuration | expand

Commit Message

Sakari Ailus Sept. 12, 2018, 9:29 p.m. UTC 
Add support for parsing CSI-2 D-PHY, parallel or Bt.656 bus explicitly.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Steve Longerbeam <steve_longerbeam@mentor.com>
---
 drivers/media/v4l2-core/v4l2-fwnode.c | 53 ++++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 10 deletions(-)

Comments

Jacopo Mondi Sept. 13, 2018, 9:14 a.m. UTC | #1 
Hi Sakari,

On Thu, Sep 13, 2018 at 12:29:28AM +0300, Sakari Ailus wrote:
> Add support for parsing CSI-2 D-PHY, parallel or Bt.656 bus explicitly.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Tested-by: Steve Longerbeam <steve_longerbeam@mentor.com>
> ---
>  drivers/media/v4l2-core/v4l2-fwnode.c | 53 ++++++++++++++++++++++++++++-------
>  1 file changed, 43 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> index aa3d28c4a50b..74c2f4e03e52 100644
> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> @@ -123,8 +123,16 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode,
>  	return 0;
>  }
>
> +#define PARALLEL_MBUS_FLAGS (V4L2_MBUS_HSYNC_ACTIVE_HIGH |	\
> +			     V4L2_MBUS_HSYNC_ACTIVE_LOW |	\
> +			     V4L2_MBUS_VSYNC_ACTIVE_HIGH |	\
> +			     V4L2_MBUS_VSYNC_ACTIVE_LOW |	\
> +			     V4L2_MBUS_FIELD_EVEN_HIGH |	\
> +			     V4L2_MBUS_FIELD_EVEN_LOW)
> +
>  static void v4l2_fwnode_endpoint_parse_parallel_bus(
> -	struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep)
> +	struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep,
> +	enum v4l2_fwnode_bus_type bus_type)
>  {
>  	struct v4l2_fwnode_bus_parallel *bus = &vep->bus.parallel;
>  	unsigned int flags = 0;
> @@ -189,16 +197,28 @@ static void v4l2_fwnode_endpoint_parse_parallel_bus(
>  		pr_debug("data-enable-active %s\n", v ? "high" : "low");
>  	}
>
> -	bus->flags = flags;
> -	if (flags & (V4L2_MBUS_HSYNC_ACTIVE_HIGH |
> -		     V4L2_MBUS_HSYNC_ACTIVE_LOW |
> -		     V4L2_MBUS_VSYNC_ACTIVE_HIGH |
> -		     V4L2_MBUS_VSYNC_ACTIVE_LOW |
> -		     V4L2_MBUS_FIELD_EVEN_HIGH |
> -		     V4L2_MBUS_FIELD_EVEN_LOW))
> +	switch (bus_type) {
> +	default:
> +		bus->flags = flags;
> +		if (flags & (V4L2_MBUS_HSYNC_ACTIVE_HIGH |
> +			     V4L2_MBUS_HSYNC_ACTIVE_LOW |
> +			     V4L2_MBUS_VSYNC_ACTIVE_HIGH |
> +			     V4L2_MBUS_VSYNC_ACTIVE_LOW |
> +			     V4L2_MBUS_FIELD_EVEN_HIGH |
> +			     V4L2_MBUS_FIELD_EVEN_LOW))

I guess you could use V4L2_MBUS_PARALLEL here.

Apart from this:
Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org>

Thanks
   j

> +			vep->bus_type = V4L2_MBUS_PARALLEL;
> +		else
> +			vep->bus_type = V4L2_MBUS_BT656;
> +		break;
> +	case V4L2_FWNODE_BUS_TYPE_PARALLEL:
>  		vep->bus_type = V4L2_MBUS_PARALLEL;
> -	else
> +		bus->flags = flags;
> +		break;
> +	case V4L2_FWNODE_BUS_TYPE_BT656:
>  		vep->bus_type = V4L2_MBUS_BT656;
> +		bus->flags = flags & ~PARALLEL_MBUS_FLAGS;
> +		break;
> +	}
>  }
>
>  static void
> @@ -258,7 +278,8 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
>  			return rval;
>
>  		if (vep->bus_type == V4L2_MBUS_UNKNOWN)
> -			v4l2_fwnode_endpoint_parse_parallel_bus(fwnode, vep);
> +			v4l2_fwnode_endpoint_parse_parallel_bus(
> +				fwnode, vep, V4L2_MBUS_UNKNOWN);
>
>  		break;
>  	case V4L2_FWNODE_BUS_TYPE_CCP2:
> @@ -266,6 +287,18 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
>  		v4l2_fwnode_endpoint_parse_csi1_bus(fwnode, vep, bus_type);
>
>  		break;
> +	case V4L2_FWNODE_BUS_TYPE_CSI2_DPHY:
> +		vep->bus_type = V4L2_MBUS_CSI2_DPHY;
> +		rval = v4l2_fwnode_endpoint_parse_csi2_bus(fwnode, vep);
> +		if (rval)
> +			return rval;
> +
> +		break;
> +	case V4L2_FWNODE_BUS_TYPE_PARALLEL:
> +	case V4L2_FWNODE_BUS_TYPE_BT656:
> +		v4l2_fwnode_endpoint_parse_parallel_bus(fwnode, vep, bus_type);
> +
> +		break;
>  	default:
>  		pr_warn("unsupported bus type %u\n", bus_type);
>  		return -EINVAL;
> --
> 2.11.0
>
diff mbox series

Patch

diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index aa3d28c4a50b..74c2f4e03e52 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -123,8 +123,16 @@  static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode,
 	return 0;
 }
 
+#define PARALLEL_MBUS_FLAGS (V4L2_MBUS_HSYNC_ACTIVE_HIGH |	\
+			     V4L2_MBUS_HSYNC_ACTIVE_LOW |	\
+			     V4L2_MBUS_VSYNC_ACTIVE_HIGH |	\
+			     V4L2_MBUS_VSYNC_ACTIVE_LOW |	\
+			     V4L2_MBUS_FIELD_EVEN_HIGH |	\
+			     V4L2_MBUS_FIELD_EVEN_LOW)
+
 static void v4l2_fwnode_endpoint_parse_parallel_bus(
-	struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep)
+	struct fwnode_handle *fwnode, struct v4l2_fwnode_endpoint *vep,
+	enum v4l2_fwnode_bus_type bus_type)
 {
 	struct v4l2_fwnode_bus_parallel *bus = &vep->bus.parallel;
 	unsigned int flags = 0;
@@ -189,16 +197,28 @@  static void v4l2_fwnode_endpoint_parse_parallel_bus(
 		pr_debug("data-enable-active %s\n", v ? "high" : "low");
 	}
 
-	bus->flags = flags;
-	if (flags & (V4L2_MBUS_HSYNC_ACTIVE_HIGH |
-		     V4L2_MBUS_HSYNC_ACTIVE_LOW |
-		     V4L2_MBUS_VSYNC_ACTIVE_HIGH |
-		     V4L2_MBUS_VSYNC_ACTIVE_LOW |
-		     V4L2_MBUS_FIELD_EVEN_HIGH |
-		     V4L2_MBUS_FIELD_EVEN_LOW))
+	switch (bus_type) {
+	default:
+		bus->flags = flags;
+		if (flags & (V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+			     V4L2_MBUS_HSYNC_ACTIVE_LOW |
+			     V4L2_MBUS_VSYNC_ACTIVE_HIGH |
+			     V4L2_MBUS_VSYNC_ACTIVE_LOW |
+			     V4L2_MBUS_FIELD_EVEN_HIGH |
+			     V4L2_MBUS_FIELD_EVEN_LOW))
+			vep->bus_type = V4L2_MBUS_PARALLEL;
+		else
+			vep->bus_type = V4L2_MBUS_BT656;
+		break;
+	case V4L2_FWNODE_BUS_TYPE_PARALLEL:
 		vep->bus_type = V4L2_MBUS_PARALLEL;
-	else
+		bus->flags = flags;
+		break;
+	case V4L2_FWNODE_BUS_TYPE_BT656:
 		vep->bus_type = V4L2_MBUS_BT656;
+		bus->flags = flags & ~PARALLEL_MBUS_FLAGS;
+		break;
+	}
 }
 
 static void
@@ -258,7 +278,8 @@  static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
 			return rval;
 
 		if (vep->bus_type == V4L2_MBUS_UNKNOWN)
-			v4l2_fwnode_endpoint_parse_parallel_bus(fwnode, vep);
+			v4l2_fwnode_endpoint_parse_parallel_bus(
+				fwnode, vep, V4L2_MBUS_UNKNOWN);
 
 		break;
 	case V4L2_FWNODE_BUS_TYPE_CCP2:
@@ -266,6 +287,18 @@  static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
 		v4l2_fwnode_endpoint_parse_csi1_bus(fwnode, vep, bus_type);
 
 		break;
+	case V4L2_FWNODE_BUS_TYPE_CSI2_DPHY:
+		vep->bus_type = V4L2_MBUS_CSI2_DPHY;
+		rval = v4l2_fwnode_endpoint_parse_csi2_bus(fwnode, vep);
+		if (rval)
+			return rval;
+
+		break;
+	case V4L2_FWNODE_BUS_TYPE_PARALLEL:
+	case V4L2_FWNODE_BUS_TYPE_BT656:
+		v4l2_fwnode_endpoint_parse_parallel_bus(fwnode, vep, bus_type);
+
+		break;
 	default:
 		pr_warn("unsupported bus type %u\n", bus_type);
 		return -EINVAL;