* [PATCH 2/8] media: imx7-media-csi: Acquire a single clock
@ 2019-05-04 14:40 Fabio Estevam
2019-05-04 14:40 ` [PATCH 3/8] media: imx7-media-csi: Use devm_platform_ioremap_resource() Fabio Estevam
` (6 more replies)
0 siblings, 7 replies; 11+ messages in thread
From: Fabio Estevam @ 2019-05-04 14:40 UTC (permalink / raw)
To: hverkuil-cisco
Cc: rui.silva, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree, Fabio Estevam
As per the i.MX7D Reference Manual only the MCLK is used for
the CSI block, so only handle this single clock.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-media-csi.c | 51 ++++------------------
1 file changed, 8 insertions(+), 43 deletions(-)
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index 18eb5d3ecf10..3e02cfa2f07c 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -152,8 +152,6 @@
#define CSI_CSICR18 0x48
#define CSI_CSICR19 0x4c
-static const char * const imx7_csi_clk_id[] = {"axi", "dcic", "mclk"};
-
struct imx7_csi {
struct device *dev;
struct v4l2_subdev sd;
@@ -180,9 +178,7 @@ struct imx7_csi {
void __iomem *regbase;
int irq;
-
- int num_clks;
- struct clk_bulk_data *clks;
+ struct clk *mclk;
/* active vb2 buffers to send to video dev sink */
struct imx_media_buffer *active_vb2_buf[2];
@@ -204,20 +200,6 @@ struct imx7_csi {
#define imx7_csi_reg_write(_csi, _val, _offset) \
__raw_writel(_val, (_csi)->regbase + (_offset))
-static void imx7_csi_clk_enable(struct imx7_csi *csi)
-{
- int ret;
-
- ret = clk_bulk_prepare_enable(csi->num_clks, csi->clks);
- if (ret < 0)
- dev_err(csi->dev, "failed to enable clocks\n");
-}
-
-static void imx7_csi_clk_disable(struct imx7_csi *csi)
-{
- clk_bulk_disable_unprepare(csi->num_clks, csi->clks);
-}
-
static void imx7_csi_hw_reset(struct imx7_csi *csi)
{
imx7_csi_reg_write(csi,
@@ -413,7 +395,7 @@ static void imx7_csi_init(struct imx7_csi *csi)
if (csi->is_init)
return;
- imx7_csi_clk_enable(csi);
+ clk_prepare_enable(csi->mclk);
imx7_csi_hw_reset(csi);
imx7_csi_init_interface(csi);
imx7_csi_dmareq_rff_enable(csi);
@@ -429,7 +411,7 @@ static void imx7_csi_deinit(struct imx7_csi *csi)
imx7_csi_hw_reset(csi);
imx7_csi_init_interface(csi);
imx7_csi_dmareq_rff_disable(csi);
- imx7_csi_clk_disable(csi);
+ clk_disable_unprepare(csi->mclk);
csi->is_init = false;
}
@@ -1200,24 +1182,6 @@ static int imx7_csi_parse_endpoint(struct device *dev,
return fwnode_device_is_available(asd->match.fwnode) ? 0 : -EINVAL;
}
-static int imx7_csi_clocks_get(struct imx7_csi *csi)
-{
- struct device *dev = csi->dev;
- int i;
-
- csi->num_clks = ARRAY_SIZE(imx7_csi_clk_id);
- csi->clks = devm_kcalloc(dev, csi->num_clks, sizeof(*csi->clks),
- GFP_KERNEL);
-
- if (!csi->clks)
- return -ENOMEM;
-
- for (i = 0; i < csi->num_clks; i++)
- csi->clks[i].id = imx7_csi_clk_id[i];
-
- return devm_clk_bulk_get(dev, csi->num_clks, csi->clks);
-}
-
static int imx7_csi_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -1233,10 +1197,11 @@ static int imx7_csi_probe(struct platform_device *pdev)
csi->dev = dev;
- ret = imx7_csi_clocks_get(csi);
- if (ret < 0) {
- dev_err(dev, "Failed to get clocks");
- return -ENODEV;
+ csi->mclk = devm_clk_get(&pdev->dev, "mclk");
+ if (IS_ERR(csi->mclk)) {
+ ret = PTR_ERR(csi->mclk);
+ dev_err(dev, "Failed to get mclk: %d", ret);
+ return ret;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/8] media: imx7-media-csi: Use devm_platform_ioremap_resource()
2019-05-04 14:40 [PATCH 2/8] media: imx7-media-csi: Acquire a single clock Fabio Estevam
@ 2019-05-04 14:40 ` Fabio Estevam
2019-05-04 14:40 ` [PATCH 4/8] media: imx7-media-csi: Propagate the correct error for platform_get_irq() Fabio Estevam
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Fabio Estevam @ 2019-05-04 14:40 UTC (permalink / raw)
To: hverkuil-cisco
Cc: rui.silva, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree, Fabio Estevam
Use devm_platform_ioremap_resource() to simplify the code a bit.
While at it, propagate the real error value in case of
devm_platform_ioremap_resource() failure.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-media-csi.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index 3e02cfa2f07c..e0286c322fad 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1188,7 +1188,6 @@ static int imx7_csi_probe(struct platform_device *pdev)
struct device_node *node = dev->of_node;
struct imx_media_dev *imxmd;
struct imx7_csi *csi;
- struct resource *res;
int ret;
csi = devm_kzalloc(&pdev->dev, sizeof(*csi), GFP_KERNEL);
@@ -1204,17 +1203,16 @@ static int imx7_csi_probe(struct platform_device *pdev)
return ret;
}
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
csi->irq = platform_get_irq(pdev, 0);
- if (!res || csi->irq < 0) {
+ if (csi->irq < 0) {
dev_err(dev, "Missing platform resources data\n");
return -ENODEV;
}
- csi->regbase = devm_ioremap_resource(dev, res);
+ csi->regbase = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(csi->regbase)) {
dev_err(dev, "Failed platform resources map\n");
- return -ENODEV;
+ return PTR_ERR(csi->regbase);
}
spin_lock_init(&csi->irqlock);
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/8] media: imx7-media-csi: Propagate the correct error for platform_get_irq()
2019-05-04 14:40 [PATCH 2/8] media: imx7-media-csi: Acquire a single clock Fabio Estevam
2019-05-04 14:40 ` [PATCH 3/8] media: imx7-media-csi: Use devm_platform_ioremap_resource() Fabio Estevam
@ 2019-05-04 14:40 ` Fabio Estevam
2019-05-04 14:40 ` [PATCH 5/8] media: imx7-media-csi: Propagate the correct error for devm_request_irq() Fabio Estevam
` (4 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Fabio Estevam @ 2019-05-04 14:40 UTC (permalink / raw)
To: hverkuil-cisco
Cc: rui.silva, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree, Fabio Estevam
In the case of platform_get_irq() failure, let's propagate the real error
code instead of a fake one.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-media-csi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index e0286c322fad..a4cc9a342674 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1206,7 +1206,7 @@ static int imx7_csi_probe(struct platform_device *pdev)
csi->irq = platform_get_irq(pdev, 0);
if (csi->irq < 0) {
dev_err(dev, "Missing platform resources data\n");
- return -ENODEV;
+ return csi->irq;
}
csi->regbase = devm_platform_ioremap_resource(pdev, 0);
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 5/8] media: imx7-media-csi: Propagate the correct error for devm_request_irq()
2019-05-04 14:40 [PATCH 2/8] media: imx7-media-csi: Acquire a single clock Fabio Estevam
2019-05-04 14:40 ` [PATCH 3/8] media: imx7-media-csi: Use devm_platform_ioremap_resource() Fabio Estevam
2019-05-04 14:40 ` [PATCH 4/8] media: imx7-media-csi: Propagate the correct error for platform_get_irq() Fabio Estevam
@ 2019-05-04 14:40 ` Fabio Estevam
2019-05-04 14:40 ` [PATCH 6/8] media: imx7-media-csi: Remove unneeded break Fabio Estevam
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Fabio Estevam @ 2019-05-04 14:40 UTC (permalink / raw)
To: hverkuil-cisco
Cc: rui.silva, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree, Fabio Estevam
In the case of devm_request_irq() failure, let's propagate the real error
code instead of a fake one.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-media-csi.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index a4cc9a342674..88265cd133ab 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1223,7 +1223,6 @@ static int imx7_csi_probe(struct platform_device *pdev)
(void *)csi);
if (ret < 0) {
dev_err(dev, "Request CSI IRQ failed.\n");
- ret = -ENODEV;
goto destroy_mutex;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 6/8] media: imx7-media-csi: Remove unneeded break
2019-05-04 14:40 [PATCH 2/8] media: imx7-media-csi: Acquire a single clock Fabio Estevam
` (2 preceding siblings ...)
2019-05-04 14:40 ` [PATCH 5/8] media: imx7-media-csi: Propagate the correct error for devm_request_irq() Fabio Estevam
@ 2019-05-04 14:40 ` Fabio Estevam
2019-05-04 14:40 ` [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock Fabio Estevam
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Fabio Estevam @ 2019-05-04 14:40 UTC (permalink / raw)
To: hverkuil-cisco
Cc: rui.silva, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree, Fabio Estevam
Remove unneeded 'break' right after the 'return' statement as
pointed out by checkpatch.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-media-csi.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index 88265cd133ab..d1ecdcfc792e 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1003,7 +1003,6 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
break;
default:
return -EINVAL;
- break;
}
return 0;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock
2019-05-04 14:40 [PATCH 2/8] media: imx7-media-csi: Acquire a single clock Fabio Estevam
` (3 preceding siblings ...)
2019-05-04 14:40 ` [PATCH 6/8] media: imx7-media-csi: Remove unneeded break Fabio Estevam
@ 2019-05-04 14:40 ` Fabio Estevam
2019-05-06 21:21 ` Rui Miguel Silva
` (2 more replies)
2019-05-04 14:40 ` [PATCH 7/8] media: imx7-media-csi: Check the return value from clk_prepare_enable() Fabio Estevam
2019-05-04 14:40 ` [PATCH 8/8] media: imx7-media-csi: Change imx7_csi_enable() to void Fabio Estevam
6 siblings, 3 replies; 11+ messages in thread
From: Fabio Estevam @ 2019-05-04 14:40 UTC (permalink / raw)
To: hverkuil-cisco
Cc: rui.silva, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree, Fabio Estevam
As per the i.MX7D Reference Manual only the MCLK is used for
the CSI block, so only document this single clock.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
Documentation/devicetree/bindings/media/imx7-csi.txt | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/imx7-csi.txt b/Documentation/devicetree/bindings/media/imx7-csi.txt
index 3c07bc676bc3..443aef07356e 100644
--- a/Documentation/devicetree/bindings/media/imx7-csi.txt
+++ b/Documentation/devicetree/bindings/media/imx7-csi.txt
@@ -14,8 +14,7 @@ Required properties:
- interrupts : should contain CSI interrupt;
- clocks : list of clock specifiers, see
Documentation/devicetree/bindings/clock/clock-bindings.txt for details;
-- clock-names : must contain "axi", "mclk" and "dcic" entries, matching
- entries in the clock property;
+- clock-names : must contain "mclk";
The device node shall contain one 'port' child node with one child 'endpoint'
node, according to the bindings defined in:
@@ -32,10 +31,8 @@ example:
compatible = "fsl,imx7-csi";
reg = <0x30710000 0x10000>;
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks IMX7D_CLK_DUMMY>,
- <&clks IMX7D_CSI_MCLK_ROOT_CLK>,
- <&clks IMX7D_CLK_DUMMY>;
- clock-names = "axi", "mclk", "dcic";
+ clocks = <&clks IMX7D_CSI_MCLK_ROOT_CLK>;
+ clock-names = "mclk";
port {
csi_from_csi_mux: endpoint {
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 7/8] media: imx7-media-csi: Check the return value from clk_prepare_enable()
2019-05-04 14:40 [PATCH 2/8] media: imx7-media-csi: Acquire a single clock Fabio Estevam
` (4 preceding siblings ...)
2019-05-04 14:40 ` [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock Fabio Estevam
@ 2019-05-04 14:40 ` Fabio Estevam
2019-05-04 14:40 ` [PATCH 8/8] media: imx7-media-csi: Change imx7_csi_enable() to void Fabio Estevam
6 siblings, 0 replies; 11+ messages in thread
From: Fabio Estevam @ 2019-05-04 14:40 UTC (permalink / raw)
To: hverkuil-cisco
Cc: rui.silva, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree, Fabio Estevam
clk_prepare_enable() may fail, so we should better check its return value
and propagate it in the case of error.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-media-csi.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index d1ecdcfc792e..dcc6027fe32b 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -390,17 +390,23 @@ static void imx7_csi_error_recovery(struct imx7_csi *csi)
imx7_csi_hw_enable(csi);
}
-static void imx7_csi_init(struct imx7_csi *csi)
+static int imx7_csi_init(struct imx7_csi *csi)
{
+ int ret;
+
if (csi->is_init)
- return;
+ return 0;
- clk_prepare_enable(csi->mclk);
+ ret = clk_prepare_enable(csi->mclk);
+ if (ret < 0)
+ return ret;
imx7_csi_hw_reset(csi);
imx7_csi_init_interface(csi);
imx7_csi_dmareq_rff_enable(csi);
csi->is_init = true;
+
+ return 0;
}
static void imx7_csi_deinit(struct imx7_csi *csi)
@@ -513,7 +519,7 @@ static int imx7_csi_link_setup(struct media_entity *entity,
init:
if (csi->sink || csi->src_sd)
- imx7_csi_init(csi);
+ ret = imx7_csi_init(csi);
else
imx7_csi_deinit(csi);
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 8/8] media: imx7-media-csi: Change imx7_csi_enable() to void
2019-05-04 14:40 [PATCH 2/8] media: imx7-media-csi: Acquire a single clock Fabio Estevam
` (5 preceding siblings ...)
2019-05-04 14:40 ` [PATCH 7/8] media: imx7-media-csi: Check the return value from clk_prepare_enable() Fabio Estevam
@ 2019-05-04 14:40 ` Fabio Estevam
6 siblings, 0 replies; 11+ messages in thread
From: Fabio Estevam @ 2019-05-04 14:40 UTC (permalink / raw)
To: hverkuil-cisco
Cc: rui.silva, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree, Fabio Estevam
imx7_csi_enable() always return 0 and its return value is never checked,
so convert it to void.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-media-csi.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index dcc6027fe32b..0f51791f788a 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -799,7 +799,7 @@ static int imx7_csi_configure(struct imx7_csi *csi)
return 0;
}
-static int imx7_csi_enable(struct imx7_csi *csi)
+static void imx7_csi_enable(struct imx7_csi *csi)
{
imx7_csi_sw_reset(csi);
@@ -807,10 +807,7 @@ static int imx7_csi_enable(struct imx7_csi *csi)
imx7_csi_dmareq_rff_enable(csi);
imx7_csi_hw_enable_irq(csi);
imx7_csi_hw_enable(csi);
- return 0;
}
-
- return 0;
}
static void imx7_csi_disable(struct imx7_csi *csi)
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock
2019-05-04 14:40 ` [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock Fabio Estevam
@ 2019-05-06 21:21 ` Rui Miguel Silva
2019-05-27 20:18 ` Fabio Estevam
2019-06-13 18:07 ` Rob Herring
2 siblings, 0 replies; 11+ messages in thread
From: Rui Miguel Silva @ 2019-05-06 21:21 UTC (permalink / raw)
To: Fabio Estevam
Cc: hverkuil-cisco, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree
Oi Fabio,
On Sat 04 May 2019 at 15:40, Fabio Estevam wrote:
> As per the i.MX7D Reference Manual only the MCLK is used for
> the CSI block, so only document this single clock.
>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
You missed to add a cover-letter to the series, but I have tested
it and reviewed on top of Steve series [0] and everything looks good.
Thanks for fixes.
For the all series:
Tested-by: Rui Miguel Silva <rmfrfs@gmail.com>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
---
Cheers,
Rui
[0]: https://lore.kernel.org/linux-media/20190503224326.21039-1-slongerbeam@gmail.com/
> ---
> Documentation/devicetree/bindings/media/imx7-csi.txt | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/media/imx7-csi.txt b/Documentation/devicetree/bindings/media/imx7-csi.txt
> index 3c07bc676bc3..443aef07356e 100644
> --- a/Documentation/devicetree/bindings/media/imx7-csi.txt
> +++ b/Documentation/devicetree/bindings/media/imx7-csi.txt
> @@ -14,8 +14,7 @@ Required properties:
> - interrupts : should contain CSI interrupt;
> - clocks : list of clock specifiers, see
> Documentation/devicetree/bindings/clock/clock-bindings.txt for details;
> -- clock-names : must contain "axi", "mclk" and "dcic" entries, matching
> - entries in the clock property;
> +- clock-names : must contain "mclk";
>
> The device node shall contain one 'port' child node with one child 'endpoint'
> node, according to the bindings defined in:
> @@ -32,10 +31,8 @@ example:
> compatible = "fsl,imx7-csi";
> reg = <0x30710000 0x10000>;
> interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&clks IMX7D_CLK_DUMMY>,
> - <&clks IMX7D_CSI_MCLK_ROOT_CLK>,
> - <&clks IMX7D_CLK_DUMMY>;
> - clock-names = "axi", "mclk", "dcic";
> + clocks = <&clks IMX7D_CSI_MCLK_ROOT_CLK>;
> + clock-names = "mclk";
>
> port {
> csi_from_csi_mux: endpoint {
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock
2019-05-04 14:40 ` [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock Fabio Estevam
2019-05-06 21:21 ` Rui Miguel Silva
@ 2019-05-27 20:18 ` Fabio Estevam
2019-06-13 18:07 ` Rob Herring
2 siblings, 0 replies; 11+ messages in thread
From: Fabio Estevam @ 2019-05-27 20:18 UTC (permalink / raw)
To: Rob Herring
Cc: Rui Miguel Silva, Steve Longerbeam, Philipp Zabel, linux-media,
Sébastien Szymanski, Otavio Salvador,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
hverkuil-cisco
Hi Rob,
On Sat, May 4, 2019 at 11:40 AM Fabio Estevam <festevam@gmail.com> wrote:
>
> As per the i.MX7D Reference Manual only the MCLK is used for
> the CSI block, so only document this single clock.
>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
> Documentation/devicetree/bindings/media/imx7-csi.txt | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/media/imx7-csi.txt b/Documentation/devicetree/bindings/media/imx7-csi.txt
> index 3c07bc676bc3..443aef07356e 100644
> --- a/Documentation/devicetree/bindings/media/imx7-csi.txt
> +++ b/Documentation/devicetree/bindings/media/imx7-csi.txt
> @@ -14,8 +14,7 @@ Required properties:
> - interrupts : should contain CSI interrupt;
> - clocks : list of clock specifiers, see
> Documentation/devicetree/bindings/clock/clock-bindings.txt for details;
> -- clock-names : must contain "axi", "mclk" and "dcic" entries, matching
> - entries in the clock property;
> +- clock-names : must contain "mclk";
>
> The device node shall contain one 'port' child node with one child 'endpoint'
> node, according to the bindings defined in:
> @@ -32,10 +31,8 @@ example:
> compatible = "fsl,imx7-csi";
> reg = <0x30710000 0x10000>;
> interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&clks IMX7D_CLK_DUMMY>,
> - <&clks IMX7D_CSI_MCLK_ROOT_CLK>,
> - <&clks IMX7D_CLK_DUMMY>;
> - clock-names = "axi", "mclk", "dcic";
> + clocks = <&clks IMX7D_CSI_MCLK_ROOT_CLK>;
> + clock-names = "mclk";
Any comments, please?
Thanks
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock
2019-05-04 14:40 ` [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock Fabio Estevam
2019-05-06 21:21 ` Rui Miguel Silva
2019-05-27 20:18 ` Fabio Estevam
@ 2019-06-13 18:07 ` Rob Herring
2 siblings, 0 replies; 11+ messages in thread
From: Rob Herring @ 2019-06-13 18:07 UTC (permalink / raw)
To: Fabio Estevam
Cc: hverkuil-cisco, rui.silva, slongerbeam, p.zabel, linux-media,
sebastien.szymanski, otavio, robh+dt, devicetree, Fabio Estevam
On Sat, 4 May 2019 11:40:25 -0300, Fabio Estevam wrote:
> As per the i.MX7D Reference Manual only the MCLK is used for
> the CSI block, so only document this single clock.
>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
> Documentation/devicetree/bindings/media/imx7-csi.txt | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-06-13 18:07 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-04 14:40 [PATCH 2/8] media: imx7-media-csi: Acquire a single clock Fabio Estevam
2019-05-04 14:40 ` [PATCH 3/8] media: imx7-media-csi: Use devm_platform_ioremap_resource() Fabio Estevam
2019-05-04 14:40 ` [PATCH 4/8] media: imx7-media-csi: Propagate the correct error for platform_get_irq() Fabio Estevam
2019-05-04 14:40 ` [PATCH 5/8] media: imx7-media-csi: Propagate the correct error for devm_request_irq() Fabio Estevam
2019-05-04 14:40 ` [PATCH 6/8] media: imx7-media-csi: Remove unneeded break Fabio Estevam
2019-05-04 14:40 ` [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock Fabio Estevam
2019-05-06 21:21 ` Rui Miguel Silva
2019-05-27 20:18 ` Fabio Estevam
2019-06-13 18:07 ` Rob Herring
2019-05-04 14:40 ` [PATCH 7/8] media: imx7-media-csi: Check the return value from clk_prepare_enable() Fabio Estevam
2019-05-04 14:40 ` [PATCH 8/8] media: imx7-media-csi: Change imx7_csi_enable() to void Fabio Estevam
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).