On 2024/7/30 22:27, Jonas Karlman wrote:
The merged upstream DT node for OTP differs in nodename and will cause following build errors once rk3308.dtsi in dts/upstream is updated:
ERROR (duplicate_label): /nvmem@ff210000: Duplicate label 'otp' on /nvmem@ff210000 and /efuse@ff210000 ERROR (duplicate_label): /nvmem@ff210000/id@7: Duplicate label 'cpu_id' on /nvmem@ff210000/id@7 and /efuse@ff210000/id@7
Remove the OTP device node from soc u-boot dtsi in preparation for replacing it with the merged upstream DT node in dts/upstream.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
v2: New patch
arch/arm/dts/rk3308-u-boot.dtsi | 16 ---------------- 1 file changed, 16 deletions(-)
diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi index 684fa7abddb1..b7964e2756f3 100644 --- a/arch/arm/dts/rk3308-u-boot.dtsi +++ b/arch/arm/dts/rk3308-u-boot.dtsi @@ -21,22 +21,6 @@ bootph-all; };
- otp: nvmem@ff210000 {
compatible = "rockchip,rk3308-otp";reg = <0x0 0xff210000 0x0 0x4000>;clocks = <&cru SCLK_OTP_USR>, <&cru PCLK_OTP_NS>,<&cru PCLK_OTP_PHY>;clock-names = "otp", "apb_pclk", "phy";resets = <&cru SRST_OTP_PHY>;reset-names = "phy";#address-cells = <1>;#size-cells = <1>;cpu_id: id@7 {reg = <0x07 0x10>;};- };
- rng: rng@ff2f0000 { compatible = "rockchip,cryptov2-rng"; reg = <0x0 0xff2f0000 0x0 0x4000>;