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

[Jonas Karlman]

Hi Quentin,

On 7/7/2026 12:58 PM, Quentin Schulz wrote:
> Hi Jonas,
> 
> On 7/7/26 12:09 PM, Jonas Karlman wrote:
>> 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.
>>
> 
> I guess this is fine because our driver isn't actually making use of 
> those subnodes as far as I could tell.

Correct, if I remember correctly I probably added the cpu_id/id at a node
because rk3568 was the first SoC that used a different offset in OTP,
and this worked as "documentation" until a proper node landed upstream.

> 
> I was wondering why we even keep those nodes in since they are now part 
> of dts/upstream but actually they aren't yet and this patch allows to 
> not depend on 7.1-dts being pulled in U-Boot AND allows to build once 
> it's pulled. I'm assuming we can remove those nodes right after the 
> 7.1-dts tag is merged, right?

Correct, the OTP nodes must exist until we have fully transitioned to
v7.1 in dts/upstream, after that we should remove these nodes from
<soc>-u-boot.dtsi in a follow-up patch.

Regards,
Jonas

> 
> Reviewed-by: Quentin Schulz <quentin.schulz at cherry.de>
> 
> Thanks!
> Quentin