From: Jonas Karlman <jonas@kwiboo.se>
Date: Tue, 7 Jul 2026 10:09:17 +0000 (+0000)
Subject: arm: dts: rockchip: Align OTP nodes for RK3528/RK356x with Linux v7.1
X-Git-Tag: v2026.10-rc1~56^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4140de41eba31166d43c2759fc8c444d9116084;p=thirdparty%2Fu-boot.git

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

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@ffce0000: Duplicate label 'otp'
                           on /soc/nvmem@ffce0000 and /soc/efuse@ffce0000

  ERROR (duplicate_label): /nvmem@fe38c000: Duplicate label 'otp'
                           on /nvmem@fe38c000 and /efuse@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@a subnode as it has moved under a
nvmem-layout node in the merged upstream DT.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
Link: https://patch.msgid.link/20260707100918.3057718-1-jonas@kwiboo.se
Signed-off-by: Quentin Schulz <u-boot@0leil.net>
---

diff --git a/arch/arm/dts/rk3528-u-boot.dtsi b/arch/arm/dts/rk3528-u-boot.dtsi
index a18d33b3d36..31345df6295 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@ffce0000 {
+		otp: efuse@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 738b9673d35..d09dab35b31 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@fe38c000 {
+	otp: efuse@fe38c000 {
 		compatible = "rockchip,rk3568-otp";
 		reg = <0x0 0xfe38c000 0x0 0x4000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		cpu_id: id@a {
-			reg = <0x0a 0x10>;
-		};
 	};
 };