2016-04-19 08:43:15

by Peng Fan

Subject: [PATCH 1/3] documentation: nvmem: imx-ocotp: Add i.MX6UL support

Add i.MX6UL support in documentation.

Signed-off-by: Peng Fan <[email protected]>
Cc: Srinivas Kandagatla <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Rob Herring <[email protected]>
---
Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
index 383d588..ca2075b 100644
--- a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
+++ b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
@@ -1,13 +1,14 @@
Freescale i.MX6 On-Chip OTP Controller (OCOTP) device tree bindings

This binding represents the on-chip eFuse OTP controller found on
-i.MX6Q/D, i.MX6DL/S, i.MX6SL, and i.MX6SX SoCs.
+i.MX6Q/D, i.MX6DL/S, i.MX6SL, i.MX6SX, and i.MX6UL SoCs.

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".
+ "fsl,imx6sx-ocotp" (i.MX6SX), or
+ "fsl,imx6ul-ocotp" (i.MX6UL), followed by "syscon".
- reg: Should contain the register base and length.
- clocks: Should contain a phandle pointing to the gated peripheral clock.

--
1.8.4.5

2016-04-19 08:43:22

by Peng Fan

Subject: [PATCH 2/3] arm: dts: imx6ul: add ocotp node

Add ocotp node for i.MX6UL

Signed-off-by: Peng Fan <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Rob Herring <[email protected]>
---
arch/arm/boot/dts/imx6ul.dtsi | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 7177899..aebd607 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -839,6 +839,12 @@
reg = <0x021b0000 0x4000>;
};

+ ocotp: ocotp@021bc000 {
+ compatible = "fsl,imx6ul-ocotp", "syscon";
+ reg = <0x021bc000 0x4000>;
+ clocks = <&clks IMX6UL_CLK_OCOTP>;
+ };
+
lcdif: lcdif@021c8000 {
compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif";
reg = <0x021c8000 0x4000>;
--
1.8.4.5

2016-04-19 08:43:32

by Peng Fan

Subject: [PATCH 3/3] nvmem: imx-ocotp: support i.MX6UL

Add of_device_id entry for i.MX6UL to let imx-ocotp driver
support i.MX6UL.

Signed-off-by: Peng Fan <[email protected]>
Cc: Srinivas Kandagatla <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Shawn Guo <[email protected]>
---
drivers/nvmem/imx-ocotp.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c
index 55095c0..4c6e05a 100644
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
@@ -96,6 +96,7 @@ static const struct of_device_id imx_ocotp_dt_ids[] = {
{ .compatible = "fsl,imx6q-ocotp", (void *)128 },
{ .compatible = "fsl,imx6sl-ocotp", (void *)32 },
{ .compatible = "fsl,imx6sx-ocotp", (void *)128 },
+ { .compatible = "fsl,imx6ul-ocotp", (void *)128 },
{ },
};
MODULE_DEVICE_TABLE(of, imx_ocotp_dt_ids);
--
1.8.4.5

2016-04-21 15:10:26

by Rob Herring (Arm)

Subject: Re: [PATCH 1/3] documentation: nvmem: imx-ocotp: Add i.MX6UL support

On Tue, Apr 19, 2016 at 04:59:12PM +0800, Peng Fan wrote:
> Add i.MX6UL support in documentation.
>
> Signed-off-by: Peng Fan <[email protected]>
> Cc: Srinivas Kandagatla <[email protected]>
> Cc: Maxime Ripard <[email protected]>
> Cc: Rob Herring <[email protected]>
> ---
> Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)

Acked-by: Rob Herring <[email protected]>