[PATCH] arm: dts: rockchip: Align OTP nodes for RK3528/RK356x with Linux v7.1

[Jonas Karlman]

The <soc>-u-boot.dtsi OTP nodes for RK3528/RK356x use different names
compared to the OTP nodes that was merged in Linux v7.1. This causes
build issues when dts/upstream pulls in updated DTs, i.e.:

  ERROR (duplicate_label): /soc/nvmem at ffce0000: Duplicate label 'otp'
                           on /soc/nvmem at ffce0000 and /soc/efuse at ffce0000

  ERROR (duplicate_label): /nvmem at fe38c000: Duplicate label 'otp'
                           on /nvmem at fe38c000 and /efuse at fe38c000

Align the OTP node names in <soc>-u-boot.dtsi with the node names used
in upstream Linux v7.1 to avoid build issues when latest DTs are synced.

Also drop the unused RK356x id at a subnode as it has moved under a
nvmem-layout node in the merged upstream DT.

Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
---
This has no intended changes and was quickly boot tested on a ArmSoM
Sige1 (rk3528) and a Radxa ROCK 3B (rk3568) board.
---
 arch/arm/dts/rk3528-u-boot.dtsi | 2 +-
 arch/arm/dts/rk356x-u-boot.dtsi | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/rk3528-u-boot.dtsi b/arch/arm/dts/rk3528-u-boot.dtsi
index a18d33b3d369..31345df62959 100644
--- a/arch/arm/dts/rk3528-u-boot.dtsi
+++ b/arch/arm/dts/rk3528-u-boot.dtsi
@@ -23,7 +23,7 @@
 			reg = <0x0 0xffc50000 0x0 0x200>;
 		};
 
-		otp: nvmem at ffce0000 {
+		otp: efuse at ffce0000 {
 			compatible = "rockchip,rk3528-otp";
 			reg = <0x0 0xffce0000 0x0 0x4000>;
 		};
diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi
index 738b9673d352..d09dab35b31a 100644
--- a/arch/arm/dts/rk356x-u-boot.dtsi
+++ b/arch/arm/dts/rk356x-u-boot.dtsi
@@ -21,15 +21,9 @@
 		bootph-all;
 	};
 
-	otp: nvmem at fe38c000 {
+	otp: efuse at fe38c000 {
 		compatible = "rockchip,rk3568-otp";
 		reg = <0x0 0xfe38c000 0x0 0x4000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cpu_id: id at a {
-			reg = <0x0a 0x10>;
-		};
 	};
 };
 
-- 
2.54.0