[PATCH 0/3] nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support

[PATCH 0/3] nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support

[Stefan Wahren]

According to the reference manuals for i.MX6ULL and i.MX6ULZ both SoCs
only support 8 OTP banks instead of 16. So we can't use the compatible
string of i.MX6UL.

Stefan Wahren (3):
  dt-bindings: imx-ocotp: Add i.MX6ULL/ULZ support
  nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support
  ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible

 Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 3 ++-
 arch/arm/boot/dts/imx6ull.dtsi                        | 4 ++++
 drivers/nvmem/imx-ocotp.c                             | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

-- 
2.7.4

[PATCH 1/3] dt-bindings: imx-ocotp: Add i.MX6ULL/ULZ support

[Stefan Wahren]

Since the i.MX6ULL/ULZ only supports 8 OTP banks we need to introduce a new
compatible.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
index 792bc5f..455ebbb 100644
--- a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
+++ b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
@@ -1,7 +1,7 @@
 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, i.MX6SX, i.MX6UL and i.MX6SLL SoCs.
+i.MX6Q/D, i.MX6DL/S, i.MX6SL, i.MX6SX, i.MX6UL, i.MX6ULL/ULZ and i.MX6SLL SoCs.
 
 Required properties:
 - compatible: should be one of
@@ -9,6 +9,7 @@ Required properties:
 	"fsl,imx6sl-ocotp" (i.MX6SL), or
 	"fsl,imx6sx-ocotp" (i.MX6SX),
 	"fsl,imx6ul-ocotp" (i.MX6UL),
+	"fsl,imx6ull-ocotp" (i.MX6ULL/ULZ),
 	"fsl,imx7d-ocotp" (i.MX7D/S),
 	"fsl,imx6sll-ocotp" (i.MX6SLL),
 	followed by "syscon".
-- 
2.7.4

Re: [PATCH 1/3] dt-bindings: imx-ocotp: Add i.MX6ULL/ULZ support

[Rob Herring]

On Tue, 11 Dec 2018 14:51:11 +0100, Stefan Wahren wrote:
> Since the i.MX6ULL/ULZ only supports 8 OTP banks we need to introduce a new
> compatible.
> 
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---
>  Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

[PATCH 2/3] nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support

[Stefan Wahren]

In comparision to the i.MX6UL the lower cost variants i.MX6ULL/ULZ only
supports 8 OTP banks a 8 words.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 drivers/nvmem/imx-ocotp.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c
index afb429a..a433a41 100644
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
@@ -427,6 +427,12 @@ static const struct ocotp_params imx6ul_params = {
 	.set_timing = imx_ocotp_set_imx6_timing,
 };
 
+static const struct ocotp_params imx6ull_params = {
+	.nregs = 64,
+	.bank_address_words = 0,
+	.set_timing = imx_ocotp_set_imx6_timing,
+};
+
 static const struct ocotp_params imx7d_params = {
 	.nregs = 64,
 	.bank_address_words = 4,
@@ -438,6 +444,7 @@ static const struct of_device_id imx_ocotp_dt_ids[] = {
 	{ .compatible = "fsl,imx6sl-ocotp", .data = &imx6sl_params },
 	{ .compatible = "fsl,imx6sx-ocotp", .data = &imx6sx_params },
 	{ .compatible = "fsl,imx6ul-ocotp", .data = &imx6ul_params },
+	{ .compatible = "fsl,imx6ull-ocotp", .data = &imx6ull_params },
 	{ .compatible = "fsl,imx7d-ocotp",  .data = &imx7d_params },
 	{ .compatible = "fsl,imx6sll-ocotp", .data = &imx6sll_params },
 	{ },
-- 
2.7.4

[PATCH 3/3] ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible

[Stefan Wahren]

Since imx6ulz.dtsi includes imx6ull.dtsi, we only need to fix the compatible
string here to achieve the correct OTP size for both SoCs.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 arch/arm/boot/dts/imx6ull.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
index f3668fe..9cd1a48 100644
--- a/arch/arm/boot/dts/imx6ull.dtsi
+++ b/arch/arm/boot/dts/imx6ull.dtsi
@@ -30,6 +30,10 @@
 	>;
 };
 
+&ocotp {
+	compatible = "fsl,imx6ull-ocotp", "syscon";
+};
+
 / {
 	soc {
 		aips3: aips-bus@2200000 {
-- 
2.7.4

Re: [PATCH 3/3] ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible

[Shawn Guo]

On Tue, Dec 11, 2018 at 02:51:13PM +0100, Stefan Wahren wrote:
> Since imx6ulz.dtsi includes imx6ull.dtsi, we only need to fix the compatible
> string here to achieve the correct OTP size for both SoCs.
> 
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>

Applied, thanks.

Re: [PATCH 0/3] nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support

[Stefan Wahren]

Hi Shawn,
hi Srinivas,

Am 11.12.18 um 14:51 schrieb Stefan Wahren:
> According to the reference manuals for i.MX6ULL and i.MX6ULZ both SoCs
> only support 8 OTP banks instead of 16. So we can't use the compatible
> string of i.MX6UL.
>
> Stefan Wahren (3):
>   dt-bindings: imx-ocotp: Add i.MX6ULL/ULZ support
>   nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support
>   ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible
>
>  Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 3 ++-
>  arch/arm/boot/dts/imx6ull.dtsi                        | 4 ++++
>  drivers/nvmem/imx-ocotp.c                             | 7 +++++++
>  3 files changed, 13 insertions(+), 1 deletion(-)
>
Rob already gave his Reviewed-By for the binding. Are you fine with the rest of the series?

Regards
Stefan

Re: [PATCH 0/3] nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support

[Srinivas Kandagatla]

On 15/01/2019 10:17, Stefan Wahren wrote:
> Hi Shawn,
> hi Srinivas,
> 
> Am 11.12.18 um 14:51 schrieb Stefan Wahren:
>> According to the reference manuals for i.MX6ULL and i.MX6ULZ both SoCs
>> only support 8 OTP banks instead of 16. So we can't use the compatible
>> string of i.MX6UL.
>>
>> Stefan Wahren (3):
>>    dt-bindings: imx-ocotp: Add i.MX6ULL/ULZ support
>>    nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support
>>    ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible
>>
>>   Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 3 ++-
>>   arch/arm/boot/dts/imx6ull.dtsi                        | 4 ++++
>>   drivers/nvmem/imx-ocotp.c                             | 7 +++++++
>>   3 files changed, 13 insertions(+), 1 deletion(-)
>>
> Rob already gave his Reviewed-By for the binding. Are you fine with the rest of the series?
> 

I can take 1 and 2 via nvmem tree, dt patch has to go via ARM SoC tree!


thanks,
srini
> Regards
> Stefan
> 

Re: [PATCH 0/3] nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support

[Srinivas Kandagatla]

On 15/01/2019 10:17, Stefan Wahren wrote:
> Hi Shawn,
> hi Srinivas,
> 
> Am 11.12.18 um 14:51 schrieb Stefan Wahren:
>> According to the reference manuals for i.MX6ULL and i.MX6ULZ both SoCs
>> only support 8 OTP banks instead of 16. So we can't use the compatible
>> string of i.MX6UL.
>>
>> Stefan Wahren (3):
>>    dt-bindings: imx-ocotp: Add i.MX6ULL/ULZ support
>>    nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support
>>    ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible
>>
>>   Documentation/devicetree/bindings/nvmem/imx-ocotp.txt | 3 ++-
>>   arch/arm/boot/dts/imx6ull.dtsi                        | 4 ++++
>>   drivers/nvmem/imx-ocotp.c                             | 7 +++++++
>>   3 files changed, 13 insertions(+), 1 deletion(-)
>>
> Rob already gave his Reviewed-By for the binding. Are you fine with the rest of the series?

Applied 1 and 2.

Thanks,
srini
> 
> Regards
> Stefan
>