linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1
@ 2019-07-25 10:26 Jan Kotas
  2019-07-25 10:26 ` [PATCH 1/3] media: dt-bindings: Update bindings " Jan Kotas
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Jan Kotas @ 2019-07-25 10:26 UTC (permalink / raw)
  To: maxime.ripard, mchehab, robh+dt, mark.rutland
  Cc: rafalc, linux-media, devicetree, linux-kernel, Jan Kotas

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 version 2.1
  media: Add lane checks for Cadence CSI2RX
  media: Add support for Cadence CSI2RX 2.1

 .../devicetree/bindings/media/cdns,csi2rx.txt      |   4 +-
 drivers/media/platform/cadence/cdns-csi2rx.c       | 150 +++++++++++++++++----
 2 files changed, 129 insertions(+), 25 deletions(-)

-- 
2.15.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/3] media: dt-bindings: Update bindings for Cadence CSI2RX version 2.1
  2019-07-25 10:26 [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1 Jan Kotas
@ 2019-07-25 10:26 ` Jan Kotas
  2019-08-16 21:18   ` Rob Herring
  2019-07-25 10:26 ` [PATCH 2/3] media: Add lane checks for Cadence CSI2RX Jan Kotas
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Jan Kotas @ 2019-07-25 10:26 UTC (permalink / raw)
  To: maxime.ripard, mchehab, robh+dt, mark.rutland
  Cc: rafalc, linux-media, devicetree, linux-kernel, Jan Kotas

This patch adds a DT bindings documentation for
Cadence CSI2RX v2.1 controller.

Signed-off-by: Jan Kotas <jank@cadence.com>
---
 Documentation/devicetree/bindings/media/cdns,csi2rx.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/media/cdns,csi2rx.txt b/Documentation/devicetree/bindings/media/cdns,csi2rx.txt
index 6b02a0657..a35bb0aed 100644
--- a/Documentation/devicetree/bindings/media/cdns,csi2rx.txt
+++ b/Documentation/devicetree/bindings/media/cdns,csi2rx.txt
@@ -5,7 +5,9 @@ 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:
-- 
2.15.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/3] media: Add lane checks for Cadence CSI2RX
  2019-07-25 10:26 [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1 Jan Kotas
  2019-07-25 10:26 ` [PATCH 1/3] media: dt-bindings: Update bindings " Jan Kotas
@ 2019-07-25 10:26 ` Jan Kotas
  2019-07-25 10:26 ` [PATCH 3/3] media: Add support for Cadence CSI2RX 2.1 Jan Kotas
  2019-08-01  7:36 ` [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1 Jan Kotas
  3 siblings, 0 replies; 7+ messages in thread
From: Jan Kotas @ 2019-07-25 10:26 UTC (permalink / raw)
  To: maxime.ripard, mchehab, robh+dt, mark.rutland
  Cc: rafalc, linux-media, devicetree, linux-kernel, Jan Kotas

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

Signed-off-by: Jan Kotas <jank@cadence.com>
---
 drivers/media/platform/cadence/cdns-csi2rx.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index 31ace114e..97ec09e72 100644
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -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);
-- 
2.15.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 3/3] media: Add support for Cadence CSI2RX 2.1
  2019-07-25 10:26 [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1 Jan Kotas
  2019-07-25 10:26 ` [PATCH 1/3] media: dt-bindings: Update bindings " Jan Kotas
  2019-07-25 10:26 ` [PATCH 2/3] media: Add lane checks for Cadence CSI2RX Jan Kotas
@ 2019-07-25 10:26 ` Jan Kotas
  2019-08-01  7:36 ` [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1 Jan Kotas
  3 siblings, 0 replies; 7+ messages in thread
From: Jan Kotas @ 2019-07-25 10:26 UTC (permalink / raw)
  To: maxime.ripard, mchehab, robh+dt, mark.rutland
  Cc: rafalc, linux-media, devicetree, linux-kernel, Jan Kotas

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

Signed-off-by: Jan Kotas <jank@cadence.com>
---
 drivers/media/platform/cadence/cdns-csi2rx.c | 137 ++++++++++++++++++++++-----
 1 file changed, 115 insertions(+), 22 deletions(-)

diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index 97ec09e72..4c76c6490 100644
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -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,
-- 
2.15.0


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1
  2019-07-25 10:26 [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1 Jan Kotas
                   ` (2 preceding siblings ...)
  2019-07-25 10:26 ` [PATCH 3/3] media: Add support for Cadence CSI2RX 2.1 Jan Kotas
@ 2019-08-01  7:36 ` Jan Kotas
  3 siblings, 0 replies; 7+ messages in thread
From: Jan Kotas @ 2019-08-01  7:36 UTC (permalink / raw)
  To: Maxime Ripard, mchehab, Rob Herring, Mark Rutland
  Cc: Rafal Ciepiela, linux-media, linux-devicetree, LKML, Jan Kotas


> On 25 Jul 2019, at 12:26, Jan Kotas <jank@cadence.com> wrote:
> 
> 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 version 2.1
>  media: Add lane checks for Cadence CSI2RX
>  media: Add support for Cadence CSI2RX 2.1
> 
> .../devicetree/bindings/media/cdns,csi2rx.txt      |   4 +-
> drivers/media/platform/cadence/cdns-csi2rx.c       | 150 +++++++++++++++++----
> 2 files changed, 129 insertions(+), 25 deletions(-)
> 
> -- 
> 2.15.0
> 


Gentle ping.

Regards,
Jan

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] media: dt-bindings: Update bindings for Cadence CSI2RX version 2.1
  2019-07-25 10:26 ` [PATCH 1/3] media: dt-bindings: Update bindings " Jan Kotas
@ 2019-08-16 21:18   ` Rob Herring
  2019-08-19  7:16     ` Jan Kotas
  0 siblings, 1 reply; 7+ messages in thread
From: Rob Herring @ 2019-08-16 21:18 UTC (permalink / raw)
  To: Jan Kotas
  Cc: maxime.ripard, mchehab, mark.rutland, rafalc, linux-media,
	devicetree, linux-kernel

On Thu, Jul 25, 2019 at 11:26:46AM +0100, Jan Kotas wrote:
> This patch adds a DT bindings documentation for
> Cadence CSI2RX v2.1 controller.

And 1.3?

> 
> Signed-off-by: Jan Kotas <jank@cadence.com>
> ---
>  Documentation/devicetree/bindings/media/cdns,csi2rx.txt | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/media/cdns,csi2rx.txt b/Documentation/devicetree/bindings/media/cdns,csi2rx.txt
> index 6b02a0657..a35bb0aed 100644
> --- a/Documentation/devicetree/bindings/media/cdns,csi2rx.txt
> +++ b/Documentation/devicetree/bindings/media/cdns,csi2rx.txt
> @@ -5,7 +5,9 @@ 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

This wording is now not clear that an SoC-specific compatible is always 
required or just for 2.1. Please format one compatible per line.

>    - reg: base address and size of the memory mapped region
>    - clocks: phandles to the clocks driving the controller
>    - clock-names: must contain:
> -- 
> 2.15.0
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] media: dt-bindings: Update bindings for Cadence CSI2RX version 2.1
  2019-08-16 21:18   ` Rob Herring
@ 2019-08-19  7:16     ` Jan Kotas
  0 siblings, 0 replies; 7+ messages in thread
From: Jan Kotas @ 2019-08-19  7:16 UTC (permalink / raw)
  To: Rob Herring
  Cc: Jan Kotas, Maxime Ripard, mchehab, mark.rutland, Rafal Ciepiela,
	linux-media, devicetree, linux-kernel



> On 16 Aug 2019, at 23:18, Rob Herring <robh@kernel.org> wrote:
> 
> 
> On Thu, Jul 25, 2019 at 11:26:46AM +0100, Jan Kotas wrote:
>> This patch adds a DT bindings documentation for
>> Cadence CSI2RX v2.1 controller.
> 
> And 1.3?

OK, I’ll update the commit description.
>> 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
> 
> This wording is now not clear that an SoC-specific compatible is always 
> required or just for 2.1. Please format one compatible per line.

OK, I will fix it in v2.

Thank you for the comments.

Regards,
Jan



^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-08-19  7:16 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-25 10:26 [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1 Jan Kotas
2019-07-25 10:26 ` [PATCH 1/3] media: dt-bindings: Update bindings " Jan Kotas
2019-08-16 21:18   ` Rob Herring
2019-08-19  7:16     ` Jan Kotas
2019-07-25 10:26 ` [PATCH 2/3] media: Add lane checks for Cadence CSI2RX Jan Kotas
2019-07-25 10:26 ` [PATCH 3/3] media: Add support for Cadence CSI2RX 2.1 Jan Kotas
2019-08-01  7:36 ` [PATCH 0/3] media: Add support for Cadence CSI2RX version 2.1 Jan Kotas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).