Skip to contentSkip to conversation

media: Add support for Cadence CSI2RX version 2.1

PATCH In review Jan Kotas 4 participants 14 messages Sep 5, 2019 – Sep 17, 2019

Subsystems (3)
lore
Share & tools
lore

Jan Kotas

author
#0 lore raw

v2 cover media: Add support for Cadence CSI2RX version 2.1

This patchset adds support for Cadence CSI2RX controller version 2.1. It currently limits maximum amount of data lanes to 4. Existing compatibility with v1.3 is maintained.

Jan Kotas (3):
media: dt-bindings: Update bindings for Cadence CSI2RX
media: Add lane checks for Cadence CSI2RX
media: Add support for Cadence CSI2RX 2.1

 .../devicetree/bindings/media/cdns,csi2rx.txt      |   5 +-
 drivers/media/platform/cadence/cdns-csi2rx.c       | 152 +++++++++++++++++----
 2 files changed, 131 insertions(+), 26 deletions(-)
Signature · 1 line
2.15.0
author
#1 lore raw

PATCH v2 1/3 media: dt-bindings: Update bindings for Cadence CSI2RX

This patch adds a DT bindings documentation for
Cadence CSI2RX v1.3 and v2.1 controllers.

---
 Documentation/devicetree/bindings/media/cdns,csi2rx.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/media/cdns,csi2rx.txt +4 -1
index 6b02a0657..df828e4e4 100644
@@ -5,7 +5,10 @@ The Cadence MIPI-CSI2 RX controller is a CSI-2 bridge supporting up to 4 CSI
 lanes in input, and 4 different pixel streams in output.
 
 Required properties:
-  - compatible: must be set to "cdns,csi2rx" and an SoC-specific compatible
+  - compatible: must be set to:
+    * "cdns,csi2rx" or "cdns,csi2rx-1.3" for version 1.3 of the controller,
+    * "cdns,csi2rx-2.1" for v2.1,
+    and an SoC-specific compatible
   - reg: base address and size of the memory mapped region
   - clocks: phandles to the clocks driving the controller
   - clock-names: must contain:
Signature · 1 line
2.15.0
maintainer Reviewed-by on v2 1/3
#2 lore raw

Re: [PATCH v2 1/3] media: dt-bindings: Update bindings for Cadence CSI2RX

Quoted 8 lines · Jan Kotas

This patch adds a DT bindings documentation for
Cadence CSI2RX v1.3 and v2.1 controllers.

---
 Documentation/devicetree/bindings/media/cdns,csi2rx.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
author
#3 lore raw

PATCH v2 2/3 media: Add lane checks for Cadence CSI2RX

In reply to Jan Kotas

This patch adds lane checks for CSI2RX, to prevent clock lane being used as a data lane.

---
 drivers/media/platform/cadence/cdns-csi2rx.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/media/platform/cadence/cdns-csi2rx.c +11 -2
index 31ace114e..97ec09e72 100644
@@ -2,7 +2,7 @@
 /*
  * Driver for Cadence MIPI-CSI2 RX Controller v1.3
  *
- * Copyright (C) 2017 Cadence Design Systems Inc.
+ * Copyright (C) 2017-2019 Cadence Design Systems Inc.
  */
 
 #include <linux/clk.h>
@@ -364,7 +364,7 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)
 	struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type = 0 };
 	struct fwnode_handle *fwh;
 	struct device_node *ep;
-	int ret;
+	int ret, i;
 
 	ep = of_graph_get_endpoint_by_regs(csi2rx->dev->of_node, 0, 0);
 	if (!ep)
@@ -395,6 +395,15 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)
 		return -EINVAL;
 	}
 
+	for (i = 0; i < csi2rx->num_lanes; i++) {
+		if (csi2rx->lanes[i] < 1) {
+			dev_err(csi2rx->dev, "Invalid lane[%d] number: %u\n",
+				i, csi2rx->lanes[i]);
+			of_node_put(ep);
+			return -EINVAL;
+		}
+	}
+
 	csi2rx->asd.match.fwnode = fwnode_graph_get_remote_port_parent(fwh);
 	csi2rx->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
 	of_node_put(ep);
Signature · 1 line
2.15.0
#4 lore raw

Re: [PATCH v2 2/3] media: Add lane checks for Cadence CSI2RX

Hi Jan,

Thanks for the patchset.

Quoted 31 lines · Jan Kotas

This patch adds lane checks for CSI2RX, to prevent clock lane being used as a data lane.

---
 drivers/media/platform/cadence/cdns-csi2rx.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/media/platform/cadence/cdns-csi2rx.c +2 -2
index 31ace114e..97ec09e72 100644
@@ -2,7 +2,7 @@
 /*
  * Driver for Cadence MIPI-CSI2 RX Controller v1.3
  *
- * Copyright (C) 2017 Cadence Design Systems Inc.
+ * Copyright (C) 2017-2019 Cadence Design Systems Inc.
  */
 
 #include <linux/clk.h>
@@ -364,7 +364,7 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)
 	struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type = 0 };
 	struct fwnode_handle *fwh;
 	struct device_node *ep;
-	int ret;
+	int ret, i;
 
 	ep = of_graph_get_endpoint_by_regs(csi2rx->dev->of_node, 0, 0);
 	if (!ep)

drivers/media/platform/cadence/cdns-csi2rx.c static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx) · line 399

Quoted 5 lines
drivers/media/platform/cadence/cdns-csi2rx.c +2 -0
@@ -395,6 +395,15 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)
 		return -EINVAL;
 	}
 
+	for (i = 0; i < csi2rx->num_lanes; i++) {
+		if (csi2rx->lanes[i] < 1) {

Do you need this? v4l2_fwnode_parse_endpoint() already has a more thorough check for the lane numbers.

Quoted 10 lines
drivers/media/platform/cadence/cdns-csi2rx.c +7 -0
+			dev_err(csi2rx->dev, "Invalid lane[%d] number: %u\n",
+				i, csi2rx->lanes[i]);
+			of_node_put(ep);
+			return -EINVAL;
+		}
+	}
+
 	csi2rx->asd.match.fwnode = fwnode_graph_get_remote_port_parent(fwh);
 	csi2rx->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
 	of_node_put(ep);
Signature · 3 lines
Regards,

Sakari Ailus
author
#5 lore raw

Re: [PATCH v2 2/3] media: Add lane checks for Cadence CSI2RX

Hello Sakari,

Thanks for your reply.

Quoted 14 lines · Sakari Ailus

Hi Jan,

Thanks for the patchset.

Quoted 7 lines · Jan Kotas

/*
* Driver for Cadence MIPI-CSI2 RX Controller v1.3 *
- * Copyright (C) 2017 Cadence Design Systems Inc.
+ * Copyright (C) 2017-2019 Cadence Design Systems Inc. */

Quoted 5 lines

drivers/media/platform/cadence/cdns-csi2rx.c static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx) · line 399

Quoted 2 lines
drivers/media/platform/cadence/cdns-csi2rx.c +2 -0
+	for (i = 0; i < csi2rx->num_lanes; i++) {
+		if (csi2rx->lanes[i] < 1) {

Do you need this? v4l2_fwnode_parse_endpoint() already has a more thorough check for the lane numbers.

I looked at the source code of v4l2_fwnode_endpoint_parse_csi2_bus and this particular case doesn’t seem to be checked.

Quoted 5 lines
Signature · 4 lines
-- 
Regards,

Sakari Ailus

Regards,
Jan

#6 lore raw

Re: [PATCH v2 2/3] media: Add lane checks for Cadence CSI2RX

Quoted 19 lines · Jan Kotas

Hello Sakari,

Thanks for your reply.

Quoted 14 lines · Sakari Ailus

Hi Jan,

Thanks for the patchset.

Quoted 7 lines · Jan Kotas

/*
* Driver for Cadence MIPI-CSI2 RX Controller v1.3 *
- * Copyright (C) 2017 Cadence Design Systems Inc.
+ * Copyright (C) 2017-2019 Cadence Design Systems Inc. */

Quoted 8 lines
Quoted 5 lines

drivers/media/platform/cadence/cdns-csi2rx.c static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx) · line 399

Quoted 2 lines
drivers/media/platform/cadence/cdns-csi2rx.c +2 -0
+	for (i = 0; i < csi2rx->num_lanes; i++) {
+		if (csi2rx->lanes[i] < 1) {

Do you need this? v4l2_fwnode_parse_endpoint() already has a more thorough check for the lane numbers.

I looked at the source code of v4l2_fwnode_endpoint_parse_csi2_bus and this particular case doesn’t seem to be checked.

Not specifically, since 0 is a valid lane number.

However, the driver only appears to be using the information on how many lanes there are. If the hardware doesn't support lane routing, then this is all you need. Otherwise additional checks should be added in case there are limitations how the lanes can be routed.

Signature · 1 line
Sakari Ailus
author
#7 lore raw

Re: [PATCH v2 2/3] media: Add lane checks for Cadence CSI2RX

Quoted 34 lines · Sakari Ailus
Quoted 19 lines · Jan Kotas

Hello Sakari,

Thanks for your reply.

Quoted 14 lines · Sakari Ailus

Hi Jan,

Thanks for the patchset.

Quoted 7 lines · Jan Kotas

/*
* Driver for Cadence MIPI-CSI2 RX Controller v1.3 *
- * Copyright (C) 2017 Cadence Design Systems Inc.
+ * Copyright (C) 2017-2019 Cadence Design Systems Inc. */

Quoted 8 lines
Quoted 5 lines

drivers/media/platform/cadence/cdns-csi2rx.c static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx) · line 399

Quoted 2 lines
drivers/media/platform/cadence/cdns-csi2rx.c +2 -0
+	for (i = 0; i < csi2rx->num_lanes; i++) {
+		if (csi2rx->lanes[i] < 1) {

Do you need this? v4l2_fwnode_parse_endpoint() already has a more thorough check for the lane numbers.

I looked at the source code of v4l2_fwnode_endpoint_parse_csi2_bus and this particular case doesn’t seem to be checked.

Quoted 6 lines

Not specifically, since 0 is a valid lane number.

However, the driver only appears to be using the information on how many lanes there are. If the hardware doesn't support lane routing, then this is all you need. Otherwise additional checks should be added in case there are limitations how the lanes can be routed.

The CSI2RX v1.3 does support that (CSI2RX_STATIC_CFG_REG) and assumes the first data lane has number 1.

Regrads,
Jan

Quoted 2 lines
Signature · 1 line
Sakari Ailus
#8 lore raw

Re: [PATCH v2 2/3] media: Add lane checks for Cadence CSI2RX

Quoted 36 lines · Jan Kotas
Quoted 36 lines · Sakari Ailus
Quoted 19 lines · Jan Kotas

Hello Sakari,

Thanks for your reply.

Quoted 14 lines · Sakari Ailus

Hi Jan,

Thanks for the patchset.

Quoted 7 lines · Jan Kotas

/*
* Driver for Cadence MIPI-CSI2 RX Controller v1.3 *
- * Copyright (C) 2017 Cadence Design Systems Inc.
+ * Copyright (C) 2017-2019 Cadence Design Systems Inc. */

Quoted 8 lines
Quoted 5 lines

drivers/media/platform/cadence/cdns-csi2rx.c static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx) · line 399

Quoted 2 lines
drivers/media/platform/cadence/cdns-csi2rx.c +2 -0
+	for (i = 0; i < csi2rx->num_lanes; i++) {
+		if (csi2rx->lanes[i] < 1) {

Do you need this? v4l2_fwnode_parse_endpoint() already has a more thorough check for the lane numbers.

I looked at the source code of v4l2_fwnode_endpoint_parse_csi2_bus and this particular case doesn’t seem to be checked.

Not specifically, since 0 is a valid lane number.

Quoted 7 lines
Quoted 4 lines

However, the driver only appears to be using the information on how many lanes there are. If the hardware doesn't support lane routing, then this is all you need. Otherwise additional checks should be added in case there are limitations how the lanes can be routed.

The CSI2RX v1.3 does support that (CSI2RX_STATIC_CFG_REG) and assumes the first data lane has number 1.

Oh. I missed this. Thanks for pointing it out.

If the first data lane must be 1, then your check is still different: it requires all the data lanes are greater than 1. Are there requireents for the clock lane position? Looking at the driver, it seems it does not care about the clock lane, and an educated guess gives 0 for the clock lane.

The DT binding documentation actually omits documenting the data-lanes altogether. Please add it in a separate patch. I don't think "clock-lanes" is needed _if_ zero is all you need, so please remove it also from the examples.

It's actually nice to have more users for this feature. :-)

Signature · 3 lines
Kind regards,

Sakari Ailus
author
#9 lore raw

PATCH v2 3/3 media: Add support for Cadence CSI2RX 2.1

In reply to Jan Kotas

This patch adds support for CSI2RX v2.1 version of the controller.

---
 drivers/media/platform/cadence/cdns-csi2rx.c | 139 ++++++++++++++++++++++-----
 1 file changed, 116 insertions(+), 23 deletions(-)
drivers/media/platform/cadence/cdns-csi2rx.c +116 -23
index 97ec09e72..aa1d46111 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Driver for Cadence MIPI-CSI2 RX Controller v1.3
+ * Driver for Cadence MIPI-CSI2 RX Controller
  *
  * Copyright (C) 2017-2019 Cadence Design Systems Inc.
  */
@@ -26,6 +26,9 @@
 #define CSI2RX_SOFT_RESET_PROTOCOL			BIT(1)
 #define CSI2RX_SOFT_RESET_FRONT				BIT(0)
 
+#define CSI2RX_V2_CORE_CTRL_REG			0x004
+#define CSI2RX_V2_CORE_CTRL_START			BIT(0)
+
 #define CSI2RX_STATIC_CFG_REG			0x008
 #define CSI2RX_STATIC_CFG_DLANE_MAP(llane, plane)	((plane) << (16 + (llane) * 4))
 #define CSI2RX_STATIC_CFG_LANES_MASK			GENMASK(11, 8)
@@ -54,6 +57,15 @@ enum csi2rx_pads {
 	CSI2RX_PAD_MAX,
 };
 
+struct csi2rx_priv;
+
+/* CSI2RX Variant Operations */
+struct csi2rx_vops {
+	void (*get_dev_cfg)(struct csi2rx_priv *csi2rx);
+	void (*reset)(struct csi2rx_priv *csi2rx);
+	void (*map_static)(struct csi2rx_priv *csi2rx);
+};
+
 struct csi2rx_priv {
 	struct device			*dev;
 	unsigned int			count;
@@ -69,6 +81,7 @@ struct csi2rx_priv {
 	struct clk			*p_clk;
 	struct clk			*pixel_clk[CSI2RX_STREAMS_MAX];
 	struct phy			*dphy;
+	struct csi2rx_vops		*vops;
 
 	u8				lanes[CSI2RX_LANES_MAX];
 	u8				num_lanes;
@@ -92,6 +105,32 @@ struct csi2rx_priv *v4l2_subdev_to_csi2rx(struct v4l2_subdev *subdev)
 	return container_of(subdev, struct csi2rx_priv, subdev);
 }
 
+static void csi2rx_get_dev_cfg(struct csi2rx_priv *csi2rx)
+{
+	u32 dev_cfg;
+
+	clk_prepare_enable(csi2rx->p_clk);
+	dev_cfg = readl(csi2rx->base + CSI2RX_DEVICE_CFG_REG);
+	clk_disable_unprepare(csi2rx->p_clk);
+
+	csi2rx->max_lanes = dev_cfg & 7;
+	csi2rx->max_streams = (dev_cfg >> 4) & 7;
+	csi2rx->has_internal_dphy = dev_cfg & BIT(3) ? true : false;
+}
+
+static void csi2rx_v2_get_dev_cfg(struct csi2rx_priv *csi2rx)
+{
+	u32 dev_cfg;
+
+	clk_prepare_enable(csi2rx->p_clk);
+	dev_cfg = readl(csi2rx->base + CSI2RX_DEVICE_CFG_REG);
+	clk_disable_unprepare(csi2rx->p_clk);
+
+	csi2rx->max_lanes = dev_cfg & 0xF;
+	csi2rx->max_streams = (dev_cfg >> 5) & 0xF;
+	csi2rx->has_internal_dphy = dev_cfg & BIT(4) ? true : false;
+}
+
 static void csi2rx_reset(struct csi2rx_priv *csi2rx)
 {
 	writel(CSI2RX_SOFT_RESET_PROTOCOL | CSI2RX_SOFT_RESET_FRONT,
@@ -102,18 +141,21 @@ static void csi2rx_reset(struct csi2rx_priv *csi2rx)
 	writel(0, csi2rx->base + CSI2RX_SOFT_RESET_REG);
 }
 
-static int csi2rx_start(struct csi2rx_priv *csi2rx)
+static void csi2rx_v2_reset(struct csi2rx_priv *csi2rx)
+{
+	writel(0, csi2rx->base + CSI2RX_V2_CORE_CTRL_REG);
+
+	udelay(10);
+
+	writel(CSI2RX_V2_CORE_CTRL_START,
+	       csi2rx->base + CSI2RX_V2_CORE_CTRL_REG);
+}
+
+static void csi2rx_map_static(struct csi2rx_priv *csi2rx)
 {
 	unsigned int i;
 	unsigned long lanes_used = 0;
 	u32 reg;
-	int ret;
-
-	ret = clk_prepare_enable(csi2rx->p_clk);
-	if (ret)
-		return ret;
-
-	csi2rx_reset(csi2rx);
 
 	reg = csi2rx->num_lanes << 8;
 	for (i = 0; i < csi2rx->num_lanes; i++) {
@@ -135,6 +177,32 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
 	}
 
 	writel(reg, csi2rx->base + CSI2RX_STATIC_CFG_REG);
+}
+
+static void csi2rx_v2_map_static(struct csi2rx_priv *csi2rx)
+{
+	u32 reg;
+
+	reg = csi2rx->num_lanes << 4;
+	writel(reg, csi2rx->base + CSI2RX_STATIC_CFG_REG);
+}
+
+static int csi2rx_start(struct csi2rx_priv *csi2rx)
+{
+	unsigned int i;
+	int ret;
+
+	ret = clk_prepare_enable(csi2rx->p_clk);
+	if (ret)
+		return ret;
+
+	if (csi2rx->vops) {
+		if (csi2rx->vops->reset)
+			csi2rx->vops->reset(csi2rx);
+
+		if (csi2rx->vops->map_static)
+			csi2rx->vops->map_static(csi2rx);
+	}
 
 	ret = v4l2_subdev_call(csi2rx->source_subdev, video, s_stream, true);
 	if (ret)
@@ -282,7 +350,6 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,
 {
 	struct resource *res;
 	unsigned char i;
-	u32 dev_cfg;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	csi2rx->base = devm_ioremap_resource(&pdev->dev, res);
@@ -316,26 +383,25 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,
 		return -EINVAL;
 	}
 
-	clk_prepare_enable(csi2rx->p_clk);
-	dev_cfg = readl(csi2rx->base + CSI2RX_DEVICE_CFG_REG);
-	clk_disable_unprepare(csi2rx->p_clk);
+	if (csi2rx->vops && csi2rx->vops->get_dev_cfg) {
+		csi2rx->vops->get_dev_cfg(csi2rx);
+	} else {
+		dev_err(&pdev->dev, "Couldn't get device configuration\n");
+		return -EINVAL;
+	}
 
-	csi2rx->max_lanes = dev_cfg & 7;
 	if (csi2rx->max_lanes > CSI2RX_LANES_MAX) {
 		dev_err(&pdev->dev, "Invalid number of lanes: %u\n",
 			csi2rx->max_lanes);
 		return -EINVAL;
 	}
 
-	csi2rx->max_streams = (dev_cfg >> 4) & 7;
 	if (csi2rx->max_streams > CSI2RX_STREAMS_MAX) {
 		dev_err(&pdev->dev, "Invalid number of streams: %u\n",
 			csi2rx->max_streams);
 		return -EINVAL;
 	}
 
-	csi2rx->has_internal_dphy = dev_cfg & BIT(3) ? true : false;
-
 	/*
 	 * FIXME: Once we'll have internal D-PHY support, the check
 	 * will need to be removed.
@@ -426,9 +492,39 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)
 	return ret;
 }
 
+static const struct csi2rx_vops csi2rx_vops = {
+	.get_dev_cfg = csi2rx_get_dev_cfg,
+	.reset = csi2rx_reset,
+	.map_static = csi2rx_map_static
+};
+
+static const struct csi2rx_vops csi2rx_v2_vops = {
+	.get_dev_cfg = csi2rx_v2_get_dev_cfg,
+	.reset = csi2rx_v2_reset,
+	.map_static = csi2rx_v2_map_static
+};
+
+static const struct of_device_id csi2rx_of_table[] = {
+	{
+		.compatible = "cdns,csi2rx",
+		.data = &csi2rx_vops
+	},
+	{
+		.compatible = "cdns,csi2rx-1.3",
+		.data = &csi2rx_vops
+	},
+	{
+		.compatible = "cdns,csi2rx-2.1",
+		.data = &csi2rx_v2_vops
+	},
+	{ }
+};
+MODULE_DEVICE_TABLE(of, csi2rx_of_table);
+
 static int csi2rx_probe(struct platform_device *pdev)
 {
 	struct csi2rx_priv *csi2rx;
+	const struct of_device_id *of_id;
 	unsigned int i;
 	int ret;
 
@@ -439,6 +535,9 @@ static int csi2rx_probe(struct platform_device *pdev)
 	csi2rx->dev = &pdev->dev;
 	mutex_init(&csi2rx->lock);
 
+	of_id = of_match_node(csi2rx_of_table, pdev->dev.of_node);
+	csi2rx->vops = (struct csi2rx_vops *)of_id->data;
+
 	ret = csi2rx_get_resources(csi2rx, pdev);
 	if (ret)
 		goto err_free_priv;
@@ -493,12 +592,6 @@ static int csi2rx_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static const struct of_device_id csi2rx_of_table[] = {
-	{ .compatible = "cdns,csi2rx" },
-	{ },
-};
-MODULE_DEVICE_TABLE(of, csi2rx_of_table);
-
 static struct platform_driver csi2rx_driver = {
 	.probe	= csi2rx_probe,
 	.remove	= csi2rx_remove,
Signature · 1 line
2.15.0
#10 lore raw

Re: [PATCH v2 3/3] media: Add support for Cadence CSI2RX 2.1

Hi Jan,

Quoted 46 lines · Jan Kotas

This patch adds support for CSI2RX v2.1 version of the controller.

---
 drivers/media/platform/cadence/cdns-csi2rx.c | 139 ++++++++++++++++++++++-----
 1 file changed, 116 insertions(+), 23 deletions(-)
drivers/media/platform/cadence/cdns-csi2rx.c +13 -1
index 97ec09e72..aa1d46111 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * Driver for Cadence MIPI-CSI2 RX Controller v1.3
+ * Driver for Cadence MIPI-CSI2 RX Controller
  *
  * Copyright (C) 2017-2019 Cadence Design Systems Inc.
  */
@@ -26,6 +26,9 @@
 #define CSI2RX_SOFT_RESET_PROTOCOL			BIT(1)
 #define CSI2RX_SOFT_RESET_FRONT				BIT(0)
 
+#define CSI2RX_V2_CORE_CTRL_REG			0x004
+#define CSI2RX_V2_CORE_CTRL_START			BIT(0)
+
 #define CSI2RX_STATIC_CFG_REG			0x008
 #define CSI2RX_STATIC_CFG_DLANE_MAP(llane, plane)	((plane) << (16 + (llane) * 4))
 #define CSI2RX_STATIC_CFG_LANES_MASK			GENMASK(11, 8)
@@ -54,6 +57,15 @@ enum csi2rx_pads {
 	CSI2RX_PAD_MAX,
 };
 
+struct csi2rx_priv;
+
+/* CSI2RX Variant Operations */
+struct csi2rx_vops {
+	void (*get_dev_cfg)(struct csi2rx_priv *csi2rx);
+	void (*reset)(struct csi2rx_priv *csi2rx);
+	void (*map_static)(struct csi2rx_priv *csi2rx);
+};
+
 struct csi2rx_priv {
 	struct device			*dev;
 	unsigned int			count;

drivers/media/platform/cadence/cdns-csi2rx.c struct csi2rx_priv { · line 84

Quoted 4 lines
drivers/media/platform/cadence/cdns-csi2rx.c +1 -0
@@ -69,6 +81,7 @@ struct csi2rx_priv {
 	struct clk			*p_clk;
 	struct clk			*pixel_clk[CSI2RX_STREAMS_MAX];
 	struct phy			*dphy;
+	struct csi2rx_vops		*vops;

const?

Quoted 8 lines
drivers/media/platform/cadence/cdns-csi2rx.c +1 -0
 	u8				lanes[CSI2RX_LANES_MAX];
 	u8				num_lanes;
@@ -92,6 +105,32 @@ struct csi2rx_priv *v4l2_subdev_to_csi2rx(struct v4l2_subdev *subdev)
 	return container_of(subdev, struct csi2rx_priv, subdev);
 }
 
+static void csi2rx_get_dev_cfg(struct csi2rx_priv *csi2rx)

drivers/media/platform/cadence/cdns-csi2rx.c struct csi2rx_priv *v4l2_subdev_to_csi2rx(struct v4l2_subdev *subdev) · line 118

Quoted 10 lines
drivers/media/platform/cadence/cdns-csi2rx.c +10 -0
+{
+	u32 dev_cfg;
+
+	clk_prepare_enable(csi2rx->p_clk);
+	dev_cfg = readl(csi2rx->base + CSI2RX_DEVICE_CFG_REG);
+	clk_disable_unprepare(csi2rx->p_clk);
+
+	csi2rx->max_lanes = dev_cfg & 7;
+	csi2rx->max_streams = (dev_cfg >> 4) & 7;
+	csi2rx->has_internal_dphy = dev_cfg & BIT(3) ? true : false;

Could you spell out these a little, by adding #defines for the register bits? Same below.

Quoted 163 lines
drivers/media/platform/cadence/cdns-csi2rx.c +88 -16
+}
+
+static void csi2rx_v2_get_dev_cfg(struct csi2rx_priv *csi2rx)
+{
+	u32 dev_cfg;
+
+	clk_prepare_enable(csi2rx->p_clk);
+	dev_cfg = readl(csi2rx->base + CSI2RX_DEVICE_CFG_REG);
+	clk_disable_unprepare(csi2rx->p_clk);
+
+	csi2rx->max_lanes = dev_cfg & 0xF;
+	csi2rx->max_streams = (dev_cfg >> 5) & 0xF;
+	csi2rx->has_internal_dphy = dev_cfg & BIT(4) ? true : false;
+}
+
 static void csi2rx_reset(struct csi2rx_priv *csi2rx)
 {
 	writel(CSI2RX_SOFT_RESET_PROTOCOL | CSI2RX_SOFT_RESET_FRONT,
@@ -102,18 +141,21 @@ static void csi2rx_reset(struct csi2rx_priv *csi2rx)
 	writel(0, csi2rx->base + CSI2RX_SOFT_RESET_REG);
 }
 
-static int csi2rx_start(struct csi2rx_priv *csi2rx)
+static void csi2rx_v2_reset(struct csi2rx_priv *csi2rx)
+{
+	writel(0, csi2rx->base + CSI2RX_V2_CORE_CTRL_REG);
+
+	udelay(10);
+
+	writel(CSI2RX_V2_CORE_CTRL_START,
+	       csi2rx->base + CSI2RX_V2_CORE_CTRL_REG);
+}
+
+static void csi2rx_map_static(struct csi2rx_priv *csi2rx)
 {
 	unsigned int i;
 	unsigned long lanes_used = 0;
 	u32 reg;
-	int ret;
-
-	ret = clk_prepare_enable(csi2rx->p_clk);
-	if (ret)
-		return ret;
-
-	csi2rx_reset(csi2rx);
 
 	reg = csi2rx->num_lanes << 8;
 	for (i = 0; i < csi2rx->num_lanes; i++) {
@@ -135,6 +177,32 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx)
 	}
 
 	writel(reg, csi2rx->base + CSI2RX_STATIC_CFG_REG);
+}
+
+static void csi2rx_v2_map_static(struct csi2rx_priv *csi2rx)
+{
+	u32 reg;
+
+	reg = csi2rx->num_lanes << 4;
+	writel(reg, csi2rx->base + CSI2RX_STATIC_CFG_REG);
+}
+
+static int csi2rx_start(struct csi2rx_priv *csi2rx)
+{
+	unsigned int i;
+	int ret;
+
+	ret = clk_prepare_enable(csi2rx->p_clk);
+	if (ret)
+		return ret;
+
+	if (csi2rx->vops) {
+		if (csi2rx->vops->reset)
+			csi2rx->vops->reset(csi2rx);
+
+		if (csi2rx->vops->map_static)
+			csi2rx->vops->map_static(csi2rx);
+	}
 
 	ret = v4l2_subdev_call(csi2rx->source_subdev, video, s_stream, true);
 	if (ret)
@@ -282,7 +350,6 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,
 {
 	struct resource *res;
 	unsigned char i;
-	u32 dev_cfg;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	csi2rx->base = devm_ioremap_resource(&pdev->dev, res);
@@ -316,26 +383,25 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,
 		return -EINVAL;
 	}
 
-	clk_prepare_enable(csi2rx->p_clk);
-	dev_cfg = readl(csi2rx->base + CSI2RX_DEVICE_CFG_REG);
-	clk_disable_unprepare(csi2rx->p_clk);
+	if (csi2rx->vops && csi2rx->vops->get_dev_cfg) {
+		csi2rx->vops->get_dev_cfg(csi2rx);
+	} else {
+		dev_err(&pdev->dev, "Couldn't get device configuration\n");
+		return -EINVAL;
+	}
 
-	csi2rx->max_lanes = dev_cfg & 7;
 	if (csi2rx->max_lanes > CSI2RX_LANES_MAX) {
 		dev_err(&pdev->dev, "Invalid number of lanes: %u\n",
 			csi2rx->max_lanes);
 		return -EINVAL;
 	}
 
-	csi2rx->max_streams = (dev_cfg >> 4) & 7;
 	if (csi2rx->max_streams > CSI2RX_STREAMS_MAX) {
 		dev_err(&pdev->dev, "Invalid number of streams: %u\n",
 			csi2rx->max_streams);
 		return -EINVAL;
 	}
 
-	csi2rx->has_internal_dphy = dev_cfg & BIT(3) ? true : false;
-
 	/*
 	 * FIXME: Once we'll have internal D-PHY support, the check
 	 * will need to be removed.
@@ -426,9 +492,39 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)
 	return ret;
 }
 
+static const struct csi2rx_vops csi2rx_vops = {
+	.get_dev_cfg = csi2rx_get_dev_cfg,
+	.reset = csi2rx_reset,
+	.map_static = csi2rx_map_static
+};
+
+static const struct csi2rx_vops csi2rx_v2_vops = {
+	.get_dev_cfg = csi2rx_v2_get_dev_cfg,
+	.reset = csi2rx_v2_reset,
+	.map_static = csi2rx_v2_map_static
+};
+
+static const struct of_device_id csi2rx_of_table[] = {
+	{
+		.compatible = "cdns,csi2rx",
+		.data = &csi2rx_vops
+	},
+	{
+		.compatible = "cdns,csi2rx-1.3",
+		.data = &csi2rx_vops
+	},
+	{
+		.compatible = "cdns,csi2rx-2.1",
+		.data = &csi2rx_v2_vops
+	},
+	{ }
+};
+MODULE_DEVICE_TABLE(of, csi2rx_of_table);
+
 static int csi2rx_probe(struct platform_device *pdev)
 {
 	struct csi2rx_priv *csi2rx;
+	const struct of_device_id *of_id;
 	unsigned int i;
 	int ret;
 

drivers/media/platform/cadence/cdns-csi2rx.c static int csi2rx_probe(struct platform_device *pdev) · line 539

Quoted 5 lines
drivers/media/platform/cadence/cdns-csi2rx.c +2 -0
@@ -439,6 +535,9 @@ static int csi2rx_probe(struct platform_device *pdev)
 	csi2rx->dev = &pdev->dev;
 	mutex_init(&csi2rx->lock);
 
+	of_id = of_match_node(csi2rx_of_table, pdev->dev.of_node);
+	csi2rx->vops = (struct csi2rx_vops *)of_id->data;

The cast isn't needed, is it?

Quoted 17 lines
drivers/media/platform/cadence/cdns-csi2rx.c +1 -6
+
 	ret = csi2rx_get_resources(csi2rx, pdev);
 	if (ret)
 		goto err_free_priv;
@@ -493,12 +592,6 @@ static int csi2rx_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static const struct of_device_id csi2rx_of_table[] = {
-	{ .compatible = "cdns,csi2rx" },
-	{ },
-};
-MODULE_DEVICE_TABLE(of, csi2rx_of_table);
-
 static struct platform_driver csi2rx_driver = {
 	.probe	= csi2rx_probe,
 	.remove	= csi2rx_remove,
Signature · 3 lines
Kind regards,

Sakari Ailus
author
#11 lore raw

Re: [PATCH v2 3/3] media: Add support for Cadence CSI2RX 2.1

Hello Sakari,

Thanks for the review.

Quoted 12 lines · Sakari Ailus

Hi Jan,

Quoted 7 lines · Jan Kotas

This patch adds support for CSI2RX v2.1 version of the controller.

---
drivers/media/platform/cadence/cdns-csi2rx.c | 139 ++++++++++++++++++++++-----

1 file changed, 116 insertions(+), 23 deletions(-)
Quoted 10 lines

drivers/media/platform/cadence/cdns-csi2rx.c struct csi2rx_priv { · line 84

Quoted 8 lines
struct csi2rx_priv {
	struct device			*dev;
	unsigned int			count;
drivers/media/platform/cadence/cdns-csi2rx.c +1 -0
@@ -69,6 +81,7 @@ struct csi2rx_priv {
 	struct clk			*p_clk;
 	struct clk			*pixel_clk[CSI2RX_STREAMS_MAX];
 	struct phy			*dphy;
+	struct csi2rx_vops		*vops;

const?

I’ll add it, thanks.

Quoted 7 lines
Quoted 7 lines
drivers/media/platform/cadence/cdns-csi2rx.c +0 -0
 	u8				lanes[CSI2RX_LANES_MAX];
 	u8				num_lanes;
@@ -92,6 +105,32 @@ struct csi2rx_priv *v4l2_subdev_to_csi2rx(struct v4l2_subdev *subdev)
 	return container_of(subdev, struct csi2rx_priv, subdev);
 }
 
Quoted 14 lines

drivers/media/platform/cadence/cdns-csi2rx.c struct csi2rx_priv *v4l2_subdev_to_csi2rx(struct v4l2_subdev *subdev) · line 118

Quoted 11 lines
drivers/media/platform/cadence/cdns-csi2rx.c +11 -0
+static void csi2rx_get_dev_cfg(struct csi2rx_priv *csi2rx)
+{
+	u32 dev_cfg;
+
+	clk_prepare_enable(csi2rx->p_clk);
+	dev_cfg = readl(csi2rx->base + CSI2RX_DEVICE_CFG_REG);
+	clk_disable_unprepare(csi2rx->p_clk);
+
+	csi2rx->max_lanes = dev_cfg & 7;
+	csi2rx->max_streams = (dev_cfg >> 4) & 7;
+	csi2rx->has_internal_dphy = dev_cfg & BIT(3) ? true : false;

Could you spell out these a little, by adding #defines for the register bits? Same below.

I tried to keep impact on the original code to the minimum, but you’re right. It’s a good opportunity for a cleanup.

Quoted 9 lines

drivers/media/platform/cadence/cdns-csi2rx.c static int csi2rx_probe(struct platform_device *pdev) · line 539

Quoted 7 lines
drivers/media/platform/cadence/cdns-csi2rx.c +2 -0
@@ -439,6 +535,9 @@ static int csi2rx_probe(struct platform_device *pdev)
 	csi2rx->dev = &pdev->dev;
 	mutex_init(&csi2rx->lock);
 
+	of_id = of_match_node(csi2rx_of_table, pdev->dev.of_node);
+	csi2rx->vops = (struct csi2rx_vops *)of_id->data;

The cast isn't needed, is it?

It’s not, but doesn’t make it more readable?

Quoted 4 lines
Signature · 3 lines
Kind regards,

Sakari Ailus

Regards,
Jan

#12 lore raw

Re: [PATCH v2 3/3] media: Add support for Cadence CSI2RX 2.1

Hi Jan,

Quoted 10 lines · Jan Kotas
Quoted 8 lines

drivers/media/platform/cadence/cdns-csi2rx.c static int csi2rx_probe(struct platform_device *pdev) · line 539

Quoted 6 lines
drivers/media/platform/cadence/cdns-csi2rx.c +2 -0
@@ -439,6 +535,9 @@ static int csi2rx_probe(struct platform_device *pdev)
 	csi2rx->dev = &pdev->dev;
 	mutex_init(&csi2rx->lock);
 
+	of_id = of_match_node(csi2rx_of_table, pdev->dev.of_node);
+	csi2rx->vops = (struct csi2rx_vops *)of_id->data;

The cast isn't needed, is it?

It’s not, but doesn’t make it more readable?

If there's no need for it, please don't use explicit cast.

Signature · 1 line
Sakari Ailus