[PATCH V2 1/3] arm: dts: imx6qdl: add clocks property for ocotp node

[PATCH V2 1/3] arm: dts: imx6qdl: add clocks property for ocotp node

[Peng Fan]

Add clocks property for ocotp node.

Signed-off-by: Peng Fan <van.freenix@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Rob Herring <robh+dt@kernel.org>
---

V2:
 none

 arch/arm/boot/dts/imx6qdl.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index b42822a..6b2ef6c 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -1100,6 +1100,7 @@
 			ocotp: ocotp@021bc000 {
 				compatible = "fsl,imx6q-ocotp", "syscon";
 				reg = <0x021bc000 0x4000>;
+				clocks = <&clks IMX6QDL_CLK_IIM>;
 			};
 
 			tzasc@021d0000 { /* TZASC1 */
-- 
2.6.6

[PATCH V2 2/3] arm: dts: imx6sl: add clocks property for ocotp node

[Peng Fan]

Add clocks property for ocotp node.

Signed-off-by: Peng Fan <van.freenix@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Rob Herring <robh+dt@kernel.org>
---

V2:
 none

 arch/arm/boot/dts/imx6sl.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index d12b250..b37da94 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -853,6 +853,7 @@
 			ocotp: ocotp@021bc000 {
 				compatible = "fsl,imx6sl-ocotp", "syscon";
 				reg = <0x021bc000 0x4000>;
+				clocks = <&clks IMX6SL_CLK_OCOTP>;
 			};
 
 			audmux: audmux@021d8000 {
-- 
2.6.6

[PATCH V2 3/3] nvmem: imx-ocotp: handling clock

[Peng Fan]

Before access ocotp nvmem area, the clock should be enabled.
Or, `hexdump nvmem` will hang the system. So, use such flow:
"
  1. clock_enable_prepare
  2. read nvmem ocotp area
  3. clock_disable_unprepare
"

Signed-off-by: Peng Fan <van.freenix@gmail.com>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Shawn Guo <shawnguo@kernel.org>
---

V2:
 Follow Fabio's comments, check return value of clk_prepare_enable

 drivers/nvmem/imx-ocotp.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c
index d7796eb..3f1dd9f 100644
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
@@ -15,6 +15,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+#include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -27,6 +28,7 @@
 
 struct ocotp_priv {
 	struct device *dev;
+	struct clk *clk;
 	void __iomem *base;
 	unsigned int nregs;
 };
@@ -37,7 +39,7 @@ static int imx_ocotp_read(void *context, const void *reg, size_t reg_size,
 	struct ocotp_priv *priv = context;
 	unsigned int offset = *(u32 *)reg;
 	unsigned int count;
-	int i;
+	int i, ret;
 	u32 index;
 
 	index = offset >> 2;
@@ -46,11 +48,19 @@ static int imx_ocotp_read(void *context, const void *reg, size_t reg_size,
 	if (count > (priv->nregs - index))
 		count = priv->nregs - index;
 
+	ret = clk_prepare_enable(priv->clk);
+	if (ret < 0) {
+		dev_err(priv->dev, "failed to prepare/enable ocotp clk\n");
+		return ret;
+	}
+
 	for (i = index; i < (index + count); i++) {
 		*(u32 *)val = readl(priv->base + 0x400 + i * 0x10);
 		val += 4;
 	}
 
+	clk_disable_unprepare(priv->clk);
+
 	return 0;
 }
 
@@ -112,6 +122,10 @@ static int imx_ocotp_probe(struct platform_device *pdev)
 	if (IS_ERR(priv->base))
 		return PTR_ERR(priv->base);
 
+	priv->clk = devm_clk_get(&pdev->dev, NULL);
+	if (IS_ERR(priv->clk))
+		return PTR_ERR(priv->clk);
+
 	of_id = of_match_device(imx_ocotp_dt_ids, dev);
 	priv->nregs = (unsigned int)of_id->data;
 	imx_ocotp_regmap_config.max_register = 4 * priv->nregs - 4;
-- 
2.6.6

RE: [PATCH V2 3/3] nvmem: imx-ocotp: handling clock

[Peng Fan]

Hi,

Kindly ping..
Any comments on this patch set?

> -----Original Message-----
> From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-
> owner@vger.kernel.org] On Behalf Of Peng Fan
> Sent: Thursday, April 21, 2016 1:26 AM
> To: shawnguo@kernel.org; srinivas.kandagatla@linaro.org;
> maxime.ripard@free-electrons.com
> Cc: linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org; linux-
> kernel@vger.kernel.org; van.freenix@gmail.com
> Subject: [PATCH V2 3/3] nvmem: imx-ocotp: handling clock
> 
> Before access ocotp nvmem area, the clock should be enabled.
> Or, `hexdump nvmem` will hang the system. So, use such flow:
> "
>   1. clock_enable_prepare
>   2. read nvmem ocotp area
>   3. clock_disable_unprepare
> "
> 
> Signed-off-by: Peng Fan <van.freenix@gmail.com>
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> ---
> 
> V2:
>  Follow Fabio's comments, check return value of clk_prepare_enable
> 
>  drivers/nvmem/imx-ocotp.c | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c index
> d7796eb..3f1dd9f 100644
> --- a/drivers/nvmem/imx-ocotp.c
> +++ b/drivers/nvmem/imx-ocotp.c
> @@ -15,6 +15,7 @@
>   * http://www.gnu.org/copyleft/gpl.html
>   */
> 
> +#include <linux/clk.h>
>  #include <linux/device.h>
>  #include <linux/io.h>
>  #include <linux/module.h>
> @@ -27,6 +28,7 @@
> 
>  struct ocotp_priv {
>  	struct device *dev;
> +	struct clk *clk;
>  	void __iomem *base;
>  	unsigned int nregs;
>  };
> @@ -37,7 +39,7 @@ static int imx_ocotp_read(void *context, const void *reg,
> size_t reg_size,
>  	struct ocotp_priv *priv = context;
>  	unsigned int offset = *(u32 *)reg;
>  	unsigned int count;
> -	int i;
> +	int i, ret;
>  	u32 index;
> 
>  	index = offset >> 2;
> @@ -46,11 +48,19 @@ static int imx_ocotp_read(void *context, const void
> *reg, size_t reg_size,
>  	if (count > (priv->nregs - index))
>  		count = priv->nregs - index;
> 
> +	ret = clk_prepare_enable(priv->clk);
> +	if (ret < 0) {
> +		dev_err(priv->dev, "failed to prepare/enable ocotp clk\n");
> +		return ret;
> +	}
> +
>  	for (i = index; i < (index + count); i++) {
>  		*(u32 *)val = readl(priv->base + 0x400 + i * 0x10);
>  		val += 4;
>  	}
> 
> +	clk_disable_unprepare(priv->clk);
> +
>  	return 0;
>  }
> 
> @@ -112,6 +122,10 @@ static int imx_ocotp_probe(struct platform_device
> *pdev)
>  	if (IS_ERR(priv->base))
>  		return PTR_ERR(priv->base);
> 
> +	priv->clk = devm_clk_get(&pdev->dev, NULL);
> +	if (IS_ERR(priv->clk))
> +		return PTR_ERR(priv->clk);
> +
>  	of_id = of_match_device(imx_ocotp_dt_ids, dev);
>  	priv->nregs = (unsigned int)of_id->data;
>  	imx_ocotp_regmap_config.max_register = 4 * priv->nregs - 4;
> --
> 2.6.6

Thanks,
Peng.

Re: [PATCH V2 3/3] nvmem: imx-ocotp: handling clock

[Srinivas Kandagatla]

Thanks for the Ping, I totally missed this thread.

On 20/04/16 18:26, Peng Fan wrote:
> Before access ocotp nvmem area, the clock should be enabled.
> Or, `hexdump nvmem` will hang the system. So, use such flow:
> "
>    1. clock_enable_prepare
>    2. read nvmem ocotp area
>    3. clock_disable_unprepare
> "
>
> Signed-off-by: Peng Fan <van.freenix-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Srinivas Kandagatla <srinivas.kandagatla-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Cc: Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> ---
>
> V2:
>   Follow Fabio's comments, check return value of clk_prepare_enable
>
>   drivers/nvmem/imx-ocotp.c | 16 +++++++++++++++-
>   1 file changed, 15 insertions(+), 1 deletion(-)

Changes to the driver looks good to me,
Only one comment, As the clock property is now made mandatory, you 
should update the dt-bindings with this info too.


thanks,
srini
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V2 3/3] nvmem: imx-ocotp: handling clock

[Peng Fan]

Hi Srinivas,

On Mon, May 09, 2016 at 01:28:14PM +0100, Srinivas Kandagatla wrote:
>Thanks for the Ping, I totally missed this thread.
>
>On 20/04/16 18:26, Peng Fan wrote:
>>Before access ocotp nvmem area, the clock should be enabled.
>>Or, `hexdump nvmem` will hang the system. So, use such flow:
>>"
>>   1. clock_enable_prepare
>>   2. read nvmem ocotp area
>>   3. clock_disable_unprepare
>>"
>>
>>Signed-off-by: Peng Fan <van.freenix@gmail.com>
>>Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>>Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
>>Cc: Shawn Guo <shawnguo@kernel.org>
>>---
>>
>>V2:
>>  Follow Fabio's comments, check return value of clk_prepare_enable
>>
>>  drivers/nvmem/imx-ocotp.c | 16 +++++++++++++++-
>>  1 file changed, 15 insertions(+), 1 deletion(-)
>
>Changes to the driver looks good to me,
>Only one comment, As the clock property is now made mandatory, you should
>update the dt-bindings with this info too.

In Documentation/devicetree/bindings/nvmem/imx-ocotp.txt,
the clock property is already marked Required properties:
"
Required properties:
- compatible: should be one of
	"fsl,imx6q-ocotp" (i.MX6Q/D/DL/S),
	"fsl,imx6sl-ocotp" (i.MX6SL), or
	"fsl,imx6sx-ocotp" (i.MX6SX), followed by "syscon".
- reg: Should contain the register base and length.
- clocks: Should contain a phandle pointing to the gated peripheral clock.

Example:

	ocotp: ocotp@021bc000 {
		compatible = "fsl,imx6q-ocotp", "syscon";
		reg = <0x021bc000 0x4000>;
		clocks = <&clks IMX6QDL_CLK_IIM>;
	};
"

I think I do not need to update it, since it's already there -:)

Thanks,
Peng.
>
>
>thanks,
>srini

Re: [PATCH V2 3/3] nvmem: imx-ocotp: handling clock

[Srinivas Kandagatla]

On 09/05/16 13:41, Peng Fan wrote:
> Hi Srinivas,
>
> On Mon, May 09, 2016 at 01:28:14PM +0100, Srinivas Kandagatla wrote:
>> Thanks for the Ping, I totally missed this thread.
>>
>> On 20/04/16 18:26, Peng Fan wrote:
>>> Before access ocotp nvmem area, the clock should be enabled.
>>> Or, `hexdump nvmem` will hang the system. So, use such flow:
>>> "
>>>    1. clock_enable_prepare
>>>    2. read nvmem ocotp area
>>>    3. clock_disable_unprepare
>>> "
>>>
>>> Signed-off-by: Peng Fan <van.freenix-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>>> Cc: Srinivas Kandagatla <srinivas.kandagatla-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
>>> Cc: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
>>> Cc: Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
>>> ---
>>>
>>> V2:
>>>   Follow Fabio's comments, check return value of clk_prepare_enable
>>>
>>>   drivers/nvmem/imx-ocotp.c | 16 +++++++++++++++-
>>>   1 file changed, 15 insertions(+), 1 deletion(-)
>>
>> Changes to the driver looks good to me,
>> Only one comment, As the clock property is now made mandatory, you should
>> update the dt-bindings with this info too.
>
> In Documentation/devicetree/bindings/nvmem/imx-ocotp.txt,
> the clock property is already marked Required properties:

Ok, I can take this patch, dt patch should go via the dt maintainers.

thanks,
--srini
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH V2 3/3] nvmem: imx-ocotp: handling clock

[Peng Fan]

> -----Original Message-----
> From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel-
> owner@vger.kernel.org] On Behalf Of Srinivas Kandagatla
> Sent: Tuesday, May 10, 2016 6:32 PM
> To: Peng Fan <van.freenix@gmail.com>
> Cc: shawnguo@kernel.org; maxime.ripard@free-electrons.com; linux-arm-
> kernel@lists.infradead.org; devicetree@vger.kernel.org; linux-
> kernel@vger.kernel.org
> Subject: Re: [PATCH V2 3/3] nvmem: imx-ocotp: handling clock
> 
> 
> 
> On 09/05/16 13:41, Peng Fan wrote:
> > Hi Srinivas,
> >
> > On Mon, May 09, 2016 at 01:28:14PM +0100, Srinivas Kandagatla wrote:
> >> Thanks for the Ping, I totally missed this thread.
> >>
> >> On 20/04/16 18:26, Peng Fan wrote:
> >>> Before access ocotp nvmem area, the clock should be enabled.
> >>> Or, `hexdump nvmem` will hang the system. So, use such flow:
> >>> "
> >>>    1. clock_enable_prepare
> >>>    2. read nvmem ocotp area
> >>>    3. clock_disable_unprepare
> >>> "
> >>>
> >>> Signed-off-by: Peng Fan <van.freenix@gmail.com>
> >>> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> >>> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
> >>> Cc: Shawn Guo <shawnguo@kernel.org>
> >>> ---
> >>>
> >>> V2:
> >>>   Follow Fabio's comments, check return value of clk_prepare_enable
> >>>
> >>>   drivers/nvmem/imx-ocotp.c | 16 +++++++++++++++-
> >>>   1 file changed, 15 insertions(+), 1 deletion(-)
> >>
> >> Changes to the driver looks good to me, Only one comment, As the
> >> clock property is now made mandatory, you should update the
> >> dt-bindings with this info too.
> >
> > In Documentation/devicetree/bindings/nvmem/imx-ocotp.txt,
> > the clock property is already marked Required properties:
> 
> Ok, I can take this patch, dt patch should go via the dt maintainers.

Thanks, Srinivas.

Shawn,

Will you review and pick up the other two patches, since changes to i.MX dts files?

https://lkml.org/lkml/2016/4/20/150          arm: dts: imx6qdl: add clocks property for ocotp node  
https://lkml.org/lkml/2016/4/20/153          arm: dts: imx6sl: add clocks property for ocotp node

Thanks,
Peng.
> 
> thanks,
> --srini

Re: [PATCH V2 1/3] arm: dts: imx6qdl: add clocks property for ocotp node

[Shawn Guo]

On Thu, Apr 21, 2016 at 01:26:15AM +0800, Peng Fan wrote:
> Add clocks property for ocotp node.
> 
> Signed-off-by: Peng Fan <van.freenix@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Rob Herring <robh+dt@kernel.org>

Applied both dts patches, thanks.