2016-04-20 09:10:42

by Peng Fan

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

Add clocks property for ocotp node.

Signed-off-by: Peng Fan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Rob Herring <[email protected]>
---

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

2016-04-20 09:10:49

by Peng Fan

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

Add clocks property for ocotp node.

Signed-off-by: Peng Fan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Rob Herring <[email protected]>
---

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

2016-04-20 09:11:01

by Peng Fan

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 <[email protected]>
Cc: Srinivas Kandagatla <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Shawn Guo <[email protected]>
---

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