Skip to contentSkip to conversation

Change i.MX/MXS SoCs ocotp/iim node name to efuse

PATCH Applied Anson Huang 3 participants 7 messages May 28, 2020 – Jun 23, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Change i.MX/MXS SoCs ocotp/iim node name to efuse

In the nvmem yaml schema, it requires the nodename to be one of "eeprom|efuse|nvram", so need to change all i.MX/MXS SoCs ocotp/iim node name to efuse:

MXS platforms: i.MX23/28;
i.MX platforms with IIM: i.MX25/27/31/35/51/53.
i.MX ARMv7 platforms with OCOTP: i.MX6QDL/6SL/6SX/6SLL/6UL/7S/7ULP. i.MX ARMv8 platforms with OCOTP: i.MX8MQ/8MM/8MN/8MP.

Anson Huang (4):
ARM: dts: imx: change ocotp node name on i.MX6/7 SoCs
arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs
ARM: dts: imx: change ocotp node name on MXS SoCs
ARM: dts: imx: change iim node name on i.MX SoCs

 arch/arm/boot/dts/imx23.dtsi              | 2 +-
 arch/arm/boot/dts/imx25.dtsi              | 2 +-
 arch/arm/boot/dts/imx27.dtsi              | 2 +-
 arch/arm/boot/dts/imx28.dtsi              | 2 +-
 arch/arm/boot/dts/imx31.dtsi              | 2 +-
 arch/arm/boot/dts/imx35.dtsi              | 2 +-
 arch/arm/boot/dts/imx51.dtsi              | 2 +-
 arch/arm/boot/dts/imx53.dtsi              | 2 +-
 arch/arm/boot/dts/imx6qdl.dtsi            | 2 +-
 arch/arm/boot/dts/imx6sl.dtsi             | 2 +-
 arch/arm/boot/dts/imx6sll.dtsi            | 2 +-
 arch/arm/boot/dts/imx6sx.dtsi             | 2 +-
 arch/arm/boot/dts/imx6ul.dtsi             | 2 +-
 arch/arm/boot/dts/imx7s.dtsi              | 2 +-
 arch/arm/boot/dts/imx7ulp.dtsi            | 2 +-
 arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/4 ARM: dts: imx: change ocotp node name on i.MX6/7 SoCs

Change OCOTP node name from ocotp-ctrl to efuse to be compliant with yaml schema, it requires the nodename to be one of "eeprom|efuse|nvram".

---
 arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
 arch/arm/boot/dts/imx6sl.dtsi  | 2 +-
 arch/arm/boot/dts/imx6sll.dtsi | 2 +-
 arch/arm/boot/dts/imx6sx.dtsi  | 2 +-
 arch/arm/boot/dts/imx6ul.dtsi  | 2 +-
 arch/arm/boot/dts/imx7s.dtsi   | 2 +-
 arch/arm/boot/dts/imx7ulp.dtsi | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/imx6qdl.dtsi +1 -1
index 43d44d5..e14a6f2 100644
@@ -1162,7 +1162,7 @@
 				status = "disabled";
 			};
 
-			ocotp: ocotp-ctrl@21bc000 {
+			ocotp: efuse@21bc000 {
 				compatible = "fsl,imx6q-ocotp", "syscon";
 				reg = <0x021bc000 0x4000>;
 				clocks = <&clks IMX6QDL_CLK_IIM>;
arch/arm/boot/dts/imx6sl.dtsi +1 -1
index d8efc0a..11e7bf3 100644
@@ -952,7 +952,7 @@
 				status = "disabled";
 			};
 
-			ocotp: ocotp-ctrl@21bc000 {
+			ocotp: efuse@21bc000 {
 				compatible = "fsl,imx6sl-ocotp", "syscon";
 				reg = <0x021bc000 0x4000>;
 				clocks = <&clks IMX6SL_CLK_OCOTP>;
arch/arm/boot/dts/imx6sll.dtsi +1 -1
index bf7f048..b715aa7 100644
@@ -786,7 +786,7 @@
 				clocks = <&clks IMX6SLL_CLK_MMDC_P0_IPG>;
 			};
 
-			ocotp: ocotp-ctrl@21bc000 {
+			ocotp: efuse@21bc000 {
 				#address-cells = <1>;
 				#size-cells = <1>;
 				compatible = "fsl,imx6sll-ocotp", "syscon";
arch/arm/boot/dts/imx6sx.dtsi +1 -1
index 8c4473b..5cccf69 100644
@@ -1053,7 +1053,7 @@
 				status = "disabled";
 			};
 
-			ocotp: ocotp-ctrl@21bc000 {
+			ocotp: efuse@21bc000 {
 				#address-cells = <1>;
 				#size-cells = <1>;
 				compatible = "fsl,imx6sx-ocotp", "syscon";
arch/arm/boot/dts/imx6ul.dtsi +1 -1
index 505fd4f..a7a85c2 100644
@@ -946,7 +946,7 @@
 				status = "disabled";
 			};
 
-			ocotp: ocotp-ctrl@21bc000 {
+			ocotp: efuse@21bc000 {
 				#address-cells = <1>;
 				#size-cells = <1>;
 				compatible = "fsl,imx6ul-ocotp", "syscon";
arch/arm/boot/dts/imx7s.dtsi +1 -1
index 3904558..4771d70 100644
@@ -526,7 +526,7 @@
 				};
 			};
 
-			ocotp: ocotp-ctrl@30350000 {
+			ocotp: efuse@30350000 {
 				#address-cells = <1>;
 				#size-cells = <1>;
 				compatible = "fsl,imx7d-ocotp", "syscon";
arch/arm/boot/dts/imx7ulp.dtsi +1 -1
index f7c4878..3674396 100644
@@ -452,7 +452,7 @@
 			reg = <0x410a3000 0x1000>;
 		};
 
-		ocotp: ocotp-ctrl@410a6000 {
+		ocotp: efuse@410a6000 {
 			compatible = "fsl,imx7ulp-ocotp", "syscon";
 			reg = <0x410a6000 0x4000>;
 			clocks = <&scg1 IMX7ULP_CLK_DUMMY>;
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/4 arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs

In reply to Anson Huang

Change OCOTP node name from ocotp-ctrl to efuse to be compliant with yaml schema, it requires the nodename to be one of "eeprom|efuse|nvram".

---
 arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +-
 arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm.dtsi +1 -1
index aaf6e71..740cc62 100644
@@ -467,7 +467,7 @@
 				reg = <0x30340000 0x10000>;
 			};
 
-			ocotp: ocotp-ctrl@30350000 {
+			ocotp: efuse@30350000 {
 				compatible = "fsl,imx8mm-ocotp", "syscon";
 				reg = <0x30350000 0x10000>;
 				clocks = <&clk IMX8MM_CLK_OCOTP_ROOT>;
arch/arm64/boot/dts/freescale/imx8mn.dtsi +1 -1
index 9a4b65a..0625cc8 100644
@@ -374,7 +374,7 @@
 				reg = <0x30340000 0x10000>;
 			};
 
-			ocotp: ocotp-ctrl@30350000 {
+			ocotp: efuse@30350000 {
 				compatible = "fsl,imx8mn-ocotp", "fsl,imx8mm-ocotp", "syscon";
 				reg = <0x30350000 0x10000>;
 				clocks = <&clk IMX8MN_CLK_OCOTP_ROOT>;
arch/arm64/boot/dts/freescale/imx8mp.dtsi +1 -1
index 23e9a4c..c248e7f 100644
@@ -340,7 +340,7 @@
 				reg = <0x30340000 0x10000>;
 			};
 
-			ocotp: ocotp-ctrl@30350000 {
+			ocotp: efuse@30350000 {
 				compatible = "fsl,imx8mp-ocotp", "syscon";
 				reg = <0x30350000 0x10000>;
 				clocks = <&clk IMX8MP_CLK_OCOTP_ROOT>;
arch/arm64/boot/dts/freescale/imx8mq.dtsi +1 -1
index 978f812..b156cd5 100644
@@ -539,7 +539,7 @@
 				};
 			};
 
-			ocotp: ocotp-ctrl@30350000 {
+			ocotp: efuse@30350000 {
 				compatible = "fsl,imx8mq-ocotp", "syscon";
 				reg = <0x30350000 0x10000>;
 				clocks = <&clk IMX8MQ_CLK_OCOTP_ROOT>;
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/4 ARM: dts: imx: change ocotp node name on MXS SoCs

In reply to Anson Huang

Change OCOTP node name from ocotp to efuse to be compliant with yaml schema, it requires the nodename to be one of "eeprom|efuse|nvram".

---
 arch/arm/boot/dts/imx23.dtsi | 2 +-
 arch/arm/boot/dts/imx28.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx23.dtsi +1 -1
index c5edff3..18289f6 100644
@@ -442,7 +442,7 @@
 				status = "disabled";
 			};
 
-			ocotp@8002c000 {
+			efuse@8002c000 {
 				compatible = "fsl,imx23-ocotp", "fsl,ocotp";
 				#address-cells = <1>;
 				#size-cells = <1>;
arch/arm/boot/dts/imx28.dtsi +1 -1
index a1cbbeb..a2b799c 100644
@@ -1011,7 +1011,7 @@
 				status = "disabled";
 			};
 
-			ocotp: ocotp@8002c000 {
+			ocotp: efuse@8002c000 {
 				compatible = "fsl,imx28-ocotp", "fsl,ocotp";
 				#address-cells = <1>;
 				#size-cells = <1>;
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/4 ARM: dts: imx: change iim node name on i.MX SoCs

In reply to Anson Huang

Change IIM node name from iim to efuse to be compliant with yaml schema, it requires the nodename to be one of "eeprom|efuse|nvram".

---
 arch/arm/boot/dts/imx25.dtsi | 2 +-
 arch/arm/boot/dts/imx27.dtsi | 2 +-
 arch/arm/boot/dts/imx31.dtsi | 2 +-
 arch/arm/boot/dts/imx35.dtsi | 2 +-
 arch/arm/boot/dts/imx51.dtsi | 2 +-
 arch/arm/boot/dts/imx53.dtsi | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx25.dtsi +1 -1
index 1123e683..4eaf4eb 100644
@@ -542,7 +542,7 @@
 				interrupts = <26>;
 			};
 
-			iim: iim@53ff0000 {
+			iim: efuse@53ff0000 {
 				compatible = "fsl,imx25-iim", "fsl,imx27-iim";
 				reg = <0x53ff0000 0x4000>;
 				interrupts = <19>;
arch/arm/boot/dts/imx27.dtsi +1 -1
index 002cd22..ee04771 100644
@@ -540,7 +540,7 @@
 				#clock-cells = <1>;
 			};
 
-			iim: iim@10028000 {
+			iim: efuse@10028000 {
 				compatible = "fsl,imx27-iim";
 				reg = <0x10028000 0x1000>;
 				interrupts = <62>;
arch/arm/boot/dts/imx31.dtsi +1 -1
index 18270ec..4f3d7ab 100644
@@ -217,7 +217,7 @@
 				status = "disabled";
 			};
 
-			iim: iim@5001c000 {
+			iim: efuse@5001c000 {
 				compatible = "fsl,imx31-iim", "fsl,imx27-iim";
 				reg = <0x5001c000 0x1000>;
 				interrupts = <19>;
arch/arm/boot/dts/imx35.dtsi +1 -1
index 2ebf2c1..502112b 100644
@@ -320,7 +320,7 @@
 				status = "disabled";
 			};
 
-			iim@53ff0000 {
+			efuse@53ff0000 {
 				compatible = "fsl,imx35-iim";
 				reg = <0x53ff0000 0x4000>;
 				interrupts = <19>;
arch/arm/boot/dts/imx51.dtsi +1 -1
index d3583aa..c83bc77 100644
@@ -466,7 +466,7 @@
 				reg = <0x83f00000 0x60>;
 			};
 
-			iim: iim@83f98000 {
+			iim: efuse@83f98000 {
 				compatible = "fsl,imx51-iim", "fsl,imx27-iim";
 				reg = <0x83f98000 0x4000>;
 				interrupts = <69>;
arch/arm/boot/dts/imx53.dtsi +1 -1
index afa57bf..ed6b0c8 100644
@@ -667,7 +667,7 @@
 				reg = <0x63f00000 0x60>;
 			};
 
-			iim: iim@63f98000 {
+			iim: efuse@63f98000 {
 				compatible = "fsl,imx53-iim", "fsl,imx27-iim";
 				reg = <0x63f98000 0x4000>;
 				interrupts = <69>;
Signature · 1 line
2.7.4
Reviewed-by on the v1 series
#5 lore raw
In reply to Anson Huang

From: Anson Huang <[email protected]> Sent: Thursday, May 28, 2020 11:13 AM

Quoted 8 lines

In the nvmem yaml schema, it requires the nodename to be one of "eeprom|efuse|nvram", so need to change all i.MX/MXS SoCs ocotp/iim node name to efuse:

MXS platforms: i.MX23/28;
i.MX platforms with IIM: i.MX25/27/31/35/51/53.
i.MX ARMv7 platforms with OCOTP: i.MX6QDL/6SL/6SX/6SLL/6UL/7S/7ULP. i.MX ARMv8 platforms with OCOTP: i.MX8MQ/8MM/8MN/8MP.

Quoted 28 lines

Anson Huang (4):
ARM: dts: imx: change ocotp node name on i.MX6/7 SoCs
arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs
ARM: dts: imx: change ocotp node name on MXS SoCs
ARM: dts: imx: change iim node name on i.MX SoCs

 arch/arm/boot/dts/imx23.dtsi              | 2 +-
 arch/arm/boot/dts/imx25.dtsi              | 2 +-
 arch/arm/boot/dts/imx27.dtsi              | 2 +-
 arch/arm/boot/dts/imx28.dtsi              | 2 +-
 arch/arm/boot/dts/imx31.dtsi              | 2 +-
 arch/arm/boot/dts/imx35.dtsi              | 2 +-
 arch/arm/boot/dts/imx51.dtsi              | 2 +-
 arch/arm/boot/dts/imx53.dtsi              | 2 +-
 arch/arm/boot/dts/imx6qdl.dtsi            | 2 +-
 arch/arm/boot/dts/imx6sl.dtsi             | 2 +-
 arch/arm/boot/dts/imx6sll.dtsi            | 2 +-
 arch/arm/boot/dts/imx6sx.dtsi             | 2 +-
 arch/arm/boot/dts/imx6ul.dtsi             | 2 +-
 arch/arm/boot/dts/imx7s.dtsi              | 2 +-
 arch/arm/boot/dts/imx7ulp.dtsi            | 2 +-
 arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +-
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 2 +-
arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +-
arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)
Quoted 2 lines

--
2.7.4

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Applied
#6 lore raw
In reply to Anson Huang
Quoted 9 lines · Anson Huang

In the nvmem yaml schema, it requires the nodename to be one of "eeprom|efuse|nvram", so need to change all i.MX/MXS SoCs ocotp/iim node name to efuse:

MXS platforms: i.MX23/28;
i.MX platforms with IIM: i.MX25/27/31/35/51/53.
i.MX ARMv7 platforms with OCOTP: i.MX6QDL/6SL/6SX/6SLL/6UL/7S/7ULP. i.MX ARMv8 platforms with OCOTP: i.MX8MQ/8MM/8MN/8MP.

Quoted 5 lines

Anson Huang (4):
ARM: dts: imx: change ocotp node name on i.MX6/7 SoCs
arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs
ARM: dts: imx: change ocotp node name on MXS SoCs
ARM: dts: imx: change iim node name on i.MX SoCs

Applied all, thanks.