The merged upstream DT node for OTP differs in nodename and a future update of dts/upstream to devicetree-rebasing v6.11-rc1-dts tag or newer will cause build issues.
This series replace the node in soc u-boot dtsi with the upstream node.
Changes in v2: - Drop patch that changed the nodename to match v6.11-rc1 - Add patch to remove the OTP device node from rk3308-u-boot.dtsi - Cherry-pick upstream commit from devicetree-rebasing v6.11-rc1-dts
Jonas Karlman (2): rockchip: rk3308: Remove OTP device node from soc u-boot dtsi arm64: dts: rockchip: Add OTP device node for RK3308
arch/arm/dts/rk3308-u-boot.dtsi | 16 -------------- dts/upstream/src/arm64/rockchip/rk3308.dtsi | 24 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 16 deletions(-)