Subtree merge tag 'v6.17-dts' of dts repo [1] into dts/upstream

[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git

diff --cc dts/upstream/Bindings/arm/amlogic.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/arm,trace-buffer-extension.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/aspeed/aspeed.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/axiado.yaml
index 0000000000000000000000000000000000000000,bfabe7b32e65fb06d1f4faecfad032219f95dfca..bfabe7b32e65fb06d1f4faecfad032219f95dfca
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/arm/axiado.yaml
+++ b/dts/upstream/Bindings/arm/axiado.yaml

diff --cc dts/upstream/Bindings/arm/cix.yaml
index 0000000000000000000000000000000000000000,114dab4bc4d26a644b0c61d0527e6f414c76064f..114dab4bc4d26a644b0c61d0527e6f414c76064f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/arm/cix.yaml
+++ b/dts/upstream/Bindings/arm/cix.yaml

diff --cc dts/upstream/Bindings/arm/cpus.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/fsl.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/mediatek.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/mrvl/mrvl.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/qcom.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/rockchip.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/rockchip/pmu.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/samsung/samsung-boards.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/stm32/st,mlahb.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/stm32/stm32.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/sunxi.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/tegra.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/tegra/nvidia,tegra186-pmc.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/ti/k3.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/ti/omap.yaml
Simple merge

diff --cc dts/upstream/Bindings/bus/fsl,imx8mp-aipstz.yaml
index 0000000000000000000000000000000000000000,993293ebc4d337093d5bd3b0697b56da2ee2a665..993293ebc4d337093d5bd3b0697b56da2ee2a665
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/bus/fsl,imx8mp-aipstz.yaml
+++ b/dts/upstream/Bindings/bus/fsl,imx8mp-aipstz.yaml

diff --cc dts/upstream/Bindings/bus/fsl,imx8qxp-pixel-link-msi-bus.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/alphascale,asm9260-clock-controller.yaml
index 0000000000000000000000000000000000000000,1caad419ce9dc1f8bb5352a14d1105b882b1a068..1caad419ce9dc1f8bb5352a14d1105b882b1a068
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/alphascale,asm9260-clock-controller.yaml
+++ b/dts/upstream/Bindings/clock/alphascale,asm9260-clock-controller.yaml

diff --cc dts/upstream/Bindings/clock/apm,xgene-device-clock.yaml
index 0000000000000000000000000000000000000000,b27bcb2a9ee06c6b2ba5fcefb9b0d62bc6c8ed7a..b27bcb2a9ee06c6b2ba5fcefb9b0d62bc6c8ed7a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/apm,xgene-device-clock.yaml
+++ b/dts/upstream/Bindings/clock/apm,xgene-device-clock.yaml

diff --cc dts/upstream/Bindings/clock/apm,xgene-socpll-clock.yaml
index 0000000000000000000000000000000000000000,bdd4a6b92bbdb057a84744a9049066be9d36d493..bdd4a6b92bbdb057a84744a9049066be9d36d493
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/apm,xgene-socpll-clock.yaml
+++ b/dts/upstream/Bindings/clock/apm,xgene-socpll-clock.yaml

diff --cc dts/upstream/Bindings/clock/axis,artpec6-clkctrl.yaml
index 0000000000000000000000000000000000000000,a78269369df8b64d62dd52dd456be5ef37dd6b01..a78269369df8b64d62dd52dd456be5ef37dd6b01
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/axis,artpec6-clkctrl.yaml
+++ b/dts/upstream/Bindings/clock/axis,artpec6-clkctrl.yaml

diff --cc dts/upstream/Bindings/clock/brcm,bcm2835-cprman.yaml
index 0000000000000000000000000000000000000000,b0cf76c74bc7f95266ddde0da5024c9cfae14a18..b0cf76c74bc7f95266ddde0da5024c9cfae14a18
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/brcm,bcm2835-cprman.yaml
+++ b/dts/upstream/Bindings/clock/brcm,bcm2835-cprman.yaml

diff --cc dts/upstream/Bindings/clock/brcm,bcm53573-ilp.yaml
index 0000000000000000000000000000000000000000,cd291f428a8d2edbe09a50a24767720df365ccef..cd291f428a8d2edbe09a50a24767720df365ccef
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/brcm,bcm53573-ilp.yaml
+++ b/dts/upstream/Bindings/clock/brcm,bcm53573-ilp.yaml

diff --cc dts/upstream/Bindings/clock/brcm,bcm63xx-clocks.yaml
index 0000000000000000000000000000000000000000,56909ea499a21870b0bd130f88fd7c4be4a4a541..56909ea499a21870b0bd130f88fd7c4be4a4a541
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/brcm,bcm63xx-clocks.yaml
+++ b/dts/upstream/Bindings/clock/brcm,bcm63xx-clocks.yaml

diff --cc dts/upstream/Bindings/clock/cirrus,ep7209-clk.yaml
index 0000000000000000000000000000000000000000,fbd0d50d46a830de87d3d9c9c2af04e8f50570dd..fbd0d50d46a830de87d3d9c9c2af04e8f50570dd
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/cirrus,ep7209-clk.yaml
+++ b/dts/upstream/Bindings/clock/cirrus,ep7209-clk.yaml

diff --cc dts/upstream/Bindings/clock/img,pistachio-clk.yaml
index 0000000000000000000000000000000000000000,e70feee8e8945e326460b79fb25b05cbcd609654..e70feee8e8945e326460b79fb25b05cbcd609654
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/img,pistachio-clk.yaml
+++ b/dts/upstream/Bindings/clock/img,pistachio-clk.yaml

diff --cc dts/upstream/Bindings/clock/lsi,axm5516-clks.yaml
index 0000000000000000000000000000000000000000,7a792dbeffb357bc6caa283bf87da0ba73ae4189..7a792dbeffb357bc6caa283bf87da0ba73ae4189
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/lsi,axm5516-clks.yaml
+++ b/dts/upstream/Bindings/clock/lsi,axm5516-clks.yaml

diff --cc dts/upstream/Bindings/clock/lsi,nspire-cx-clock.yaml
index 0000000000000000000000000000000000000000,52c217d210d0c506ecad68ce43a955386d403982..52c217d210d0c506ecad68ce43a955386d403982
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/lsi,nspire-cx-clock.yaml
+++ b/dts/upstream/Bindings/clock/lsi,nspire-cx-clock.yaml

diff --cc dts/upstream/Bindings/clock/marvell,armada-370-corediv-clock.yaml
index 0000000000000000000000000000000000000000,9d766558cdb9fca532936dbbf15fe3206b6f3979..9d766558cdb9fca532936dbbf15fe3206b6f3979
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/marvell,armada-370-corediv-clock.yaml
+++ b/dts/upstream/Bindings/clock/marvell,armada-370-corediv-clock.yaml

diff --cc dts/upstream/Bindings/clock/marvell,armada-3700-periph-clock.yaml
index 0000000000000000000000000000000000000000,87e8e4ca111a1e98a1ccfd68e1594e2f7beb98a0..87e8e4ca111a1e98a1ccfd68e1594e2f7beb98a0
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/marvell,armada-3700-periph-clock.yaml
+++ b/dts/upstream/Bindings/clock/marvell,armada-3700-periph-clock.yaml

diff --cc dts/upstream/Bindings/clock/marvell,armada-3700-tbg-clock.yaml
index 0000000000000000000000000000000000000000,7fd1d758f794968949256dababb56faf64075615..7fd1d758f794968949256dababb56faf64075615
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/marvell,armada-3700-tbg-clock.yaml
+++ b/dts/upstream/Bindings/clock/marvell,armada-3700-tbg-clock.yaml

diff --cc dts/upstream/Bindings/clock/marvell,armada-xp-cpu-clock.yaml
index 0000000000000000000000000000000000000000,f2ac6741da9ab48ed466cc9ce0f2810c1befd555..f2ac6741da9ab48ed466cc9ce0f2810c1befd555
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/marvell,armada-xp-cpu-clock.yaml
+++ b/dts/upstream/Bindings/clock/marvell,armada-xp-cpu-clock.yaml

diff --cc dts/upstream/Bindings/clock/marvell,berlin2-clk.yaml
index 0000000000000000000000000000000000000000,8d48a2c7e3813fc21b3ea5740947370828301581..8d48a2c7e3813fc21b3ea5740947370828301581
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/marvell,berlin2-clk.yaml
+++ b/dts/upstream/Bindings/clock/marvell,berlin2-clk.yaml

diff --cc dts/upstream/Bindings/clock/marvell,dove-divider-clock.yaml
index 0000000000000000000000000000000000000000,7a8e0e281b63f0b572d025dd0e0354146961b5dc..7a8e0e281b63f0b572d025dd0e0354146961b5dc
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/marvell,dove-divider-clock.yaml
+++ b/dts/upstream/Bindings/clock/marvell,dove-divider-clock.yaml

diff --cc dts/upstream/Bindings/clock/marvell,mvebu-core-clock.yaml
index 0000000000000000000000000000000000000000,215bcd9080c35304b9587c489cda4c034488c28f..215bcd9080c35304b9587c489cda4c034488c28f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/marvell,mvebu-core-clock.yaml
+++ b/dts/upstream/Bindings/clock/marvell,mvebu-core-clock.yaml

diff --cc dts/upstream/Bindings/clock/marvell-armada-370-gating-clock.yaml
index 0000000000000000000000000000000000000000,0475360d2b6a22b864b09cb08a5b8c05ed51cac5..0475360d2b6a22b864b09cb08a5b8c05ed51cac5
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/marvell-armada-370-gating-clock.yaml
+++ b/dts/upstream/Bindings/clock/marvell-armada-370-gating-clock.yaml

diff --cc dts/upstream/Bindings/clock/maxim,max9485.yaml
index 0000000000000000000000000000000000000000,f9d8941c723519bdd001a389ed7cfc8647549c9e..f9d8941c723519bdd001a389ed7cfc8647549c9e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/maxim,max9485.yaml
+++ b/dts/upstream/Bindings/clock/maxim,max9485.yaml

diff --cc dts/upstream/Bindings/clock/mediatek,mtmips-sysc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/microchip,pic32mzda-clk.yaml
index 0000000000000000000000000000000000000000,a14a838140f1b0f9a4f4d461bce0cf5ed4f7fa31..a14a838140f1b0f9a4f4d461bce0cf5ed4f7fa31
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/microchip,pic32mzda-clk.yaml
+++ b/dts/upstream/Bindings/clock/microchip,pic32mzda-clk.yaml

diff --cc dts/upstream/Bindings/clock/moxa,moxart-clock.yaml
index 0000000000000000000000000000000000000000,bcf7cc240eba2b116bcd337584bdbcca4be25846..bcf7cc240eba2b116bcd337584bdbcca4be25846
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/moxa,moxart-clock.yaml
+++ b/dts/upstream/Bindings/clock/moxa,moxart-clock.yaml

diff --cc dts/upstream/Bindings/clock/nuvoton,npcm750-clk.yaml
index 0000000000000000000000000000000000000000,694dac68619cf488b3f282da0777610be9c19167..694dac68619cf488b3f282da0777610be9c19167
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/nuvoton,npcm750-clk.yaml
+++ b/dts/upstream/Bindings/clock/nuvoton,npcm750-clk.yaml

diff --cc dts/upstream/Bindings/clock/nxp,imx95-blk-ctl.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/nxp,lpc1850-ccu.yaml
index 0000000000000000000000000000000000000000,5459038cc95444309bcc323aaed33a89fffbe524..5459038cc95444309bcc323aaed33a89fffbe524
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/nxp,lpc1850-ccu.yaml
+++ b/dts/upstream/Bindings/clock/nxp,lpc1850-ccu.yaml

diff --cc dts/upstream/Bindings/clock/nxp,lpc1850-cgu.yaml
index 0000000000000000000000000000000000000000,ed178c7df00c38bb3433780e82b41878dd602004..ed178c7df00c38bb3433780e82b41878dd602004
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/nxp,lpc1850-cgu.yaml
+++ b/dts/upstream/Bindings/clock/nxp,lpc1850-cgu.yaml

diff --cc dts/upstream/Bindings/clock/qca,ath79-pll.yaml
index 0000000000000000000000000000000000000000,69863e8a464832c98aaad6f7f867216cdf9b4a08..69863e8a464832c98aaad6f7f867216cdf9b4a08
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qca,ath79-pll.yaml
+++ b/dts/upstream/Bindings/clock/qca,ath79-pll.yaml

diff --cc dts/upstream/Bindings/clock/qcom,camcc-sm8250.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,dispcc-sm6125.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,dispcc-sm6350.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-ipq4019.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-ipq8074.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-msm8976.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-msm8994.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-msm8996.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-msm8998.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-qcm2290.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-qcs404.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sc7180.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sc7280.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sc8180x.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sc8280xp.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sdm845.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sdx55.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sdx65.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sm6115.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sm6125.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sm6350.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sm8150.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sm8250.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sm8350.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,gcc-sm8450.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,ipq9574-cmn-pll.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,krait-cc.yaml
index 0000000000000000000000000000000000000000,d6a019371fcfcaaebe4f28b1b6ef4b772047b31b..d6a019371fcfcaaebe4f28b1b6ef4b772047b31b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,krait-cc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,krait-cc.yaml

diff --cc dts/upstream/Bindings/clock/qcom,milos-camcc.yaml
index 0000000000000000000000000000000000000000,f63149ecf3e1b98e60dba27093737ec84b66a899..f63149ecf3e1b98e60dba27093737ec84b66a899
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,milos-camcc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,milos-camcc.yaml

diff --cc dts/upstream/Bindings/clock/qcom,milos-dispcc.yaml
index 0000000000000000000000000000000000000000,94908804756b29bab228fd539c365945bd6b401a..94908804756b29bab228fd539c365945bd6b401a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,milos-dispcc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,milos-dispcc.yaml

diff --cc dts/upstream/Bindings/clock/qcom,milos-gcc.yaml
index 0000000000000000000000000000000000000000,cf244c155f9a6523d770555f860c27991f3d6b86..cf244c155f9a6523d770555f860c27991f3d6b86
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,milos-gcc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,milos-gcc.yaml

diff --cc dts/upstream/Bindings/clock/qcom,milos-videocc.yaml
index 0000000000000000000000000000000000000000,14c31efe1308aadbea61eb7be7e56039a923aec5..14c31efe1308aadbea61eb7be7e56039a923aec5
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,milos-videocc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,milos-videocc.yaml

diff --cc dts/upstream/Bindings/clock/qcom,mmcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,msm8998-gpucc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,qcm2290-dispcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,qcs615-dispcc.yaml
index 0000000000000000000000000000000000000000,d566f19beb0d76369ebfa8272224d01e7ecee63c..d566f19beb0d76369ebfa8272224d01e7ecee63c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,qcs615-dispcc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,qcs615-dispcc.yaml

diff --cc dts/upstream/Bindings/clock/qcom,qcs615-gpucc.yaml
index 0000000000000000000000000000000000000000,5f7d83d1a7be301dd38709f69167d7cb9319f076..5f7d83d1a7be301dd38709f69167d7cb9319f076
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,qcs615-gpucc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,qcs615-gpucc.yaml

diff --cc dts/upstream/Bindings/clock/qcom,qcs615-videocc.yaml
index 0000000000000000000000000000000000000000,f51b69de10478d1fcc246e4324dc74bc87b435eb..f51b69de10478d1fcc246e4324dc74bc87b435eb
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,qcs615-videocc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,qcs615-videocc.yaml

diff --cc dts/upstream/Bindings/clock/qcom,qdu1000-ecpricc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,qdu1000-gcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,rpmhcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sa8775p-camcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sa8775p-gcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sc7180-camcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sc7180-dispcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sc7180-lpasscorecc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sc7280-camcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sc7280-dispcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sc7280-lpasscc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sc8180x-camcc.yaml
index 0000000000000000000000000000000000000000,477ee687520e2d6d52c8b4a9915b08629d752346..477ee687520e2d6d52c8b4a9915b08629d752346
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,sc8180x-camcc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,sc8180x-camcc.yaml

diff --cc dts/upstream/Bindings/clock/qcom,sdm845-camcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sdm845-dispcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sdm845-lpasscc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sdx75-gcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm4450-camcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm4450-dispcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm4450-gcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm6115-dispcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm6115-gpucc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm6125-gpucc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm6350-camcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm6375-dispcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm6375-gcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm6375-gpucc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm7150-camcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm7150-dispcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm7150-gcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm7150-videocc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm8150-camcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm8450-camcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm8450-dispcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm8450-gpucc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm8450-videocc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm8550-gcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm8550-tcsr.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,sm8650-gcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/qcom,x1e80100-gcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/raspberrypi,rp1-clocks.yaml
index 0000000000000000000000000000000000000000,cc4491f7ee5f120c37a1e757d701e23ac37a9146..cc4491f7ee5f120c37a1e757d701e23ac37a9146
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/raspberrypi,rp1-clocks.yaml
+++ b/dts/upstream/Bindings/clock/raspberrypi,rp1-clocks.yaml

diff --cc dts/upstream/Bindings/clock/renesas,cpg-mssr.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/renesas,rzg2l-cpg.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/samsung,exynosautov920-clock.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/ti/ti,autoidle.yaml
index 0000000000000000000000000000000000000000,ed1bf182b64d94cf899b78b88d4870d223cabf5e..ed1bf182b64d94cf899b78b88d4870d223cabf5e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/ti/ti,autoidle.yaml
+++ b/dts/upstream/Bindings/clock/ti/ti,autoidle.yaml

diff --cc dts/upstream/Bindings/clock/ti/ti,divider-clock.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/ti/ti,fixed-factor-clock.yaml
index 0000000000000000000000000000000000000000,7a63b099297672ebc63fa5216a824e1cdeef2491..7a63b099297672ebc63fa5216a824e1cdeef2491
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/ti/ti,fixed-factor-clock.yaml
+++ b/dts/upstream/Bindings/clock/ti/ti,fixed-factor-clock.yaml

diff --cc dts/upstream/Bindings/crypto/atmel,at91sam9g46-aes.yaml
Simple merge

diff --cc dts/upstream/Bindings/crypto/atmel,at91sam9g46-sha.yaml
Simple merge

diff --cc dts/upstream/Bindings/crypto/atmel,at91sam9g46-tdes.yaml
Simple merge

diff --cc dts/upstream/Bindings/crypto/fsl,sec-v4.0.yaml
Simple merge

diff --cc dts/upstream/Bindings/crypto/ti,omap2-aes.yaml
index 0000000000000000000000000000000000000000,90e92050ad2eb2eca451de7fb71b2ea8cff4c008..90e92050ad2eb2eca451de7fb71b2ea8cff4c008
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/crypto/ti,omap2-aes.yaml
+++ b/dts/upstream/Bindings/crypto/ti,omap2-aes.yaml

diff --cc dts/upstream/Bindings/crypto/ti,omap4-des.yaml
index 0000000000000000000000000000000000000000,f02f1e141218dca1c9da6eee51a510e72d2e03e1..f02f1e141218dca1c9da6eee51a510e72d2e03e1
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/crypto/ti,omap4-des.yaml
+++ b/dts/upstream/Bindings/crypto/ti,omap4-des.yaml

diff --cc dts/upstream/Bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/arm,pl11x.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/fsl,lcdif.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/fsl,ls1021a-dcu.yaml
index 0000000000000000000000000000000000000000,72d14babe993a0826bbd27294c8bfa722c93966c..72d14babe993a0826bbd27294c8bfa722c93966c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/fsl,ls1021a-dcu.yaml
+++ b/dts/upstream/Bindings/display/fsl,ls1021a-dcu.yaml

diff --cc dts/upstream/Bindings/display/himax,hx8357.yaml
index 0000000000000000000000000000000000000000,34c3b89bf0033cdb7ec3f274998abcd1ba312579..34c3b89bf0033cdb7ec3f274998abcd1ba312579
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/himax,hx8357.yaml
+++ b/dts/upstream/Bindings/display/himax,hx8357.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-axi-performance-counter.yaml
index 0000000000000000000000000000000000000000,1d6501afc7f2e9874ca52b38477cd174d6ffa16b..1d6501afc7f2e9874ca52b38477cd174d6ffa16b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-axi-performance-counter.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-axi-performance-counter.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-blit-engine.yaml
index 0000000000000000000000000000000000000000,45db6da39e20e05303dd45afa797f4832c58c8f9..45db6da39e20e05303dd45afa797f4832c58c8f9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-blit-engine.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-blit-engine.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-blitblend.yaml
index 0000000000000000000000000000000000000000,095e65939fba77642043fa519c66c57f11828835..095e65939fba77642043fa519c66c57f11828835
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-blitblend.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-blitblend.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-clut.yaml
index 0000000000000000000000000000000000000000,21d42aa11b52bd737aa40e68520fdc78cd4d695f..21d42aa11b52bd737aa40e68520fdc78cd4d695f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-clut.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-clut.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-command-sequencer.yaml
index 0000000000000000000000000000000000000000,27118f4c0d28102f747623ffc48d276c7c3ea2cf..27118f4c0d28102f747623ffc48d276c7c3ea2cf
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-command-sequencer.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-command-sequencer.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-constframe.yaml
index 0000000000000000000000000000000000000000,94f67856360855085c650ad0ac68c3dcb594518f..94f67856360855085c650ad0ac68c3dcb594518f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-constframe.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-constframe.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-display-engine.yaml
index 0000000000000000000000000000000000000000,91f3bb77d8d0de74d9452fc6a7d14f53756fe29e..91f3bb77d8d0de74d9452fc6a7d14f53756fe29e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-display-engine.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-display-engine.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-dither.yaml
index 0000000000000000000000000000000000000000,8e4468d9183661c9362c59fbdfd478df322b0af5..8e4468d9183661c9362c59fbdfd478df322b0af5
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-dither.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-dither.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-extdst.yaml
index 0000000000000000000000000000000000000000,dfc2d4f94f8eb8d3e25974f6797b22b2552340a9..dfc2d4f94f8eb8d3e25974f6797b22b2552340a9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-extdst.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-extdst.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-fetchunit.yaml
index 0000000000000000000000000000000000000000,97fb6a4598d9660e7a95e5399a951ee3b13d13e8..97fb6a4598d9660e7a95e5399a951ee3b13d13e8
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-fetchunit.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-fetchunit.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-filter.yaml
index 0000000000000000000000000000000000000000,5c54d5179ee384ec30c8e95bcd0286688cee5bfc..5c54d5179ee384ec30c8e95bcd0286688cee5bfc
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-filter.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-filter.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-framegen.yaml
index 0000000000000000000000000000000000000000,9d1dc3a9de90e924d11d0f8d50c0ebbe00745f98..9d1dc3a9de90e924d11d0f8d50c0ebbe00745f98
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-framegen.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-framegen.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-gammacor.yaml
index 0000000000000000000000000000000000000000,25ad857429129ed985e251326ef2a5b26cf1abf6..25ad857429129ed985e251326ef2a5b26cf1abf6
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-gammacor.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-gammacor.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-layerblend.yaml
index 0000000000000000000000000000000000000000,2a6ab8a0ed7fccd1f0b033a9dfb9a13b6b8887f6..2a6ab8a0ed7fccd1f0b033a9dfb9a13b6b8887f6
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-layerblend.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-layerblend.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-matrix.yaml
index 0000000000000000000000000000000000000000,d773389dd0dc1dbdab5507a39f9b6296a6ec0f86..d773389dd0dc1dbdab5507a39f9b6296a6ec0f86
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-matrix.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-matrix.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-pixel-engine.yaml
index 0000000000000000000000000000000000000000,633443a6cc380d288fcb49b6fed66565461161e0..633443a6cc380d288fcb49b6fed66565461161e0
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-pixel-engine.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-pixel-engine.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-rop.yaml
index 0000000000000000000000000000000000000000,7115950ecae0a343533af8af3e2d90b0d33586fb..7115950ecae0a343533af8af3e2d90b0d33586fb
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-rop.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-rop.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-safety.yaml
index 0000000000000000000000000000000000000000,66c12948ab092cc2fa6f57827201d481129fddbc..66c12948ab092cc2fa6f57827201d481129fddbc
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-safety.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-safety.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-scaling-engine.yaml
index 0000000000000000000000000000000000000000,76cbe11a63643e73a9928ad96296b69bdd6e51c5..76cbe11a63643e73a9928ad96296b69bdd6e51c5
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-scaling-engine.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-scaling-engine.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-signature.yaml
index 0000000000000000000000000000000000000000,c495822fdc80e688963ec7bfa50921265cd3b63e..c495822fdc80e688963ec7bfa50921265cd3b63e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-signature.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-signature.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-store.yaml
index 0000000000000000000000000000000000000000,42d1b10906bebd3d9752353f3d08aec10bf6f15c..42d1b10906bebd3d9752353f3d08aec10bf6f15c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-store.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-store.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-tcon.yaml
index 0000000000000000000000000000000000000000,7a3b77ea92c73d0a230613094eddeb49d40fd7fd..7a3b77ea92c73d0a230613094eddeb49d40fd7fd
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc-tcon.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc-tcon.yaml

diff --cc dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc.yaml
index 0000000000000000000000000000000000000000,0a72f9f0b5fda707bf646e1fa2c1e8993046b13b..0a72f9f0b5fda707bf646e1fa2c1e8993046b13b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/imx/fsl,imx8qxp-dc.yaml
+++ b/dts/upstream/Bindings/display/imx/fsl,imx8qxp-dc.yaml

diff --cc dts/upstream/Bindings/display/mediatek/mediatek,dp.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/msm/dp-controller.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/msm/dsi-controller-main.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/msm/dsi-phy-7nm.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/msm/qcom,mdp5.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/msm/qcom,sm8650-dpu.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/msm/qcom,sm8750-mdss.yaml
index 0000000000000000000000000000000000000000,72c70edc1fb01c61f8aad24fdb58bfb4f62a6e34..72c70edc1fb01c61f8aad24fdb58bfb4f62a6e34
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/msm/qcom,sm8750-mdss.yaml
+++ b/dts/upstream/Bindings/display/msm/qcom,sm8750-mdss.yaml

diff --cc dts/upstream/Bindings/display/panel/himax,hx83112b.yaml
index 0000000000000000000000000000000000000000,e58bb3d45331490e0ae2764aa341d3c3391af550..e58bb3d45331490e0ae2764aa341d3c3391af550
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/panel/himax,hx83112b.yaml
+++ b/dts/upstream/Bindings/display/panel/himax,hx83112b.yaml

diff --cc dts/upstream/Bindings/display/panel/himax,hx8394.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/panel/ilitek,ili9881c.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/panel/panel-simple.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/panel/raydium,rm67200.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/panel/renesas,r61307.yaml
index 0000000000000000000000000000000000000000,90cce221c0d1226ed9342e32c66dfc55f58563aa..90cce221c0d1226ed9342e32c66dfc55f58563aa
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/panel/renesas,r61307.yaml
+++ b/dts/upstream/Bindings/display/panel/renesas,r61307.yaml

diff --cc dts/upstream/Bindings/display/panel/renesas,r69328.yaml
index 0000000000000000000000000000000000000000,1cd219b510ee246e15ec7c05b8f92a763f38dc5e..1cd219b510ee246e15ec7c05b8f92a763f38dc5e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/panel/renesas,r69328.yaml
+++ b/dts/upstream/Bindings/display/panel/renesas,r69328.yaml

diff --cc dts/upstream/Bindings/display/panel/samsung,atna33xc20.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/panel/sitronix,st7701.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/panel/visionox,rm69299.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/renesas,rzg2l-du.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/rockchip/rockchip,dw-mipi-dsi.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/rockchip/rockchip-vop2.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/sitronix,st7567.yaml
index 0000000000000000000000000000000000000000,e8a5b8ad18fe01429146b20a0b8237a164a7dd47..e8a5b8ad18fe01429146b20a0b8237a164a7dd47
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/sitronix,st7567.yaml
+++ b/dts/upstream/Bindings/display/sitronix,st7567.yaml

diff --cc dts/upstream/Bindings/display/sitronix,st7586.yaml
index 0000000000000000000000000000000000000000,566aaf1aeac81657d3a425f1c585894a3a6f82d3..566aaf1aeac81657d3a425f1c585894a3a6f82d3
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/sitronix,st7586.yaml
+++ b/dts/upstream/Bindings/display/sitronix,st7586.yaml

diff --cc dts/upstream/Bindings/display/sprd/sprd,sharkl3-dpu.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/sprd/sprd,sharkl3-dsi-host.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/ti/ti,am625-oldi.yaml
index 0000000000000000000000000000000000000000,8203ec5e5bb325429e7779c65eeef6450da19a9b..8203ec5e5bb325429e7779c65eeef6450da19a9b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/ti/ti,am625-oldi.yaml
+++ b/dts/upstream/Bindings/display/ti/ti,am625-oldi.yaml

diff --cc dts/upstream/Bindings/display/ti/ti,am65x-dss.yaml
Simple merge

diff --cc dts/upstream/Bindings/dma/brcm,iproc-sba.yaml
index 0000000000000000000000000000000000000000,f3fed576cacf217880b8aa3c550ba885a1fc4df5..f3fed576cacf217880b8aa3c550ba885a1fc4df5
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dma/brcm,iproc-sba.yaml
+++ b/dts/upstream/Bindings/dma/brcm,iproc-sba.yaml

diff --cc dts/upstream/Bindings/dma/fsl,mxs-dma.yaml
Simple merge

diff --cc dts/upstream/Bindings/dma/marvell,orion-xor.yaml
index 0000000000000000000000000000000000000000,add08257ec59b1317a61b47bc9cd802ab8b1d5cc..add08257ec59b1317a61b47bc9cd802ab8b1d5cc
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dma/marvell,orion-xor.yaml
+++ b/dts/upstream/Bindings/dma/marvell,orion-xor.yaml

diff --cc dts/upstream/Bindings/dma/nvidia,tegra186-gpc-dma.yaml
Simple merge

diff --cc dts/upstream/Bindings/dma/qcom,bam-dma.yaml
Simple merge

diff --cc dts/upstream/Bindings/dma/qcom,gpi.yaml
Simple merge

diff --cc dts/upstream/Bindings/dma/sophgo,cv1800b-dmamux.yaml
index 0000000000000000000000000000000000000000,0110029422356e6d7217fae6a6a59a351746774a..0110029422356e6d7217fae6a6a59a351746774a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dma/sophgo,cv1800b-dmamux.yaml
+++ b/dts/upstream/Bindings/dma/sophgo,cv1800b-dmamux.yaml

diff --cc dts/upstream/Bindings/dpll/dpll-device.yaml
index 0000000000000000000000000000000000000000,fb8d7a9a3693fe2cf8e917dd828d769150eec177..fb8d7a9a3693fe2cf8e917dd828d769150eec177
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dpll/dpll-device.yaml
+++ b/dts/upstream/Bindings/dpll/dpll-device.yaml

diff --cc dts/upstream/Bindings/dpll/dpll-pin.yaml
index 0000000000000000000000000000000000000000,51db93b77306fb3eee24e4b6f3435874ff69581e..51db93b77306fb3eee24e4b6f3435874ff69581e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dpll/dpll-pin.yaml
+++ b/dts/upstream/Bindings/dpll/dpll-pin.yaml

diff --cc dts/upstream/Bindings/dpll/microchip,zl30731.yaml
index 0000000000000000000000000000000000000000,17747f754b845ed05b672faaf4ee61acad149072..17747f754b845ed05b672faaf4ee61acad149072
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dpll/microchip,zl30731.yaml
+++ b/dts/upstream/Bindings/dpll/microchip,zl30731.yaml

diff --cc dts/upstream/Bindings/dsp/fsl,dsp.yaml
Simple merge

diff --cc dts/upstream/Bindings/dsp/mediatek,mt8195-dsp.yaml
Simple merge

diff --cc dts/upstream/Bindings/firmware/intel,ixp4xx-network-processing-engine.yaml
Simple merge

diff --cc dts/upstream/Bindings/firmware/nvidia,tegra186-bpmp.yaml
Simple merge

diff --cc dts/upstream/Bindings/firmware/qcom,scm.yaml
Simple merge

diff --cc dts/upstream/Bindings/firmware/thead,th1520-aon.yaml
Simple merge

diff --cc dts/upstream/Bindings/fpga/fpga-region.yaml
Simple merge

diff --cc dts/upstream/Bindings/fpga/xlnx,versal-fpga.yaml
Simple merge

diff --cc dts/upstream/Bindings/gnss/u-blox,neo-6m.yaml
Simple merge

diff --cc dts/upstream/Bindings/gpio/abilis,tb10x-gpio.yaml
index 0000000000000000000000000000000000000000,c93ec0f16bcd2cfafe278a53c0fb7772651914f9..c93ec0f16bcd2cfafe278a53c0fb7772651914f9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/abilis,tb10x-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/abilis,tb10x-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/altr-pio-1.0.yaml
index 0000000000000000000000000000000000000000,18afed324198eb117eb1c5ccaaf47b1eb04985bf..18afed324198eb117eb1c5ccaaf47b1eb04985bf
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/altr-pio-1.0.yaml
+++ b/dts/upstream/Bindings/gpio/altr-pio-1.0.yaml

diff --cc dts/upstream/Bindings/gpio/apm,xgene-gpio-sb.yaml
index 0000000000000000000000000000000000000000,d205dd7b492cbccb3baf5ce8f06ed10fd1c7de1a..d205dd7b492cbccb3baf5ce8f06ed10fd1c7de1a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/apm,xgene-gpio-sb.yaml
+++ b/dts/upstream/Bindings/gpio/apm,xgene-gpio-sb.yaml

diff --cc dts/upstream/Bindings/gpio/apple,smc-gpio.yaml
index 0000000000000000000000000000000000000000,42b1bc0a10c97a5586c435413b3c3ef1bb9fc797..42b1bc0a10c97a5586c435413b3c3ef1bb9fc797
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/apple,smc-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/apple,smc-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/cavium,octeon-3860-gpio.yaml
index 0000000000000000000000000000000000000000,35155b900655f841f0f97d8d4c51734bcd9be327..35155b900655f841f0f97d8d4c51734bcd9be327
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/cavium,octeon-3860-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/cavium,octeon-3860-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/cdns,gpio.yaml
index 0000000000000000000000000000000000000000,a84d60b3945952a1991492064ae6494df91c966f..a84d60b3945952a1991492064ae6494df91c966f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/cdns,gpio.yaml
+++ b/dts/upstream/Bindings/gpio/cdns,gpio.yaml

diff --cc dts/upstream/Bindings/gpio/cirrus,clps711x-mctrl-gpio.yaml
index 0000000000000000000000000000000000000000,bdffca817f1bea742fab89e1c310476941fae576..bdffca817f1bea742fab89e1c310476941fae576
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/cirrus,clps711x-mctrl-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/cirrus,clps711x-mctrl-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/exar,xra1403.yaml
index 0000000000000000000000000000000000000000,053134faf475c39541c86d9105775119e4cd7009..053134faf475c39541c86d9105775119e4cd7009
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/exar,xra1403.yaml
+++ b/dts/upstream/Bindings/gpio/exar,xra1403.yaml

diff --cc dts/upstream/Bindings/gpio/fsl,qoriq-gpio.yaml
Simple merge

diff --cc dts/upstream/Bindings/gpio/gpio-pca95xx.yaml
Simple merge

diff --cc dts/upstream/Bindings/gpio/lacie,netxbig-gpio-ext.yaml
index 0000000000000000000000000000000000000000,42021ee14125fb36b497b9ae08ce5e3ea421de08..42021ee14125fb36b497b9ae08ce5e3ea421de08
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/lacie,netxbig-gpio-ext.yaml
+++ b/dts/upstream/Bindings/gpio/lacie,netxbig-gpio-ext.yaml

diff --cc dts/upstream/Bindings/gpio/lantiq,gpio-mm-lantiq.yaml
index 0000000000000000000000000000000000000000,eaf53a89542a7993cc583c7bdc6148df21ee278f..eaf53a89542a7993cc583c7bdc6148df21ee278f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/lantiq,gpio-mm-lantiq.yaml
+++ b/dts/upstream/Bindings/gpio/lantiq,gpio-mm-lantiq.yaml

diff --cc dts/upstream/Bindings/gpio/maxim,max31910.yaml
index 0000000000000000000000000000000000000000,82a190a715f940af5c1f20abcb8e6f64fe0fcebd..82a190a715f940af5c1f20abcb8e6f64fe0fcebd
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/maxim,max31910.yaml
+++ b/dts/upstream/Bindings/gpio/maxim,max31910.yaml

diff --cc dts/upstream/Bindings/gpio/microchip,pic32mzda-gpio.yaml
index 0000000000000000000000000000000000000000,d8d932c86697f16c5bc0b29130cd8dc88320a4cf..d8d932c86697f16c5bc0b29130cd8dc88320a4cf
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/microchip,pic32mzda-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/microchip,pic32mzda-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/nxp,lpc1850-gpio.yaml
index 0000000000000000000000000000000000000000,0ef5f90f69ff3abe1d9bacad5a0167b9297213d0..0ef5f90f69ff3abe1d9bacad5a0167b9297213d0
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/nxp,lpc1850-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/nxp,lpc1850-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/pisosr-gpio.yaml
index 0000000000000000000000000000000000000000,db98ba413fb6b08c5c83fecf37452a531778ef82..db98ba413fb6b08c5c83fecf37452a531778ef82
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/pisosr-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/pisosr-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/pl061-gpio.yaml
Simple merge

diff --cc dts/upstream/Bindings/gpio/qca,ar7100-gpio.yaml
index 0000000000000000000000000000000000000000,519c4c2158f7c24137c4385fed46b96493f1a023..519c4c2158f7c24137c4385fed46b96493f1a023
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/qca,ar7100-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/qca,ar7100-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/rockchip,gpio-bank.yaml
Simple merge

diff --cc dts/upstream/Bindings/gpio/st,spear-spics-gpio.yaml
index 0000000000000000000000000000000000000000,3b0d2112da790da34a58c33b2086a6205e882988..3b0d2112da790da34a58c33b2086a6205e882988
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/st,spear-spics-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/st,spear-spics-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/ti,keystone-dsp-gpio.yaml
index 0000000000000000000000000000000000000000,59f81621408be36c02fd7f4fd560fccda3495d65..59f81621408be36c02fd7f4fd560fccda3495d65
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/ti,keystone-dsp-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/ti,keystone-dsp-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/ti,twl4030-gpio.yaml
index 0000000000000000000000000000000000000000,5e3e199fd9a498e77376dee667e7de5bf5ba6dee..5e3e199fd9a498e77376dee667e7de5bf5ba6dee
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/ti,twl4030-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/ti,twl4030-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/trivial-gpio.yaml
index 0000000000000000000000000000000000000000,0299d4a25086af8c1b4bb1689003331f3c8cf149..0299d4a25086af8c1b4bb1689003331f3c8cf149
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpio/trivial-gpio.yaml
+++ b/dts/upstream/Bindings/gpio/trivial-gpio.yaml

diff --cc dts/upstream/Bindings/gpio/xlnx,gpio-xilinx.yaml
Simple merge

diff --cc dts/upstream/Bindings/gpu/apple,agx.yaml
index 0000000000000000000000000000000000000000,51629b3833b0a8c296eaccdfd6d9eeef02a5bc63..51629b3833b0a8c296eaccdfd6d9eeef02a5bc63
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/gpu/apple,agx.yaml
+++ b/dts/upstream/Bindings/gpu/apple,agx.yaml

diff --cc dts/upstream/Bindings/gpu/arm,mali-bifrost.yaml
Simple merge

diff --cc dts/upstream/Bindings/gpu/arm,mali-utgard.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/adi,adm1266.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/adi,ltc2992.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/adt7475.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/lltc,ltc2978.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/maxim,max20730.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/national,lm90.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/pmbus/adi,adp1050.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/pmbus/isil,isl68137.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/pmbus/ti,ucd90320.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/ti,amc6821.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/ti,ina2xx.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/ti,lm87.yaml
Simple merge

diff --cc dts/upstream/Bindings/i2c/apple,i2c.yaml
Simple merge

diff --cc dts/upstream/Bindings/i2c/i2c-exynos5.yaml
Simple merge

diff --cc dts/upstream/Bindings/i2c/i2c-rk3x.yaml
Simple merge

diff --cc dts/upstream/Bindings/i2c/nxp,pnx-i2c.yaml
Simple merge

diff --cc dts/upstream/Bindings/i2c/renesas,riic.yaml
Simple merge

diff --cc dts/upstream/Bindings/i2c/spacemit,k1-i2c.yaml
Simple merge

diff --cc dts/upstream/Bindings/i3c/cdns,i3c-master.yaml
Simple merge

diff --cc dts/upstream/Bindings/i3c/renesas,i3c.yaml
index 0000000000000000000000000000000000000000,fe2e9633c46f8bf154f67c3d154689b08990d950..fe2e9633c46f8bf154f67c3d154689b08990d950
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/i3c/renesas,i3c.yaml
+++ b/dts/upstream/Bindings/i3c/renesas,i3c.yaml

diff --cc dts/upstream/Bindings/iio/adc/adi,ad4080.yaml
index 0000000000000000000000000000000000000000,ed849ba1b77bc62d2b51cd10b01c6f34f279ac89..ed849ba1b77bc62d2b51cd10b01c6f34f279ac89
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/adc/adi,ad4080.yaml
+++ b/dts/upstream/Bindings/iio/adc/adi,ad4080.yaml

diff --cc dts/upstream/Bindings/iio/adc/adi,ad4170-4.yaml
index 0000000000000000000000000000000000000000,da93213d12d4a2c14fcfd2336cb981181fe35b7f..da93213d12d4a2c14fcfd2336cb981181fe35b7f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/adc/adi,ad4170-4.yaml
+++ b/dts/upstream/Bindings/iio/adc/adi,ad4170-4.yaml

diff --cc dts/upstream/Bindings/iio/adc/adi,ad4851.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/adc/adi,ad7405.yaml
index 0000000000000000000000000000000000000000,57f097025705098ae8c7398973ad2c10edb7e7e7..57f097025705098ae8c7398973ad2c10edb7e7e7
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/adc/adi,ad7405.yaml
+++ b/dts/upstream/Bindings/iio/adc/adi,ad7405.yaml

diff --cc dts/upstream/Bindings/iio/adc/adi,ad7606.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/adc/adi,ad7768-1.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/adc/adi,axi-adc.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/adc/mediatek,mt2701-auxadc.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/adc/mediatek,mt6359-auxadc.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/adc/nxp,lpc3220-adc.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/adc/st,spear600-adc.yaml
index 0000000000000000000000000000000000000000,dd9ec303870336bbdd40297fe5500a180f9ffa9a..dd9ec303870336bbdd40297fe5500a180f9ffa9a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/adc/st,spear600-adc.yaml
+++ b/dts/upstream/Bindings/iio/adc/st,spear600-adc.yaml

diff --cc dts/upstream/Bindings/iio/gyroscope/invensense,itg3200.yaml
index 0000000000000000000000000000000000000000,4d8abf8ac2c8354e6904caf50203b567f6b2e2c6..4d8abf8ac2c8354e6904caf50203b567f6b2e2c6
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/gyroscope/invensense,itg3200.yaml
+++ b/dts/upstream/Bindings/iio/gyroscope/invensense,itg3200.yaml

diff --cc dts/upstream/Bindings/iio/proximity/nicera,d3323aa.yaml
index 0000000000000000000000000000000000000000,65d9b44fcd5e7bbc9502c59e7a0be25baa77ea98..65d9b44fcd5e7bbc9502c59e7a0be25baa77ea98
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/proximity/nicera,d3323aa.yaml
+++ b/dts/upstream/Bindings/iio/proximity/nicera,d3323aa.yaml

diff --cc dts/upstream/Bindings/input/syna,rmi4.yaml
Simple merge

diff --cc dts/upstream/Bindings/input/touchscreen/edt-ft5x06.yaml
Simple merge

diff --cc dts/upstream/Bindings/input/touchscreen/nxp,lpc3220-tsc.yaml
index 0000000000000000000000000000000000000000,b6feda127c7b592378495e5f39c492914b5522bf..b6feda127c7b592378495e5f39c492914b5522bf
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/input/touchscreen/nxp,lpc3220-tsc.yaml
+++ b/dts/upstream/Bindings/input/touchscreen/nxp,lpc3220-tsc.yaml

diff --cc dts/upstream/Bindings/input/touchscreen/sitronix,st1232.yaml
Simple merge

diff --cc dts/upstream/Bindings/input/touchscreen/ti.tsc2007.yaml
index 0000000000000000000000000000000000000000,8bb4bc7df4faf98025a99b0c3038c726691a8d51..8bb4bc7df4faf98025a99b0c3038c726691a8d51
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/input/touchscreen/ti.tsc2007.yaml
+++ b/dts/upstream/Bindings/input/touchscreen/ti.tsc2007.yaml

diff --cc dts/upstream/Bindings/input/touchscreen/touchscreen.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/mediatek,cci.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,milos-rpmh.yaml
index 0000000000000000000000000000000000000000,00b7a4108d45156d0832bbffe1607ac9b9fecff9..00b7a4108d45156d0832bbffe1607ac9b9fecff9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interconnect/qcom,milos-rpmh.yaml
+++ b/dts/upstream/Bindings/interconnect/qcom,milos-rpmh.yaml

diff --cc dts/upstream/Bindings/interconnect/qcom,msm8998-bwmon.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,osm-l3.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,sa8775p-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,sar2130p-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,sc7280-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,sc8280xp-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,sm7150-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,sm8450-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,sm8550-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,sm8650-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,sm8750-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interconnect/qcom,x1e80100-rpmh.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/andestech,plicsw.yaml
index 0000000000000000000000000000000000000000,eb2eb611ac0997689943bd721c5dfec19367bc20..eb2eb611ac0997689943bd721c5dfec19367bc20
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/andestech,plicsw.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/andestech,plicsw.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/apm,xgene1-msi.yaml
index 0000000000000000000000000000000000000000,49db952697f365b98962866b053b434c290cd824..49db952697f365b98962866b053b434c290cd824
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/apm,xgene1-msi.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/apm,xgene1-msi.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/arm,gic-v5-iwb.yaml
index 0000000000000000000000000000000000000000,99a266a62385a35421b5468045152414196bf42d..99a266a62385a35421b5468045152414196bf42d
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/arm,gic-v5-iwb.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/arm,gic-v5-iwb.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/arm,gic-v5.yaml
index 0000000000000000000000000000000000000000,86ca7f3ac28103126cd00efe0ec6ac6cf4075c90..86ca7f3ac28103126cd00efe0ec6ac6cf4075c90
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/arm,gic-v5.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/arm,gic-v5.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/arm,nvic.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/fsl,icoll.yaml
index 0000000000000000000000000000000000000000,7b09fd7d588f2e0a2806d68ff3c270eded273fe6..7b09fd7d588f2e0a2806d68ff3c270eded273fe6
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/fsl,icoll.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/fsl,icoll.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/fsl,imx8qxp-dc-intc.yaml
index 0000000000000000000000000000000000000000,6985ee644a25596908387afbbbf8599a491f2122..6985ee644a25596908387afbbbf8599a491f2122
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/fsl,imx8qxp-dc-intc.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/fsl,imx8qxp-dc-intc.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/fsl,mpic-msi.yaml
index 0000000000000000000000000000000000000000,78d784973661ef2f047cb6b1691aa6b95768afaa..78d784973661ef2f047cb6b1691aa6b95768afaa
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/fsl,mpic-msi.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/fsl,mpic-msi.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/fsl,vf610-mscm-ir.yaml
index 0000000000000000000000000000000000000000,fdc254f8d013cc9c7c6d7bc06b832fc18ad57703..fdc254f8d013cc9c7c6d7bc06b832fc18ad57703
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/fsl,vf610-mscm-ir.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/fsl,vf610-mscm-ir.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/mediatek,mt6577-sysirq.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/sifive,plic-1.0.0.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/thead,c900-aclint-sswi.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/xlnx,intc.yaml
index 0000000000000000000000000000000000000000,b4f58ed259932a814bac7eb2001b8ea255a4d7ec..b4f58ed259932a814bac7eb2001b8ea255a4d7ec
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/xlnx,intc.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/xlnx,intc.yaml

diff --cc dts/upstream/Bindings/iommu/arm,smmu.yaml
Simple merge

diff --cc dts/upstream/Bindings/iommu/riscv,iommu.yaml
Simple merge

diff --cc dts/upstream/Bindings/ipmi/ipmb-dev.yaml
index 0000000000000000000000000000000000000000,8b0d71901195ec569c33f92a6ef9c538a6b4bae0..8b0d71901195ec569c33f92a6ef9c538a6b4bae0
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/ipmi/ipmb-dev.yaml
+++ b/dts/upstream/Bindings/ipmi/ipmb-dev.yaml

diff --cc dts/upstream/Bindings/leds/leds-lp50xx.yaml
Simple merge

diff --cc dts/upstream/Bindings/leds/leds-mt6360.yaml
Simple merge

diff --cc dts/upstream/Bindings/leds/onnn,ncp5623.yaml
Simple merge

diff --cc dts/upstream/Bindings/mailbox/allwinner,sun6i-a31-msgbox.yaml
Simple merge

diff --cc dts/upstream/Bindings/mailbox/amlogic,meson-gxbb-mhu.yaml
Simple merge

diff --cc dts/upstream/Bindings/mailbox/apple,mailbox.yaml
Simple merge

diff --cc dts/upstream/Bindings/mailbox/aspeed,ast2700-mailbox.yaml
index 0000000000000000000000000000000000000000,600e2d63fccd0d00313da107eb654f7a9b515c85..600e2d63fccd0d00313da107eb654f7a9b515c85
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mailbox/aspeed,ast2700-mailbox.yaml
+++ b/dts/upstream/Bindings/mailbox/aspeed,ast2700-mailbox.yaml

diff --cc dts/upstream/Bindings/mailbox/brcm,bcm74110-mbox.yaml
index 0000000000000000000000000000000000000000,750cc96edb46a1d1063e794c206fc301e9e08952..750cc96edb46a1d1063e794c206fc301e9e08952
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mailbox/brcm,bcm74110-mbox.yaml
+++ b/dts/upstream/Bindings/mailbox/brcm,bcm74110-mbox.yaml

diff --cc dts/upstream/Bindings/mailbox/cix,sky1-mbox.yaml
index 0000000000000000000000000000000000000000,66d75b7bc8c8a814ba309a659c21b07f4a1ff0a6..66d75b7bc8c8a814ba309a659c21b07f4a1ff0a6
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mailbox/cix,sky1-mbox.yaml
+++ b/dts/upstream/Bindings/mailbox/cix,sky1-mbox.yaml

diff --cc dts/upstream/Bindings/mailbox/nvidia,tegra186-hsp.yaml
Simple merge

diff --cc dts/upstream/Bindings/mailbox/qcom,apcs-kpss-global.yaml
Simple merge

diff --cc dts/upstream/Bindings/mailbox/qcom-ipcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/mailbox/ti,omap-mailbox.yaml
Simple merge

diff --cc dts/upstream/Bindings/mailbox/ti,secure-proxy.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/cdns,csi2rx.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/fsl,imx6q-vdoa.yaml
index 0000000000000000000000000000000000000000,511ac0d67a7f2360afe22b81d76644575081089b..511ac0d67a7f2360afe22b81d76644575081089b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/media/fsl,imx6q-vdoa.yaml
+++ b/dts/upstream/Bindings/media/fsl,imx6q-vdoa.yaml

diff --cc dts/upstream/Bindings/media/fsl,imx8qm-isi.yaml
index 0000000000000000000000000000000000000000,93f527e223aff4c9dc916e04319630d61428ff05..93f527e223aff4c9dc916e04319630d61428ff05
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/media/fsl,imx8qm-isi.yaml
+++ b/dts/upstream/Bindings/media/fsl,imx8qm-isi.yaml

diff --cc dts/upstream/Bindings/media/fsl,imx8qxp-isi.yaml
index 0000000000000000000000000000000000000000,bb41996bd2e362bcbad742b94b64469e6ec22de7..bb41996bd2e362bcbad742b94b64469e6ec22de7
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/media/fsl,imx8qxp-isi.yaml
+++ b/dts/upstream/Bindings/media/fsl,imx8qxp-isi.yaml

diff --cc dts/upstream/Bindings/media/i2c/mipi-ccs.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/i2c/onnn,mt9m114.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/i2c/ovti,ov8858.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/i2c/sony,imx214.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/i2c/sony,imx258.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/nxp,imx8-jpeg.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/nxp,imx8mq-mipi-csi2.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/qcom,x1e80100-camss.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/renesas,fcp.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/renesas,vsp1.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/rockchip,vdec.yaml
Simple merge

diff --cc dts/upstream/Bindings/memory-controllers/arm,pl172.yaml
index 0000000000000000000000000000000000000000,c1b702669bd9dba1a5d07eed53ebcc35732ba84c..c1b702669bd9dba1a5d07eed53ebcc35732ba84c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/memory-controllers/arm,pl172.yaml
+++ b/dts/upstream/Bindings/memory-controllers/arm,pl172.yaml

diff --cc dts/upstream/Bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml
Simple merge

diff --cc dts/upstream/Bindings/memory-controllers/nvidia,tegra186-mc.yaml
Simple merge

diff --cc dts/upstream/Bindings/memory-controllers/renesas,rzg3e-xspi.yaml
Simple merge

diff --cc dts/upstream/Bindings/mfd/adi,adp5585.yaml
Simple merge

diff --cc dts/upstream/Bindings/mfd/apple,smc.yaml
index 0000000000000000000000000000000000000000,8a10e270d421ecd703848f64af597de351fcfd74..8a10e270d421ecd703848f64af597de351fcfd74
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mfd/apple,smc.yaml
+++ b/dts/upstream/Bindings/mfd/apple,smc.yaml

diff --cc dts/upstream/Bindings/mfd/lp3943.txt
Simple merge

diff --cc dts/upstream/Bindings/mfd/motorola-cpcap.txt
Simple merge

diff --cc dts/upstream/Bindings/mfd/mxs-lradc.yaml
index 0000000000000000000000000000000000000000,782b2f4005a0b64b2f471444a3c0f8e1f26e24d5..782b2f4005a0b64b2f471444a3c0f8e1f26e24d5
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mfd/mxs-lradc.yaml
+++ b/dts/upstream/Bindings/mfd/mxs-lradc.yaml

diff --cc dts/upstream/Bindings/mfd/nxp,lpc1850-creg.yaml
index 0000000000000000000000000000000000000000,89b4892e9ca7163f3c5146254b389f6e312865a9..89b4892e9ca7163f3c5146254b389f6e312865a9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mfd/nxp,lpc1850-creg.yaml
+++ b/dts/upstream/Bindings/mfd/nxp,lpc1850-creg.yaml

diff --cc dts/upstream/Bindings/mfd/samsung,s2mps11.yaml
Simple merge

diff --cc dts/upstream/Bindings/mfd/ti,tps65910.yaml
index 0000000000000000000000000000000000000000,a2668fc30a7bf103f8ee1b087bbd3d5223245faf..a2668fc30a7bf103f8ee1b087bbd3d5223245faf
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mfd/ti,tps65910.yaml
+++ b/dts/upstream/Bindings/mfd/ti,tps65910.yaml

diff --cc dts/upstream/Bindings/mfd/ti,tps6594.yaml
Simple merge

diff --cc dts/upstream/Bindings/mips/brcm/soc.yaml
Simple merge

diff --cc dts/upstream/Bindings/misc/intel,ixp4xx-ahb-queue-manager.yaml
Simple merge

diff --cc dts/upstream/Bindings/misc/nvidia,tegra186-misc.yaml
Simple merge

diff --cc dts/upstream/Bindings/misc/pci1de4,1.yaml
index 0000000000000000000000000000000000000000,2f9a7a554ed8a941d7408001c731914c7123ad8d..2f9a7a554ed8a941d7408001c731914c7123ad8d
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/misc/pci1de4,1.yaml
+++ b/dts/upstream/Bindings/misc/pci1de4,1.yaml

diff --cc dts/upstream/Bindings/mmc/cdns,sdhci.yaml
Simple merge

diff --cc dts/upstream/Bindings/mmc/loongson,ls2k0500-mmc.yaml
index 0000000000000000000000000000000000000000,c142421bc7238b5ac635a238b6359dcb5b289ad1..c142421bc7238b5ac635a238b6359dcb5b289ad1
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mmc/loongson,ls2k0500-mmc.yaml
+++ b/dts/upstream/Bindings/mmc/loongson,ls2k0500-mmc.yaml

diff --cc dts/upstream/Bindings/mmc/mxs-mmc.yaml
Simple merge

diff --cc dts/upstream/Bindings/mmc/renesas,sdhi.yaml
Simple merge

diff --cc dts/upstream/Bindings/mmc/sdhci-msm.yaml
Simple merge

diff --cc dts/upstream/Bindings/mmc/sdhci-pxa.yaml
Simple merge

diff --cc dts/upstream/Bindings/mtd/jedec,spi-nor.yaml
Simple merge

diff --cc dts/upstream/Bindings/mtd/nxp,lpc1773-spifi.yaml
index 0000000000000000000000000000000000000000,d6efb9417b7a957615e3015d5550f884009aa591..d6efb9417b7a957615e3015d5550f884009aa591
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mtd/nxp,lpc1773-spifi.yaml
+++ b/dts/upstream/Bindings/mtd/nxp,lpc1773-spifi.yaml

diff --cc dts/upstream/Bindings/mtd/technologic,nand.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/adi,adin.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/adi,adin1110.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/airoha,an7583-mdio.yaml
index 0000000000000000000000000000000000000000,3e7e68ec156061f2da71fb22dc2b8ec2ce5b039c..3e7e68ec156061f2da71fb22dc2b8ec2ce5b039c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/airoha,an7583-mdio.yaml
+++ b/dts/upstream/Bindings/net/airoha,an7583-mdio.yaml

diff --cc dts/upstream/Bindings/net/allwinner,sun8i-a83t-emac.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/altr,gmii-to-sgmii-2.0.yaml
index 0000000000000000000000000000000000000000,aafb6447b6c226521b7e425e54d1b9a4de6e97cb..aafb6447b6c226521b7e425e54d1b9a4de6e97cb
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/altr,gmii-to-sgmii-2.0.yaml
+++ b/dts/upstream/Bindings/net/altr,gmii-to-sgmii-2.0.yaml

diff --cc dts/upstream/Bindings/net/altr,socfpga-stmmac.yaml
index 0000000000000000000000000000000000000000,3a22d35db7784178ecc9cef835bff78f81b8f08b..3a22d35db7784178ecc9cef835bff78f81b8f08b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/altr,socfpga-stmmac.yaml
+++ b/dts/upstream/Bindings/net/altr,socfpga-stmmac.yaml

diff --cc dts/upstream/Bindings/net/bluetooth/nxp,88w8987-bt.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/cdns,macb.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/dsa/brcm,b53.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/dsa/mediatek,mt7530.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/dsa/micrel,ks8995.yaml
index 0000000000000000000000000000000000000000,854808ff5ad5d1a607e1e0eb537989351f1f881c..854808ff5ad5d1a607e1e0eb537989351f1f881c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/dsa/micrel,ks8995.yaml
+++ b/dts/upstream/Bindings/net/dsa/micrel,ks8995.yaml

diff --cc dts/upstream/Bindings/net/dsa/microchip,ksz.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/ethernet-controller.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/faraday,ftgmac100.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/ieee802154/atmel,at86rf233.yaml
index 0000000000000000000000000000000000000000,32cdc30009cc0a9dbefbc0770a0eb7791708c8d7..32cdc30009cc0a9dbefbc0770a0eb7791708c8d7
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/ieee802154/atmel,at86rf233.yaml
+++ b/dts/upstream/Bindings/net/ieee802154/atmel,at86rf233.yaml

diff --cc dts/upstream/Bindings/net/intel,ixp4xx-ethernet.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/marvell,armada-370-neta.yaml
index 0000000000000000000000000000000000000000,8814977da024a5703ba67ef73f875b9ed79d7810..8814977da024a5703ba67ef73f875b9ed79d7810
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/marvell,armada-370-neta.yaml
+++ b/dts/upstream/Bindings/net/marvell,armada-370-neta.yaml

diff --cc dts/upstream/Bindings/net/marvell,armada-380-neta-bm.yaml
index 0000000000000000000000000000000000000000,9392e7126e3ebbb21228404ddd06c573ee6d1f98..9392e7126e3ebbb21228404ddd06c573ee6d1f98
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/marvell,armada-380-neta-bm.yaml
+++ b/dts/upstream/Bindings/net/marvell,armada-380-neta-bm.yaml

diff --cc dts/upstream/Bindings/net/mediatek,net.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/nfc/ti,trf7970a.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/nxp,lpc-eth.yaml
index 0000000000000000000000000000000000000000,dfe9446a537589816a0f8f10cc244c94721d10c1..dfe9446a537589816a0f8f10cc244c94721d10c1
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/nxp,lpc-eth.yaml
+++ b/dts/upstream/Bindings/net/nxp,lpc-eth.yaml

diff --cc dts/upstream/Bindings/net/nxp,lpc1850-dwmac.yaml
index 0000000000000000000000000000000000000000,05acd9bc7616356e68090ebdd4df20e42f70dd7e..05acd9bc7616356e68090ebdd4df20e42f70dd7e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/nxp,lpc1850-dwmac.yaml
+++ b/dts/upstream/Bindings/net/nxp,lpc1850-dwmac.yaml

diff --cc dts/upstream/Bindings/net/pse-pd/microchip,pd692x0.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/pse-pd/ti,tps23881.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/qca,ar803x.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/qca,qca7000.yaml
index 0000000000000000000000000000000000000000,b503c3aa3616b0f0555c736f51a10eeec07f680a..b503c3aa3616b0f0555c736f51a10eeec07f680a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/qca,qca7000.yaml
+++ b/dts/upstream/Bindings/net/qca,qca7000.yaml

diff --cc dts/upstream/Bindings/net/renesas,rzv2h-gbeth.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/snps,dwmac.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/sophgo,cv1800b-dwmac.yaml
index 0000000000000000000000000000000000000000,b89456f0ef830991135bd17626da98661429596c..b89456f0ef830991135bd17626da98661429596c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/sophgo,cv1800b-dwmac.yaml
+++ b/dts/upstream/Bindings/net/sophgo,cv1800b-dwmac.yaml

diff --cc dts/upstream/Bindings/net/sophgo,sg2044-dwmac.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/thead,th1520-gmac.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/ti,k3-am654-cpsw-nuss.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/wireless/qca,ath9k.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/wireless/qcom,ath11k-pci.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/wireless/ralink,rt2880.yaml
index 0000000000000000000000000000000000000000,04dc5bb2edcc5e07b18a68f4040cd80abf798505..04dc5bb2edcc5e07b18a68f4040cd80abf798505
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/wireless/ralink,rt2880.yaml
+++ b/dts/upstream/Bindings/net/wireless/ralink,rt2880.yaml

diff --cc dts/upstream/Bindings/nvmem/allwinner,sun4i-a10-sid.yaml
Simple merge

diff --cc dts/upstream/Bindings/nvmem/amlogic,meson6-efuse.yaml
Simple merge

diff --cc dts/upstream/Bindings/nvmem/fsl,vf610-ocotp.yaml
index 0000000000000000000000000000000000000000,5aef86a752a6d5294d47c04ff38fa3fc09fc5894..5aef86a752a6d5294d47c04ff38fa3fc09fc5894
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/nvmem/fsl,vf610-ocotp.yaml
+++ b/dts/upstream/Bindings/nvmem/fsl,vf610-ocotp.yaml

diff --cc dts/upstream/Bindings/nvmem/layouts/fixed-layout.yaml
Simple merge

diff --cc dts/upstream/Bindings/nvmem/mediatek,efuse.yaml
Simple merge

diff --cc dts/upstream/Bindings/nvmem/nxp,lpc1857-eeprom.yaml
index 0000000000000000000000000000000000000000,24c71252846fef4cf48f7c46582188e1975b804a..24c71252846fef4cf48f7c46582188e1975b804a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/nvmem/nxp,lpc1857-eeprom.yaml
+++ b/dts/upstream/Bindings/nvmem/nxp,lpc1857-eeprom.yaml

diff --cc dts/upstream/Bindings/opp/opp-v2-qcom-adreno.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/amazon,al-alpine-v3-pcie.yaml
index 0000000000000000000000000000000000000000,45244cad5f30340dd23bac91ea229aea354ed961..45244cad5f30340dd23bac91ea229aea354ed961
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/amazon,al-alpine-v3-pcie.yaml
+++ b/dts/upstream/Bindings/pci/amazon,al-alpine-v3-pcie.yaml

diff --cc dts/upstream/Bindings/pci/apm,xgene-pcie.yaml
index 0000000000000000000000000000000000000000,2504b823588930027756ade4d8be2b4c6b37a1ff..2504b823588930027756ade4d8be2b4c6b37a1ff
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/apm,xgene-pcie.yaml
+++ b/dts/upstream/Bindings/pci/apm,xgene-pcie.yaml

diff --cc dts/upstream/Bindings/pci/axis,artpec6-pcie.yaml
index 0000000000000000000000000000000000000000,dcc5661aa004e0086a5f514eff7c79fd2ce4f42d..dcc5661aa004e0086a5f514eff7c79fd2ce4f42d
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/axis,artpec6-pcie.yaml
+++ b/dts/upstream/Bindings/pci/axis,artpec6-pcie.yaml

diff --cc dts/upstream/Bindings/pci/brcm,stb-pcie.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/marvell,armada-3700-pcie.yaml
index 0000000000000000000000000000000000000000,68090b3ca419981c1d45af45b0d9867a6e80ad1d..68090b3ca419981c1d45af45b0d9867a6e80ad1d
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/marvell,armada-3700-pcie.yaml
+++ b/dts/upstream/Bindings/pci/marvell,armada-3700-pcie.yaml

diff --cc dts/upstream/Bindings/pci/pci-ep.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/qcom,pcie-common.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/qcom,pcie-sa8255p.yaml
index 0000000000000000000000000000000000000000,ef705a02fcd97ed70d90a014e615ca21aebfae11..ef705a02fcd97ed70d90a014e615ca21aebfae11
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/qcom,pcie-sa8255p.yaml
+++ b/dts/upstream/Bindings/pci/qcom,pcie-sa8255p.yaml

diff --cc dts/upstream/Bindings/pci/qcom,pcie-sa8775p.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/qcom,pcie-sc7280.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/qcom,pcie-sc8180x.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/qcom,pcie-sm8150.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/snps,dw-pcie.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/sophgo,sg2044-pcie.yaml
index 0000000000000000000000000000000000000000,ff1133bae3bac9dd4fe641847a28958bfb7dbced..ff1133bae3bac9dd4fe641847a28958bfb7dbced
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/sophgo,sg2044-pcie.yaml
+++ b/dts/upstream/Bindings/pci/sophgo,sg2044-pcie.yaml

diff --cc dts/upstream/Bindings/pci/st,spear1340-pcie.yaml
index 0000000000000000000000000000000000000000,784f97b3cb7a93c603cc7547d9002ecc68728afa..784f97b3cb7a93c603cc7547d9002ecc68728afa
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/st,spear1340-pcie.yaml
+++ b/dts/upstream/Bindings/pci/st,spear1340-pcie.yaml

diff --cc dts/upstream/Bindings/pci/ti,j721e-pci-ep.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/apm,xgene-phy.yaml
index 0000000000000000000000000000000000000000,0674391feeae0091a9577af36503309be427347b..0674391feeae0091a9577af36503309be427347b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/apm,xgene-phy.yaml
+++ b/dts/upstream/Bindings/phy/apm,xgene-phy.yaml

diff --cc dts/upstream/Bindings/phy/brcm,ns2-drd-phy.yaml
index 0000000000000000000000000000000000000000,1fab97de5c0d0c7d8bce844fc7011ee4fe66f98a..1fab97de5c0d0c7d8bce844fc7011ee4fe66f98a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/brcm,ns2-drd-phy.yaml
+++ b/dts/upstream/Bindings/phy/brcm,ns2-drd-phy.yaml

diff --cc dts/upstream/Bindings/phy/brcm,sr-pcie-phy.yaml
index 0000000000000000000000000000000000000000,60ccc0813ed543c50c44f0cf976c8b0c972013ea..60ccc0813ed543c50c44f0cf976c8b0c972013ea
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/brcm,sr-pcie-phy.yaml
+++ b/dts/upstream/Bindings/phy/brcm,sr-pcie-phy.yaml

diff --cc dts/upstream/Bindings/phy/brcm,sr-usb-combo-phy.yaml
index 0000000000000000000000000000000000000000,6224ba0f29907225139a521f0b123467dc8c2c8c..6224ba0f29907225139a521f0b123467dc8c2c8c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/brcm,sr-usb-combo-phy.yaml
+++ b/dts/upstream/Bindings/phy/brcm,sr-usb-combo-phy.yaml

diff --cc dts/upstream/Bindings/phy/hisilicon,hi6220-usb-phy.yaml
index 0000000000000000000000000000000000000000,376586a666e79b8c7fad1132c3e00332c3daa630..376586a666e79b8c7fad1132c3e00332c3daa630
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/hisilicon,hi6220-usb-phy.yaml
+++ b/dts/upstream/Bindings/phy/hisilicon,hi6220-usb-phy.yaml

diff --cc dts/upstream/Bindings/phy/hisilicon,hix5hd2-sata-phy.yaml
index 0000000000000000000000000000000000000000,2993dd6b40a80735f878d6b204777d683c5f1583..2993dd6b40a80735f878d6b204777d683c5f1583
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/hisilicon,hix5hd2-sata-phy.yaml
+++ b/dts/upstream/Bindings/phy/hisilicon,hix5hd2-sata-phy.yaml

diff --cc dts/upstream/Bindings/phy/hisilicon,inno-usb2-phy.yaml
index 0000000000000000000000000000000000000000,51ea0e54ce3516bf1714456a30029f26196f2a27..51ea0e54ce3516bf1714456a30029f26196f2a27
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/hisilicon,inno-usb2-phy.yaml
+++ b/dts/upstream/Bindings/phy/hisilicon,inno-usb2-phy.yaml

diff --cc dts/upstream/Bindings/phy/img,pistachio-usb-phy.yaml
index 0000000000000000000000000000000000000000,bcc19bc682970397634ce660a7a49e0f5aec5e5f..bcc19bc682970397634ce660a7a49e0f5aec5e5f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/img,pistachio-usb-phy.yaml
+++ b/dts/upstream/Bindings/phy/img,pistachio-usb-phy.yaml

diff --cc dts/upstream/Bindings/phy/lantiq,ase-usb2-phy.yaml
index 0000000000000000000000000000000000000000,99b5da705ca44bf32cec8a2fbc06ad6587f999c7..99b5da705ca44bf32cec8a2fbc06ad6587f999c7
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/lantiq,ase-usb2-phy.yaml
+++ b/dts/upstream/Bindings/phy/lantiq,ase-usb2-phy.yaml

diff --cc dts/upstream/Bindings/phy/marvell,armada-375-usb-cluster.yaml
index 0000000000000000000000000000000000000000,1706c31644e130d1d9348f645b2ccd45449d7990..1706c31644e130d1d9348f645b2ccd45449d7990
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/marvell,armada-375-usb-cluster.yaml
+++ b/dts/upstream/Bindings/phy/marvell,armada-375-usb-cluster.yaml

diff --cc dts/upstream/Bindings/phy/marvell,armada-380-comphy.yaml
index 0000000000000000000000000000000000000000,dcb4c000783248a9826c5fd1f39849425090a36c..dcb4c000783248a9826c5fd1f39849425090a36c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/marvell,armada-380-comphy.yaml
+++ b/dts/upstream/Bindings/phy/marvell,armada-380-comphy.yaml

diff --cc dts/upstream/Bindings/phy/marvell,berlin2-sata-phy.yaml
index 0000000000000000000000000000000000000000,6fc9ff96e68222f7b0a6ac36136e3c6769b8d2ed..6fc9ff96e68222f7b0a6ac36136e3c6769b8d2ed
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/marvell,berlin2-sata-phy.yaml
+++ b/dts/upstream/Bindings/phy/marvell,berlin2-sata-phy.yaml

diff --cc dts/upstream/Bindings/phy/marvell,berlin2-usb-phy.yaml
index 0000000000000000000000000000000000000000,b401e12a600ce83f59ab723fd2212c8ca37b66ed..b401e12a600ce83f59ab723fd2212c8ca37b66ed
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/marvell,berlin2-usb-phy.yaml
+++ b/dts/upstream/Bindings/phy/marvell,berlin2-usb-phy.yaml

diff --cc dts/upstream/Bindings/phy/marvell,comphy-cp110.yaml
index 0000000000000000000000000000000000000000,c35d3164280538be53739964e8de5cd1bfa945d2..c35d3164280538be53739964e8de5cd1bfa945d2
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/marvell,comphy-cp110.yaml
+++ b/dts/upstream/Bindings/phy/marvell,comphy-cp110.yaml

diff --cc dts/upstream/Bindings/phy/marvell,mmp2-usb-phy.yaml
index 0000000000000000000000000000000000000000,af1ae2406f65ac7416c06996e4533e04574e00bc..af1ae2406f65ac7416c06996e4533e04574e00bc
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/marvell,mmp2-usb-phy.yaml
+++ b/dts/upstream/Bindings/phy/marvell,mmp2-usb-phy.yaml

diff --cc dts/upstream/Bindings/phy/marvell,mvebu-sata-phy.yaml
index 0000000000000000000000000000000000000000,81e9424289115650c7c111021f404f8599609b6a..81e9424289115650c7c111021f404f8599609b6a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/marvell,mvebu-sata-phy.yaml
+++ b/dts/upstream/Bindings/phy/marvell,mvebu-sata-phy.yaml

diff --cc dts/upstream/Bindings/phy/mixel,mipi-dsi-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/motorola,cpcap-usb-phy.yaml
index 0000000000000000000000000000000000000000,0febd04a61f4529b6d000bd887bff1cc8503bf03..0febd04a61f4529b6d000bd887bff1cc8503bf03
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/motorola,cpcap-usb-phy.yaml
+++ b/dts/upstream/Bindings/phy/motorola,cpcap-usb-phy.yaml

diff --cc dts/upstream/Bindings/phy/motorola,mapphone-mdm6600.yaml
index 0000000000000000000000000000000000000000,cb6544b3478d7cc78222908dbe16f2c313b94d37..cb6544b3478d7cc78222908dbe16f2c313b94d37
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/motorola,mapphone-mdm6600.yaml
+++ b/dts/upstream/Bindings/phy/motorola,mapphone-mdm6600.yaml

diff --cc dts/upstream/Bindings/phy/qca,ar7100-usb-phy.yaml
index 0000000000000000000000000000000000000000,02966553082998d2a51b361e5f46432ee09602bc..02966553082998d2a51b361e5f46432ee09602bc
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/qca,ar7100-usb-phy.yaml
+++ b/dts/upstream/Bindings/phy/qca,ar7100-usb-phy.yaml

diff --cc dts/upstream/Bindings/phy/qcom,m31-eusb2-phy.yaml
index 0000000000000000000000000000000000000000,c84c62d0e8cbd9fc1c0da6538f49149e5bc7e066..c84c62d0e8cbd9fc1c0da6538f49149e5bc7e066
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/qcom,m31-eusb2-phy.yaml
+++ b/dts/upstream/Bindings/phy/qcom,m31-eusb2-phy.yaml

diff --cc dts/upstream/Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/qcom,snps-eusb2-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/qcom,snps-eusb2-repeater.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/renesas,usb2-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/samsung,mipi-video-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/samsung,usb3-drd-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/st,spear1310-miphy.yaml
index 0000000000000000000000000000000000000000,32f81615ddadc1bb2b832db5b328898a057ccc80..32f81615ddadc1bb2b832db5b328898a057ccc80
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/st,spear1310-miphy.yaml
+++ b/dts/upstream/Bindings/phy/st,spear1310-miphy.yaml

diff --cc dts/upstream/Bindings/phy/ti,da830-usb-phy.yaml
index 0000000000000000000000000000000000000000,e168cbce8fd1f15a27f15488eed12ff00ea387f5..e168cbce8fd1f15a27f15488eed12ff00ea387f5
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/ti,da830-usb-phy.yaml
+++ b/dts/upstream/Bindings/phy/ti,da830-usb-phy.yaml

diff --cc dts/upstream/Bindings/phy/ti,dm8168-usb-phy.yaml
index 0000000000000000000000000000000000000000,673dc1d37dcb3943c491b4ed52aa6fdc943e0ff0..673dc1d37dcb3943c491b4ed52aa6fdc943e0ff0
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/ti,dm8168-usb-phy.yaml
+++ b/dts/upstream/Bindings/phy/ti,dm8168-usb-phy.yaml

diff --cc dts/upstream/Bindings/phy/ti,keystone-usbphy.yaml
index 0000000000000000000000000000000000000000,08dc18e7feeab899d10fb0f45a5596b844e7ee62..08dc18e7feeab899d10fb0f45a5596b844e7ee62
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/ti,keystone-usbphy.yaml
+++ b/dts/upstream/Bindings/phy/ti,keystone-usbphy.yaml

diff --cc dts/upstream/Bindings/pinctrl/amlogic,pinctrl-a4.yaml
Simple merge

diff --cc dts/upstream/Bindings/pinctrl/eswin,eic7700-pinctrl.yaml
index 0000000000000000000000000000000000000000,d46e7ee6372d0dd93478a044e7510e9de3ea257a..d46e7ee6372d0dd93478a044e7510e9de3ea257a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/eswin,eic7700-pinctrl.yaml
+++ b/dts/upstream/Bindings/pinctrl/eswin,eic7700-pinctrl.yaml

diff --cc dts/upstream/Bindings/pinctrl/mediatek,mt8189-pinctrl.yaml
index 0000000000000000000000000000000000000000,32e4653da5dba8cc4cbb7dc39cbc5ea91bb09a41..32e4653da5dba8cc4cbb7dc39cbc5ea91bb09a41
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/mediatek,mt8189-pinctrl.yaml
+++ b/dts/upstream/Bindings/pinctrl/mediatek,mt8189-pinctrl.yaml

diff --cc dts/upstream/Bindings/pinctrl/nxp,lpc1850-scu.yaml
index 0000000000000000000000000000000000000000,11f41359b5c8b7361dc7c6c7dc2959f46b950850..11f41359b5c8b7361dc7c6c7dc2959f46b950850
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/nxp,lpc1850-scu.yaml
+++ b/dts/upstream/Bindings/pinctrl/nxp,lpc1850-scu.yaml

diff --cc dts/upstream/Bindings/pinctrl/qcom,milos-tlmm.yaml
index 0000000000000000000000000000000000000000,0091204df20a0eca7d0d0e766afcb8d08042b015..0091204df20a0eca7d0d0e766afcb8d08042b015
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/qcom,milos-tlmm.yaml
+++ b/dts/upstream/Bindings/pinctrl/qcom,milos-tlmm.yaml

diff --cc dts/upstream/Bindings/pinctrl/qcom,pmic-gpio.yaml
Simple merge

diff --cc dts/upstream/Bindings/pinctrl/raspberrypi,rp1-gpio.yaml
index 0000000000000000000000000000000000000000,eec9a9b58542f9e3dc8e3dfe7982e7f46ccf5a60..eec9a9b58542f9e3dc8e3dfe7982e7f46ccf5a60
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/raspberrypi,rp1-gpio.yaml
+++ b/dts/upstream/Bindings/pinctrl/raspberrypi,rp1-gpio.yaml

diff --cc dts/upstream/Bindings/pinctrl/rockchip,pinctrl.yaml
Simple merge

diff --cc dts/upstream/Bindings/pinctrl/st,stm32-hdp.yaml
index 0000000000000000000000000000000000000000,845b6b7b7552f32707ae77d376d05b9cdf9b4f2c..845b6b7b7552f32707ae77d376d05b9cdf9b4f2c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/st,stm32-hdp.yaml
+++ b/dts/upstream/Bindings/pinctrl/st,stm32-hdp.yaml

diff --cc dts/upstream/Bindings/pinctrl/st,stm32-pinctrl.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/allwinner,sun20i-d1-ppu.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/power-domain.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/qcom,rpmpd.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/reset/apple,smc-reboot.yaml
index 0000000000000000000000000000000000000000,ce5ed88493cdb60bfc8b444cd9e1d36714890ffe..ce5ed88493cdb60bfc8b444cd9e1d36714890ffe
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/power/reset/apple,smc-reboot.yaml
+++ b/dts/upstream/Bindings/power/reset/apple,smc-reboot.yaml

diff --cc dts/upstream/Bindings/power/reset/qcom,pon.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/rockchip,power-controller.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/bq24190.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/bq2515x.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/bq256xx.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/bq25980.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/cw2015_battery.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/qcom,pmi8998-charger.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/richtek,rt5033-charger.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/stericsson,ab8500-btemp.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/stericsson,ab8500-chargalg.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/stericsson,ab8500-charger.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/stericsson,ab8500-fg.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/summit,smb347-charger.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
Simple merge

diff --cc dts/upstream/Bindings/powerpc/nintendo/wii.txt
Simple merge

diff --cc dts/upstream/Bindings/pwm/adi,axi-pwmgen.yaml
Simple merge

diff --cc dts/upstream/Bindings/pwm/argon40,fan-hat.yaml
index 0000000000000000000000000000000000000000,7dbc7c2cd8025efec347819665f56feddcf2e876..7dbc7c2cd8025efec347819665f56feddcf2e876
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pwm/argon40,fan-hat.yaml
+++ b/dts/upstream/Bindings/pwm/argon40,fan-hat.yaml

diff --cc dts/upstream/Bindings/pwm/marvell,pxa-pwm.yaml
Simple merge

diff --cc dts/upstream/Bindings/pwm/mediatek,mt2712-pwm.yaml
Simple merge

diff --cc dts/upstream/Bindings/pwm/nxp,lpc1850-sct-pwm.yaml
index 0000000000000000000000000000000000000000,ffda0123878eda0c680a90103017e3091fb3392e..ffda0123878eda0c680a90103017e3091fb3392e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pwm/nxp,lpc1850-sct-pwm.yaml
+++ b/dts/upstream/Bindings/pwm/nxp,lpc1850-sct-pwm.yaml

diff --cc dts/upstream/Bindings/pwm/nxp,lpc3220-pwm.yaml
index 0000000000000000000000000000000000000000,d8ebb0735c96e7c25bfe19df4a4beaff4da74ed9..d8ebb0735c96e7c25bfe19df4a4beaff4da74ed9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pwm/nxp,lpc3220-pwm.yaml
+++ b/dts/upstream/Bindings/pwm/nxp,lpc3220-pwm.yaml

diff --cc dts/upstream/Bindings/pwm/sophgo,sg2042-pwm.yaml
Simple merge

diff --cc dts/upstream/Bindings/regulator/infineon,ir38060.yaml
Simple merge

diff --cc dts/upstream/Bindings/regulator/mediatek,mt6873-dvfsrc-regulator.yaml
Simple merge

diff --cc dts/upstream/Bindings/regulator/nxp,pca9450-regulator.yaml
Simple merge

diff --cc dts/upstream/Bindings/regulator/qcom,rpmh-regulator.yaml
Simple merge

diff --cc dts/upstream/Bindings/regulator/raspberrypi,7inch-touchscreen-panel-regulator.yaml
Simple merge

diff --cc dts/upstream/Bindings/remoteproc/qcom,sa8775p-pas.yaml
Simple merge

diff --cc dts/upstream/Bindings/remoteproc/qcom,sm8150-pas.yaml
Simple merge

diff --cc dts/upstream/Bindings/reserved-memory/nvidia,tegra264-bpmp-shmem.yaml
Simple merge

diff --cc dts/upstream/Bindings/reset/canaan,k230-rst.yaml
index 0000000000000000000000000000000000000000,d352d0e12d8106a232bb5e6d7e138697d2106937..d352d0e12d8106a232bb5e6d7e138697d2106937
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/reset/canaan,k230-rst.yaml
+++ b/dts/upstream/Bindings/reset/canaan,k230-rst.yaml

diff --cc dts/upstream/Bindings/reset/nxp,lpc1850-rgu.yaml
index 0000000000000000000000000000000000000000,9c3c13c543c70adb4cda1182e9d0a47d8f0a8f0b..9c3c13c543c70adb4cda1182e9d0a47d8f0a8f0b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/reset/nxp,lpc1850-rgu.yaml
+++ b/dts/upstream/Bindings/reset/nxp,lpc1850-rgu.yaml

diff --cc dts/upstream/Bindings/reset/renesas,rzv2h-usb2phy-reset.yaml
Simple merge

diff --cc dts/upstream/Bindings/reset/snps,dw-reset.yaml
index 0000000000000000000000000000000000000000,1dde7b6e86238c4dd86526366864413c291273af..1dde7b6e86238c4dd86526366864413c291273af
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/reset/snps,dw-reset.yaml
+++ b/dts/upstream/Bindings/reset/snps,dw-reset.yaml

diff --cc dts/upstream/Bindings/reset/sophgo,sg2042-reset.yaml
Simple merge

diff --cc dts/upstream/Bindings/riscv/andes.yaml
index 0000000000000000000000000000000000000000,aa1edf1fdec7ba7c4c1eb6dd3db8e3d332182e6c..aa1edf1fdec7ba7c4c1eb6dd3db8e3d332182e6c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/riscv/andes.yaml
+++ b/dts/upstream/Bindings/riscv/andes.yaml

diff --cc dts/upstream/Bindings/riscv/cpus.yaml
Simple merge

diff --cc dts/upstream/Bindings/rng/atmel,at91-trng.yaml
Simple merge

diff --cc dts/upstream/Bindings/rng/brcm,iproc-rng200.yaml
Simple merge

diff --cc dts/upstream/Bindings/rtc/amlogic,a4-rtc.yaml
Simple merge

diff --cc dts/upstream/Bindings/rtc/nvidia,tegra20-rtc.yaml
Simple merge

diff --cc dts/upstream/Bindings/rtc/nxp,lpc1788-rtc.yaml
Simple merge

diff --cc dts/upstream/Bindings/rtc/nxp,lpc3220-rtc.yaml
index 0000000000000000000000000000000000000000,53353de4cb378d1b7621f33f7b27b5c9e799c8ad..53353de4cb378d1b7621f33f7b27b5c9e799c8ad
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/rtc/nxp,lpc3220-rtc.yaml
+++ b/dts/upstream/Bindings/rtc/nxp,lpc3220-rtc.yaml

diff --cc dts/upstream/Bindings/rtc/nxp,pcf85063.yaml
Simple merge

diff --cc dts/upstream/Bindings/rtc/renesas,rzn1-rtc.yaml
Simple merge

diff --cc dts/upstream/Bindings/rtc/sophgo,cv1800b-rtc.yaml
Simple merge

diff --cc dts/upstream/Bindings/rtc/trivial-rtc.yaml
Simple merge

diff --cc dts/upstream/Bindings/serial/8250.yaml
Simple merge

diff --cc dts/upstream/Bindings/serial/brcm,bcm7271-uart.yaml
Simple merge

diff --cc dts/upstream/Bindings/serial/cdns,uart.yaml
Simple merge

diff --cc dts/upstream/Bindings/serial/mediatek,uart.yaml
Simple merge

diff --cc dts/upstream/Bindings/serial/qcom,sa8255p-geni-uart.yaml
index 0000000000000000000000000000000000000000,c8f01923cb25d40fdeaa8c6a845a34ed458c955f..c8f01923cb25d40fdeaa8c6a845a34ed458c955f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/serial/qcom,sa8255p-geni-uart.yaml
+++ b/dts/upstream/Bindings/serial/qcom,sa8255p-geni-uart.yaml

diff --cc dts/upstream/Bindings/serial/renesas,hscif.yaml
Simple merge

diff --cc dts/upstream/Bindings/serial/renesas,rsci.yaml
Simple merge

diff --cc dts/upstream/Bindings/serial/renesas,scif.yaml
Simple merge

diff --cc dts/upstream/Bindings/serial/samsung_uart.yaml
Simple merge

diff --cc dts/upstream/Bindings/serial/snps-dw-apb-uart.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/fsl/fsl,imx23-digctl.yaml
index 0000000000000000000000000000000000000000,3de135a70579a6c34b467d1e524e7edc58a0e5fc..3de135a70579a6c34b467d1e524e7edc58a0e5fc
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/soc/fsl/fsl,imx23-digctl.yaml
+++ b/dts/upstream/Bindings/soc/fsl/fsl,imx23-digctl.yaml

diff --cc dts/upstream/Bindings/soc/qcom/qcom,aoss-qmp.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/qcom/qcom,dcc.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/qcom/qcom,eud.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/qcom/qcom,pmic-glink.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/qcom/qcom,sa8255p-geni-se-qup.yaml
index 0000000000000000000000000000000000000000,352af3426d3441daf4c659cd9b7f8da5484daae9..352af3426d3441daf4c659cd9b7f8da5484daae9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/soc/qcom/qcom,sa8255p-geni-se-qup.yaml
+++ b/dts/upstream/Bindings/soc/qcom/qcom,sa8255p-geni-se-qup.yaml

diff --cc dts/upstream/Bindings/soc/renesas/renesas.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/rockchip/grf.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/samsung/exynos-pmu.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/samsung/samsung,exynos-sysreg.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/sophgo/sophgo.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/spacemit/spacemit,k1-syscon.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/ti/ti,j784s4-bist.yaml
index 0000000000000000000000000000000000000000,a73691cf5624b5e385593207fdb99ca236ffa9d4..a73691cf5624b5e385593207fdb99ca236ffa9d4
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/soc/ti/ti,j784s4-bist.yaml
+++ b/dts/upstream/Bindings/soc/ti/ti,j784s4-bist.yaml

diff --cc dts/upstream/Bindings/soc/ti/wkup-m3-ipc.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/atmel,at91-ssc.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/cirrus,cs42xx8.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/fsl,mxs-audio-sgtl5000.yaml
index 0000000000000000000000000000000000000000,d12774b42a112e029cf0f376071c1f376897d0ff..d12774b42a112e029cf0f376071c1f376897d0ff
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/fsl,mxs-audio-sgtl5000.yaml
+++ b/dts/upstream/Bindings/sound/fsl,mxs-audio-sgtl5000.yaml

diff --cc dts/upstream/Bindings/sound/mediatek,mt8173-afe-pcm.yaml
index 0000000000000000000000000000000000000000,d8993b5d457a909a5000c1a28c1ca104fe65814a..d8993b5d457a909a5000c1a28c1ca104fe65814a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/mediatek,mt8173-afe-pcm.yaml
+++ b/dts/upstream/Bindings/sound/mediatek,mt8173-afe-pcm.yaml

diff --cc dts/upstream/Bindings/sound/mt8186-afe-pcm.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/mt8192-afe-pcm.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/qcom,lpass-va-macro.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/qcom,q6afe.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/qcom,sm8250.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/qcom,wcd939x.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/richtek,rt9123.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/ti,tas57xx.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/amlogic,a4-spisg.yaml
index 0000000000000000000000000000000000000000,9bfb8089f7ea2f9d27f894d9117b99941d02e224..9bfb8089f7ea2f9d27f894d9117b99941d02e224
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/spi/amlogic,a4-spisg.yaml
+++ b/dts/upstream/Bindings/spi/amlogic,a4-spisg.yaml

diff --cc dts/upstream/Bindings/spi/fsl,dspi.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/marvell,orion-spi.yaml
index 0000000000000000000000000000000000000000,7f5ec1d7f59b19d369c51dcb964dc8f54b9864c2..7f5ec1d7f59b19d369c51dcb964dc8f54b9864c2
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/spi/marvell,orion-spi.yaml
+++ b/dts/upstream/Bindings/spi/marvell,orion-spi.yaml

diff --cc dts/upstream/Bindings/spi/mediatek,spi-mt65xx.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/mxs-spi.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/nxp,lpc3220-spi.yaml
index 0000000000000000000000000000000000000000,d5f780912f21e8b2f1b43d3ddefad15a3bc93c96..d5f780912f21e8b2f1b43d3ddefad15a3bc93c96
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/spi/nxp,lpc3220-spi.yaml
+++ b/dts/upstream/Bindings/spi/nxp,lpc3220-spi.yaml

diff --cc dts/upstream/Bindings/spi/renesas,rzv2h-rspi.yaml
index 0000000000000000000000000000000000000000,ab27fefc3c3a3d89fa0e07b5574e4a5e1c9edd98..ab27fefc3c3a3d89fa0e07b5574e4a5e1c9edd98
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/spi/renesas,rzv2h-rspi.yaml
+++ b/dts/upstream/Bindings/spi/renesas,rzv2h-rspi.yaml

diff --cc dts/upstream/Bindings/spi/spi-fsl-lpspi.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/spi-mux.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/spi-peripheral-props.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/spi-sg2044-nor.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/st,stm32-spi.yaml
Simple merge

diff --cc dts/upstream/Bindings/sram/qcom,imem.yaml
Simple merge

diff --cc dts/upstream/Bindings/submitting-patches.rst
Simple merge

diff --cc dts/upstream/Bindings/thermal/mediatek,thermal.yaml
Simple merge

diff --cc dts/upstream/Bindings/thermal/nvidia,tegra124-soctherm.yaml
Simple merge

diff --cc dts/upstream/Bindings/thermal/qcom-tsens.yaml
Simple merge

diff --cc dts/upstream/Bindings/thermal/rockchip-thermal.yaml
Simple merge

diff --cc dts/upstream/Bindings/timer/andestech,plmt0.yaml
index 0000000000000000000000000000000000000000,90b6120960043813ea72f172474af68efd3e2d24..90b6120960043813ea72f172474af68efd3e2d24
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/timer/andestech,plmt0.yaml
+++ b/dts/upstream/Bindings/timer/andestech,plmt0.yaml

diff --cc dts/upstream/Bindings/timer/via,vt8500-timer.yaml
index 0000000000000000000000000000000000000000,e748149948f3140d4a158f800b91e70bf9c4f042..e748149948f3140d4a158f800b91e70bf9c4f042
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/timer/via,vt8500-timer.yaml
+++ b/dts/upstream/Bindings/timer/via,vt8500-timer.yaml

diff --cc dts/upstream/Bindings/trigger-source/adi,util-sigma-delta-spi.yaml
index 0000000000000000000000000000000000000000,ea466179551cb0d8f8e1cf01f91101b88734da88..ea466179551cb0d8f8e1cf01f91101b88734da88
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/trigger-source/adi,util-sigma-delta-spi.yaml
+++ b/dts/upstream/Bindings/trigger-source/adi,util-sigma-delta-spi.yaml

diff --cc dts/upstream/Bindings/trigger-source/gpio-trigger.yaml
index 0000000000000000000000000000000000000000,1331d153ee82f0784a2c64b3963e50b711e09449..1331d153ee82f0784a2c64b3963e50b711e09449
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/trigger-source/gpio-trigger.yaml
+++ b/dts/upstream/Bindings/trigger-source/gpio-trigger.yaml

diff --cc dts/upstream/Bindings/trivial-devices.yaml
Simple merge

diff --cc dts/upstream/Bindings/ufs/mediatek,ufs.yaml
Simple merge

diff --cc dts/upstream/Bindings/usb/ci-hdrc-usb2.yaml
Simple merge

diff --cc dts/upstream/Bindings/usb/dwc2.yaml
Simple merge

diff --cc dts/upstream/Bindings/usb/fsl,usbmisc.yaml
Simple merge

diff --cc dts/upstream/Bindings/usb/genesys,gl850g.yaml
Simple merge

diff --cc dts/upstream/Bindings/usb/nxp,lpc3220-udc.yaml
index 0000000000000000000000000000000000000000,be0457a068616ad193b508865168e95124442437..be0457a068616ad193b508865168e95124442437
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/usb/nxp,lpc3220-udc.yaml
+++ b/dts/upstream/Bindings/usb/nxp,lpc3220-udc.yaml

diff --cc dts/upstream/Bindings/usb/qcom,snps-dwc3.yaml
Simple merge

diff --cc dts/upstream/Bindings/usb/renesas,usbhs.yaml
Simple merge

diff --cc dts/upstream/Bindings/vendor-prefixes.yaml
Simple merge

diff --cc dts/upstream/Bindings/watchdog/fsl-imx-wdt.yaml
Simple merge

diff --cc dts/upstream/Bindings/watchdog/mediatek,mtk-wdt.yaml
Simple merge

diff --cc dts/upstream/Bindings/watchdog/nxp,pnx4008-wdt.yaml
Simple merge

diff --cc dts/upstream/Bindings/writing-bindings.rst
Simple merge

diff --cc dts/upstream/Bindings/writing-schema.rst
Simple merge

diff --cc dts/upstream/include/dt-bindings/arm/qcom,ids.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/ast2600-clock.h
index 7ae96c7bd72fdea68fb8ad84426977f5234d948b,0000000000000000000000000000000000000000..f60fff261130e1c9aa9d4840f909cfecb74ffb44
mode 100644,000000..100644
--- 1/dts/upstream/include/dt-bindings/clock/ast2600-clock.h
--- /dev/null
+++ b/dts/upstream/include/dt-bindings/clock/ast2600-clock.h
@@@ -1,130 -1,0 +1,132 @@@
 +/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT */
 +#ifndef DT_BINDINGS_AST2600_CLOCK_H
 +#define DT_BINDINGS_AST2600_CLOCK_H
 +
 +#define ASPEED_CLK_GATE_ECLK          0
 +#define ASPEED_CLK_GATE_GCLK          1
 +
 +#define ASPEED_CLK_GATE_MCLK          2
 +
 +#define ASPEED_CLK_GATE_VCLK          3
 +#define ASPEED_CLK_GATE_BCLK          4
 +#define ASPEED_CLK_GATE_DCLK          5
 +
 +#define ASPEED_CLK_GATE_LCLK          6
 +#define ASPEED_CLK_GATE_LHCCLK                7
 +
 +#define ASPEED_CLK_GATE_D1CLK         8
 +#define ASPEED_CLK_GATE_YCLK          9
 +
 +#define ASPEED_CLK_GATE_REF0CLK               10
 +#define ASPEED_CLK_GATE_REF1CLK               11
 +
 +#define ASPEED_CLK_GATE_ESPICLK               12
 +
 +#define ASPEED_CLK_GATE_USBUHCICLK    13
 +#define ASPEED_CLK_GATE_USBPORT1CLK   14
 +#define ASPEED_CLK_GATE_USBPORT2CLK   15
 +
 +#define ASPEED_CLK_GATE_RSACLK                16
 +#define ASPEED_CLK_GATE_RVASCLK               17
 +
 +#define ASPEED_CLK_GATE_MAC1CLK               18
 +#define ASPEED_CLK_GATE_MAC2CLK               19
 +#define ASPEED_CLK_GATE_MAC3CLK               20
 +#define ASPEED_CLK_GATE_MAC4CLK               21
 +
 +#define ASPEED_CLK_GATE_UART1CLK      22
 +#define ASPEED_CLK_GATE_UART2CLK      23
 +#define ASPEED_CLK_GATE_UART3CLK      24
 +#define ASPEED_CLK_GATE_UART4CLK      25
 +#define ASPEED_CLK_GATE_UART5CLK      26
 +#define ASPEED_CLK_GATE_UART6CLK      27
 +#define ASPEED_CLK_GATE_UART7CLK      28
 +#define ASPEED_CLK_GATE_UART8CLK      29
 +#define ASPEED_CLK_GATE_UART9CLK      30
 +#define ASPEED_CLK_GATE_UART10CLK     31
 +#define ASPEED_CLK_GATE_UART11CLK     32
 +#define ASPEED_CLK_GATE_UART12CLK     33
 +#define ASPEED_CLK_GATE_UART13CLK     34
 +
 +#define ASPEED_CLK_GATE_SDCLK         35
 +#define ASPEED_CLK_GATE_EMMCCLK               36
 +
 +#define ASPEED_CLK_GATE_I3C0CLK               37
 +#define ASPEED_CLK_GATE_I3C1CLK               38
 +#define ASPEED_CLK_GATE_I3C2CLK               39
 +#define ASPEED_CLK_GATE_I3C3CLK               40
 +#define ASPEED_CLK_GATE_I3C4CLK               41
 +#define ASPEED_CLK_GATE_I3C5CLK               42
 +
 +#define ASPEED_CLK_GATE_FSICLK                45
 +
 +#define ASPEED_CLK_HPLL                       46
 +#define ASPEED_CLK_MPLL                       47
 +#define ASPEED_CLK_DPLL                       48
 +#define ASPEED_CLK_EPLL                       49
 +#define ASPEED_CLK_APLL                       50
 +#define ASPEED_CLK_AHB                        51
 +#define ASPEED_CLK_APB1                       52
 +#define ASPEED_CLK_APB2                       53
 +#define ASPEED_CLK_BCLK                       54
 +#define ASPEED_CLK_D1CLK              55
 +#define ASPEED_CLK_VCLK                       56
 +#define ASPEED_CLK_LHCLK              57
 +#define ASPEED_CLK_UART                       58
 +#define ASPEED_CLK_UARTX              59
 +#define ASPEED_CLK_SDIO                       60
 +#define ASPEED_CLK_EMMC                       61
 +#define ASPEED_CLK_ECLK                       62
 +#define ASPEED_CLK_ECLK_MUX           63
 +#define ASPEED_CLK_MAC12              64
 +#define ASPEED_CLK_MAC34              65
 +#define ASPEED_CLK_USBPHY_40M         66
 +#define ASPEED_CLK_MAC1RCLK           67
 +#define ASPEED_CLK_MAC2RCLK           68
 +#define ASPEED_CLK_MAC3RCLK           69
 +#define ASPEED_CLK_MAC4RCLK           70
 +#define ASPEED_CLK_I3C                        71
 +#define ASPEED_CLK_FSI                        72
 +
 +/* Only list resets here that are not part of a clock gate + reset pair */
 +#define ASPEED_RESET_ADC              55
 +#define ASPEED_RESET_JTAG_MASTER2     54
 +
 +#define ASPEED_RESET_MAC4             53
 +#define ASPEED_RESET_MAC3             52
 +
 +#define ASPEED_RESET_I3C5             45
 +#define ASPEED_RESET_I3C4             44
 +#define ASPEED_RESET_I3C3             43
 +#define ASPEED_RESET_I3C2             42
 +#define ASPEED_RESET_I3C1             41
 +#define ASPEED_RESET_I3C0             40
 +#define ASPEED_RESET_I3C              39
 +#define ASPEED_RESET_I3C_DMA          39
 +
 +#define ASPEED_RESET_PWM              37
 +#define ASPEED_RESET_PECI             36
 +#define ASPEED_RESET_MII              35
 +#define ASPEED_RESET_I2C              34
 +#define ASPEED_RESET_H2X              31
 +#define ASPEED_RESET_GP_MCU           30
 +#define ASPEED_RESET_DP_MCU           29
 +#define ASPEED_RESET_DP                       28
 +#define ASPEED_RESET_RC_XDMA          27
 +#define ASPEED_RESET_GRAPHICS         26
 +#define ASPEED_RESET_DEV_XDMA         25
 +#define ASPEED_RESET_DEV_MCTP         24
 +#define ASPEED_RESET_RC_MCTP          23
 +#define ASPEED_RESET_JTAG_MASTER      22
 +#define ASPEED_RESET_PCIE_DEV_O               21
 +#define ASPEED_RESET_PCIE_DEV_OEN     20
 +#define ASPEED_RESET_PCIE_RC_O                19
 +#define ASPEED_RESET_PCIE_RC_OEN      18
++#define ASPEED_RESET_MAC2             12
++#define ASPEED_RESET_MAC1             11
 +#define ASPEED_RESET_PCI_DP           5
 +#define ASPEED_RESET_HACE             4
 +#define ASPEED_RESET_AHB              1
 +#define ASPEED_RESET_SDRAM            0
 +
 +#endif

diff --cc dts/upstream/include/dt-bindings/clock/cix,sky1.h
index 0000000000000000000000000000000000000000,9245ebd1e80a4a2cda02b562dfd15605f84fd88f..9245ebd1e80a4a2cda02b562dfd15605f84fd88f
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/cix,sky1.h
+++ b/dts/upstream/include/dt-bindings/clock/cix,sky1.h

diff --cc dts/upstream/include/dt-bindings/clock/nvidia,tegra264.h
index 0000000000000000000000000000000000000000,0fc2ad5e6cef297c42d02680613639384fa315c2..0fc2ad5e6cef297c42d02680613639384fa315c2
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/nvidia,tegra264.h
+++ b/dts/upstream/include/dt-bindings/clock/nvidia,tegra264.h

diff --cc dts/upstream/include/dt-bindings/clock/nxp,imx94-clock.h
index 0000000000000000000000000000000000000000,c4ba13352b99b4b13d4331450c78590cf6c1660c..c4ba13352b99b4b13d4331450c78590cf6c1660c
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/nxp,imx94-clock.h
+++ b/dts/upstream/include/dt-bindings/clock/nxp,imx94-clock.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,gcc-sc8180x.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h
index 0000000000000000000000000000000000000000,586d1c9b33b374331bef413f543c526212c18494..586d1c9b33b374331bef413f543c526212c18494
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h
index 0000000000000000000000000000000000000000,f643c2668c04994f124b194f31561b72f98e8424..f643c2668c04994f124b194f31561b72f98e8424
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,milos-camcc.h
index 0000000000000000000000000000000000000000,21925dca9a20c9525c3800885e2d1357ab7b4661..21925dca9a20c9525c3800885e2d1357ab7b4661
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,milos-camcc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,milos-camcc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,milos-dispcc.h
index 0000000000000000000000000000000000000000,c70f23f32f0ad637b25244d2bed1f17cdeffd69c..c70f23f32f0ad637b25244d2bed1f17cdeffd69c
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,milos-dispcc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,milos-dispcc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,milos-gcc.h
index 0000000000000000000000000000000000000000,a530ca39e1ef8089ab200ee4368290f997b12ce9..a530ca39e1ef8089ab200ee4368290f997b12ce9
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,milos-gcc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,milos-gcc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,milos-gpucc.h
index 0000000000000000000000000000000000000000,6ff1925d409fcf3a0930bdb01f06b13218b0e3fe..6ff1925d409fcf3a0930bdb01f06b13218b0e3fe
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,milos-gpucc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,milos-gpucc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,milos-videocc.h
index 0000000000000000000000000000000000000000,3544db81ffae6fb7c72b123063b9af4337742054..3544db81ffae6fb7c72b123063b9af4337742054
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,milos-videocc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,milos-videocc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,qcs615-camcc.h
index 0000000000000000000000000000000000000000,aec57dddc06735a5c6c48a1e93a8c498bdb8726a..aec57dddc06735a5c6c48a1e93a8c498bdb8726a
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,qcs615-camcc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,qcs615-camcc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,qcs615-dispcc.h
index 0000000000000000000000000000000000000000,9a29945c5762ce06285a2f4e6a55c13bfaadc5c2..9a29945c5762ce06285a2f4e6a55c13bfaadc5c2
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,qcs615-dispcc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,qcs615-dispcc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,qcs615-gpucc.h
index 0000000000000000000000000000000000000000,6d8394b90d59074b93a26a9c027407a14b050b27..6d8394b90d59074b93a26a9c027407a14b050b27
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,qcs615-gpucc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,qcs615-gpucc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,qcs615-videocc.h
index 0000000000000000000000000000000000000000,0ca3efb21103d7e0b09ab9c042be761bcbc5960d..0ca3efb21103d7e0b09ab9c042be761bcbc5960d
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,qcs615-videocc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,qcs615-videocc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,sc8180x-camcc.h
index 0000000000000000000000000000000000000000,3e57b80f65e82518247bac5a7d73d1218df8bd4e..3e57b80f65e82518247bac5a7d73d1218df8bd4e
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,sc8180x-camcc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,sc8180x-camcc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,x1e80100-gcc.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/r9a07g043-cpg.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/r9a07g044-cpg.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/r9a07g054-cpg.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/r9a08g045-cpg.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/raspberrypi,rp1-clocks.h
index 0000000000000000000000000000000000000000,248efb895f354986d93ff0eaf50b40decf5ba081..248efb895f354986d93ff0eaf50b40decf5ba081
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/raspberrypi,rp1-clocks.h
+++ b/dts/upstream/include/dt-bindings/clock/raspberrypi,rp1-clocks.h

diff --cc dts/upstream/include/dt-bindings/clock/renesas,r9a09g056-cpg.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/renesas,r9a09g057-cpg.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h
index 0000000000000000000000000000000000000000,7ecc4f0b235aac301a3bdd24563e3d83b6b1d698..7ecc4f0b235aac301a3bdd24563e3d83b6b1d698
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h
+++ b/dts/upstream/include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h

diff --cc dts/upstream/include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h
index 0000000000000000000000000000000000000000,925e57703925ddc8152147cb74da9478b7ace585..925e57703925ddc8152147cb74da9478b7ace585
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h
+++ b/dts/upstream/include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h

diff --cc dts/upstream/include/dt-bindings/clock/samsung,exynosautov920.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/spacemit,k1-syscon.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/iio/adc/adi,ad7768-1.h
index 0000000000000000000000000000000000000000,34d92856a50b1b44506d348fc506eeef6cfa294f..34d92856a50b1b44506d348fc506eeef6cfa294f
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/iio/adc/adi,ad7768-1.h
+++ b/dts/upstream/include/dt-bindings/iio/adc/adi,ad7768-1.h

diff --cc dts/upstream/include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h
index 0000000000000000000000000000000000000000,92d135477d0e7e33fdd38b46049650df85bdea6f..92d135477d0e7e33fdd38b46049650df85bdea6f
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h
+++ b/dts/upstream/include/dt-bindings/iio/adc/mediatek,mt6363-auxadc.h

diff --cc dts/upstream/include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h
index 0000000000000000000000000000000000000000,17cab86d355e293c5c93eedaf9410a58f065a53b..17cab86d355e293c5c93eedaf9410a58f065a53b
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h
+++ b/dts/upstream/include/dt-bindings/iio/adc/mediatek,mt6373-auxadc.h

diff --cc dts/upstream/include/dt-bindings/input/linux-event-codes.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/interconnect/qcom,milos-rpmh.h
index 0000000000000000000000000000000000000000,9326d7d9c2a3b360aec62797963de9b07b8f6f9e..9326d7d9c2a3b360aec62797963de9b07b8f6f9e
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/interconnect/qcom,milos-rpmh.h
+++ b/dts/upstream/include/dt-bindings/interconnect/qcom,milos-rpmh.h

diff --cc dts/upstream/include/dt-bindings/memory/nvidia,tegra264.h
index 0000000000000000000000000000000000000000,521405c01f84c08018136b5339431800c88d8177..521405c01f84c08018136b5339431800c88d8177
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/memory/nvidia,tegra264.h
+++ b/dts/upstream/include/dt-bindings/memory/nvidia,tegra264.h

diff --cc dts/upstream/include/dt-bindings/pinctrl/stm32-pinfunc.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h
index 0000000000000000000000000000000000000000,6b3d8ea7bb691cb7ca804dce67b45227b198d828..6b3d8ea7bb691cb7ca804dce67b45227b198d828
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h
+++ b/dts/upstream/include/dt-bindings/power/allwinner,sun55i-a523-pck-600.h

diff --cc dts/upstream/include/dt-bindings/power/allwinner,sun55i-a523-ppu.h
index 0000000000000000000000000000000000000000,bc9aba73c19aa28b5b98bb77db04b29547c54a51..bc9aba73c19aa28b5b98bb77db04b29547c54a51
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/power/allwinner,sun55i-a523-ppu.h
+++ b/dts/upstream/include/dt-bindings/power/allwinner,sun55i-a523-ppu.h

diff --cc dts/upstream/include/dt-bindings/power/qcom-rpmpd.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/power/rockchip,rk3528-power.h
index 0000000000000000000000000000000000000000,318923cdaaf67cf80ca9fcd78bed5898b431a4fa..318923cdaaf67cf80ca9fcd78bed5898b431a4fa
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/power/rockchip,rk3528-power.h
+++ b/dts/upstream/include/dt-bindings/power/rockchip,rk3528-power.h

diff --cc dts/upstream/include/dt-bindings/regulator/nxp,pca9450-regulator.h
index 0000000000000000000000000000000000000000,08434caef429f1e3d53d4378427ced0a0ea5db4f..08434caef429f1e3d53d4378427ced0a0ea5db4f
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/regulator/nxp,pca9450-regulator.h
+++ b/dts/upstream/include/dt-bindings/regulator/nxp,pca9450-regulator.h

diff --cc dts/upstream/include/dt-bindings/regulator/st,stm32mp15-regulator.h
index 0000000000000000000000000000000000000000,7052507cb3e509c6802d74682d7f9700377fe7c7..7052507cb3e509c6802d74682d7f9700377fe7c7
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/regulator/st,stm32mp15-regulator.h
+++ b/dts/upstream/include/dt-bindings/regulator/st,stm32mp15-regulator.h

diff --cc dts/upstream/include/dt-bindings/reset/canaan,k230-rst.h
index 0000000000000000000000000000000000000000,e4f6612607fea2faf2bcaa80add0b291c3371e4b..e4f6612607fea2faf2bcaa80add0b291c3371e4b
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/reset/canaan,k230-rst.h
+++ b/dts/upstream/include/dt-bindings/reset/canaan,k230-rst.h

diff --cc dts/upstream/include/dt-bindings/reset/nvidia,tegra264.h
index 0000000000000000000000000000000000000000,a61a56bb232b6ac4da326a361789419b4674baad..a61a56bb232b6ac4da326a361789419b4674baad
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/reset/nvidia,tegra264.h
+++ b/dts/upstream/include/dt-bindings/reset/nvidia,tegra264.h

diff --cc dts/upstream/include/dt-bindings/reset/sun55i-a523-r-ccu.h
Simple merge

diff --cc dts/upstream/src/arm/allwinner/sun4i-a10-olinuxino-lime.dts
Simple merge

diff --cc dts/upstream/src/arm/allwinner/sun8i-q8-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm/allwinner/sun8i-r40.dtsi
Simple merge

diff --cc dts/upstream/src/arm/allwinner/sun8i-v3.dtsi
Simple merge

diff --cc dts/upstream/src/arm/allwinner/sun8i-v3s-netcube-kumquat.dts
Simple merge

diff --cc dts/upstream/src/arm/allwinner/sun8i-v3s.dtsi
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-ampere-mtjade.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-asrock-e3c246d4i.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-bytedance-g220a.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-delta-ahe50dc.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-facebook-bletchley.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-facebook-catalina.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-facebook-harma.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-facebook-santabarbara.dts
index 0000000000000000000000000000000000000000,ee93a971c500d9411953c15559687581a31eabd4..ee93a971c500d9411953c15559687581a31eabd4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/aspeed/aspeed-bmc-facebook-santabarbara.dts
+++ b/dts/upstream/src/arm/aspeed/aspeed-bmc-facebook-santabarbara.dts

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-facebook-yosemite4.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-ibm-bonnell.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-ibm-everest.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-ibm-rainier.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-ibm-system1.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-lenovo-hr630.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts
index 0000000000000000000000000000000000000000,41e3e9dd85f571254a08d40e68c0d8f8f049256b..41e3e9dd85f571254a08d40e68c0d8f8f049256b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts
+++ b/dts/upstream/src/arm/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-opp-lanyang.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-opp-nicole.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-opp-palmetto.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-opp-romulus.dts
Simple merge

diff --cc dts/upstream/src/arm/aspeed/aspeed-bmc-opp-zaius.dts
Simple merge

diff --cc dts/upstream/src/arm/broadcom/bcm63138.dtsi
Simple merge

diff --cc dts/upstream/src/arm/broadcom/bcm63148.dtsi
Simple merge

diff --cc dts/upstream/src/arm/broadcom/bcm63178.dtsi
Simple merge

diff --cc dts/upstream/src/arm/broadcom/bcm6846.dtsi
Simple merge

diff --cc dts/upstream/src/arm/broadcom/bcm6855.dtsi
Simple merge

diff --cc dts/upstream/src/arm/broadcom/bcm6878.dtsi
Simple merge

diff --cc dts/upstream/src/arm/broadcom/bcm7445.dtsi
Simple merge

diff --cc dts/upstream/src/arm/broadcom/bcm958625-meraki-mx6x-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm/intel/ixp/intel-ixp42x-linksys-wrv54g.dts
Simple merge

diff --cc dts/upstream/src/arm/intel/socfpga/socfpga_cyclone5_sodia.dts
Simple merge

diff --cc dts/upstream/src/arm/marvell/armada-370-db.dts
Simple merge

diff --cc dts/upstream/src/arm/marvell/kirkwood-km_common.dtsi
Simple merge

diff --cc dts/upstream/src/arm/marvell/kirkwood-openrd-client.dts
Simple merge

diff --cc dts/upstream/src/arm/mediatek/mt6572-jty-d101.dts
index 0000000000000000000000000000000000000000,18c3cab6b7a3cad8c69b890ec7a715373f50d8c4..18c3cab6b7a3cad8c69b890ec7a715373f50d8c4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/mediatek/mt6572-jty-d101.dts
+++ b/dts/upstream/src/arm/mediatek/mt6572-jty-d101.dts

diff --cc dts/upstream/src/arm/mediatek/mt6572-lenovo-a369i.dts
index 0000000000000000000000000000000000000000,c2f0c60ea777432f19d51ec7d0038bfa05d7170f..c2f0c60ea777432f19d51ec7d0038bfa05d7170f
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/mediatek/mt6572-lenovo-a369i.dts
+++ b/dts/upstream/src/arm/mediatek/mt6572-lenovo-a369i.dts

diff --cc dts/upstream/src/arm/mediatek/mt6572.dtsi
index 0000000000000000000000000000000000000000,ac70f266d698d3dafb51b22021bd6615124a7416..ac70f266d698d3dafb51b22021bd6615124a7416
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/mediatek/mt6572.dtsi
+++ b/dts/upstream/src/arm/mediatek/mt6572.dtsi

diff --cc dts/upstream/src/arm/microchip/at91-sam9x60ek.dts
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91-sama5d27_som1.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91-sama5d27_wlsom1.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91-sama5d2_icp.dts
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91-sama7d65_curiosity.dts
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91-sama7g5ek.dts
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91rm9200.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91sam9260.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91sam9261.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91sam9263.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91sam9g25-gardena-smart-gateway.dts
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91sam9g45.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91sam9n12.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91sam9rl.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/at91sam9x5.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/sam9x7.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/sama5d2.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/sama5d3.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/sama5d4.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/sama7d65.dtsi
Simple merge

diff --cc dts/upstream/src/arm/microchip/sama7g5.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nvidia/tegra30-asus-p1801-t.dts
index 0000000000000000000000000000000000000000,9241cc269a899f9ed718ed1a97fd1d41f7948172..9241cc269a899f9ed718ed1a97fd1d41f7948172
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nvidia/tegra30-asus-p1801-t.dts
+++ b/dts/upstream/src/arm/nvidia/tegra30-asus-p1801-t.dts

diff --cc dts/upstream/src/arm/nvidia/tegra30-asus-tf600t.dts
index 0000000000000000000000000000000000000000,5d9e23a438204c42f627c4fe04ec430b3cd448e0..5d9e23a438204c42f627c4fe04ec430b3cd448e0
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nvidia/tegra30-asus-tf600t.dts
+++ b/dts/upstream/src/arm/nvidia/tegra30-asus-tf600t.dts

diff --cc dts/upstream/src/arm/nvidia/tegra30-pegatron-chagall.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx53-tx53-x03x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx53-tx53-x13x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx53-tx53.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-gw551x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-gw553x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-gw560x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-gw5903.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-gw5904.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6dl-comtft.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6s-8034-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6s-8034.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6s-8035-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6s-8035.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6u-801x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6u-8033-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6u-8033.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6u-80xx-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6u-811x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-tx6u-81xx-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-gw551x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-gw553x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-gw560x.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-gw5903.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-gw5904.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-tx6q-1010-comtft.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-tx6q-1010.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-tx6q-1020-comtft.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-tx6q-1020.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-tx6q-1036-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-tx6q-1036.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-tx6q-10x0-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-tx6q-1110.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-tx6q-11x0-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-gw551x.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-gw553x.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-gw560x.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-gw5903.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-gw5904.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-tx6-lcd.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-tx6-lvds.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-tx6-mb7.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-tx6.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qp-tx6qp-8037-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qp-tx6qp-8037.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qp-tx6qp-8137-mb7.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6qp-tx6qp-8137.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-kontron-bl-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-kontron-sl-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-tx6ul-0010.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-tx6ul-0011.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-tx6ul-mainboard.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-tx6ul.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx6ull-engicam-microgea-bmm.dts
index 0000000000000000000000000000000000000000,279d46c22cd79e23327818cf3f7ba74cd2d8f1a8..279d46c22cd79e23327818cf3f7ba74cd2d8f1a8
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6ull-engicam-microgea-bmm.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6ull-engicam-microgea-bmm.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6ull-engicam-microgea-gtw.dts
index 0000000000000000000000000000000000000000,d500f88391020e8fa9606ede3aab55204d50da67..d500f88391020e8fa9606ede3aab55204d50da67
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6ull-engicam-microgea-gtw.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6ull-engicam-microgea-gtw.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6ull-engicam-microgea-rmm.dts
index 0000000000000000000000000000000000000000,5d1cc8a1f55589f183c0f56dd1200ae3c9eb6ab8..5d1cc8a1f55589f183c0f56dd1200ae3c9eb6ab8
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6ull-engicam-microgea-rmm.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6ull-engicam-microgea-rmm.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6ull-engicam-microgea.dtsi
index 0000000000000000000000000000000000000000,43518bf0760249831781dc5220fa640eabf16d14..43518bf0760249831781dc5220fa640eabf16d14
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6ull-engicam-microgea.dtsi
+++ b/dts/upstream/src/arm/nxp/imx/imx6ull-engicam-microgea.dtsi

diff --cc dts/upstream/src/arm/nxp/imx/imx7s-warp.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/imx/imx7ulp.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/lpc/lpc32xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/mxs/imx28-amarula-rmm.dts
index 0000000000000000000000000000000000000000,af59211842fb24e608b08b951661616ca900c9b6..af59211842fb24e608b08b951661616ca900c9b6
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/mxs/imx28-amarula-rmm.dts
+++ b/dts/upstream/src/arm/nxp/mxs/imx28-amarula-rmm.dts

diff --cc dts/upstream/src/arm/nxp/mxs/imx28.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf-colibri-eval-v3.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf-colibri.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf500-colibri.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf500.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610-bk4.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610-cosmic.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610-twr.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610-zii-cfu1.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610-zii-dev-rev-c.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610-zii-scu4-aib.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610-zii-spb4.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610-zii-ssmb-dtu.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610-zii-ssmb-spu3.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610m4-colibri.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vf610m4-cosmic.dts
Simple merge

diff --cc dts/upstream/src/arm/nxp/vf/vfxxx.dtsi
Simple merge

diff --cc dts/upstream/src/arm/qcom/qcom-msm8960.dtsi
Simple merge

diff --cc dts/upstream/src/arm/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
Simple merge

diff --cc dts/upstream/src/arm/qcom/qcom-msm8974-sony-xperia-rhine-amami.dts
Simple merge

diff --cc dts/upstream/src/arm/qcom/qcom-msm8974-sony-xperia-rhine-honami.dts
Simple merge

diff --cc dts/upstream/src/arm/qcom/qcom-msm8974-sony-xperia-rhine-togari.dts
index 0000000000000000000000000000000000000000,f60f7304d35e1e534bb350078dae900ec54700d4..f60f7304d35e1e534bb350078dae900ec54700d4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/qcom/qcom-msm8974-sony-xperia-rhine-togari.dts
+++ b/dts/upstream/src/arm/qcom/qcom-msm8974-sony-xperia-rhine-togari.dts

diff --cc dts/upstream/src/arm/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
Simple merge

diff --cc dts/upstream/src/arm/qcom/qcom-msm8974pro-oneplus-bacon.dts
Simple merge

diff --cc dts/upstream/src/arm/renesas/r9a06g032-rzn1d400-db.dts
Simple merge

diff --cc dts/upstream/src/arm/renesas/r9a06g032.dtsi
Simple merge

diff --cc dts/upstream/src/arm/rockchip/rk3128-xpi-3128.dts
Simple merge

diff --cc dts/upstream/src/arm/rockchip/rv1109-relfor-saib.dts
Simple merge

diff --cc dts/upstream/src/arm/samsung/exynos3250-monk.dts
Simple merge

diff --cc dts/upstream/src/arm/samsung/exynos3250-rinato.dts
Simple merge

diff --cc dts/upstream/src/arm/samsung/exynos4210-i9100.dts
Simple merge

diff --cc dts/upstream/src/arm/samsung/exynos4212-tab3.dtsi
Simple merge

diff --cc dts/upstream/src/arm/samsung/exynos4412-galaxy-s3.dtsi
Simple merge

diff --cc dts/upstream/src/arm/samsung/exynos4412-midas.dtsi
Simple merge

diff --cc dts/upstream/src/arm/samsung/exynos4412-p4note.dtsi
Simple merge

diff --cc dts/upstream/src/arm/samsung/s5pv210-aquila.dts
Simple merge

diff --cc dts/upstream/src/arm/samsung/s5pv210-aries.dtsi
Simple merge

diff --cc dts/upstream/src/arm/samsung/s5pv210-galaxys.dts
Simple merge

diff --cc dts/upstream/src/arm/samsung/s5pv210-goni.dts
Simple merge

diff --cc dts/upstream/src/arm/st/spear1310-evb.dts
Simple merge

diff --cc dts/upstream/src/arm/st/spear1310.dtsi
Simple merge

diff --cc dts/upstream/src/arm/st/spear1340-evb.dts
Simple merge

diff --cc dts/upstream/src/arm/st/spear13xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm/st/spear300-evb.dts
Simple merge

diff --cc dts/upstream/src/arm/st/spear310-evb.dts
Simple merge

diff --cc dts/upstream/src/arm/st/spear320-evb.dts
Simple merge

diff --cc dts/upstream/src/arm/st/spear3xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm/st/stm32mp131.dtsi
Simple merge

diff --cc dts/upstream/src/arm/st/stm32mp133.dtsi
Simple merge

diff --cc dts/upstream/src/arm/st/stm32mp15-scmi.dtsi
Simple merge

diff --cc dts/upstream/src/arm/st/stm32mp157f-dk2-scmi.dtsi
index 0000000000000000000000000000000000000000,89de85a2eff327f20336552692c833f5627cb6f7..89de85a2eff327f20336552692c833f5627cb6f7
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/st/stm32mp157f-dk2-scmi.dtsi
+++ b/dts/upstream/src/arm/st/stm32mp157f-dk2-scmi.dtsi

diff --cc dts/upstream/src/arm/st/stm32mp157f-dk2.dts
index 0000000000000000000000000000000000000000,43375c4d62a3cd07609a99b91be42f87f3f4ed96..43375c4d62a3cd07609a99b91be42f87f3f4ed96
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/st/stm32mp157f-dk2.dts
+++ b/dts/upstream/src/arm/st/stm32mp157f-dk2.dts

diff --cc dts/upstream/src/arm/st/stm32mp15xf.dtsi
index 0000000000000000000000000000000000000000,ffa55d64bea30a67c32b9e378f3a082acdae593c..ffa55d64bea30a67c32b9e378f3a082acdae593c
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/st/stm32mp15xf.dtsi
+++ b/dts/upstream/src/arm/st/stm32mp15xf.dtsi

diff --cc dts/upstream/src/arm/st/stm32mp15xx-dkx.dtsi
Simple merge

diff --cc dts/upstream/src/arm/ti/omap/am335x-bone-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm/ti/omap/am335x-boneblack.dts
Simple merge

diff --cc dts/upstream/src/arm/ti/omap/am335x-bonegreen-eco.dts
index 0000000000000000000000000000000000000000,d21118cdb6c2c0a01b72d6374cdeb76d92d6ca05..d21118cdb6c2c0a01b72d6374cdeb76d92d6ca05
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/ti/omap/am335x-bonegreen-eco.dts
+++ b/dts/upstream/src/arm/ti/omap/am335x-bonegreen-eco.dts

diff --cc dts/upstream/src/arm/ti/omap/am335x-nano.dts
Simple merge

diff --cc dts/upstream/src/arm/ti/omap/am335x-pdu001.dts
Simple merge

diff --cc dts/upstream/src/arm/ti/omap/dra7.dtsi
Simple merge

diff --cc dts/upstream/src/arm/vt8500/vt8500-bv07.dts
Simple merge

diff --cc dts/upstream/src/arm/vt8500/vt8500.dtsi
Simple merge

diff --cc dts/upstream/src/arm/vt8500/wm8505-ref.dts
Simple merge

diff --cc dts/upstream/src/arm/vt8500/wm8505.dtsi
Simple merge

diff --cc dts/upstream/src/arm/vt8500/wm8650-mid.dts
Simple merge

diff --cc dts/upstream/src/arm/vt8500/wm8650.dtsi
Simple merge

diff --cc dts/upstream/src/arm/vt8500/wm8750-apc8750.dts
Simple merge

diff --cc dts/upstream/src/arm/vt8500/wm8750.dtsi
Simple merge

diff --cc dts/upstream/src/arm/vt8500/wm8850-w70v2.dts
Simple merge

diff --cc dts/upstream/src/arm/vt8500/wm8850.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/airoha/en7581-evb.dts
Simple merge

diff --cc dts/upstream/src/arm64/airoha/en7581.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun50i-a100.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun50i-a133-liontron-h-a133l.dts
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun55i-a523.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun55i-a527-cubie-a5e.dts
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun55i-h728-x96qpro+.dts
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun55i-t527-avaota-a1.dts
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun55i-t527-orangepi-4a.dts
index 0000000000000000000000000000000000000000,d07bb9193b4382080d41a21b3491e607674002e6..d07bb9193b4382080d41a21b3491e607674002e6
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/allwinner/sun55i-t527-orangepi-4a.dts
+++ b/dts/upstream/src/arm64/allwinner/sun55i-t527-orangepi-4a.dts

diff --cc dts/upstream/src/arm64/altera/socfpga_stratix10.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/altera/socfpga_stratix10_swvp.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/amlogic-s6.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/amlogic-s7.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/amlogic-s7d.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12b-a311d-khadas-vim3.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12b-a311d-libretech-cc.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gx-p23x-q20x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxm-rbox-pro.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxm-ugoos-am3.dts
index 0000000000000000000000000000000000000000,ba871f3f53bb99b47b325bae228b59b722c5123b..ba871f3f53bb99b47b325bae228b59b722c5123b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/amlogic/meson-gxm-ugoos-am3.dts
+++ b/dts/upstream/src/arm64/amlogic/meson-gxm-ugoos-am3.dts

diff --cc dts/upstream/src/arm64/apple/t6000.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t6001.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t6002.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t600x-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t600x-die0.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8012-j132.dts
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8103.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8112.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/axiado/ax3000-evk.dts
index 0000000000000000000000000000000000000000,b86e969625573bf92bdd5e4435ea571dd7500de2..b86e969625573bf92bdd5e4435ea571dd7500de2
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/axiado/ax3000-evk.dts
+++ b/dts/upstream/src/arm64/axiado/ax3000-evk.dts

diff --cc dts/upstream/src/arm64/axiado/ax3000.dtsi
index 0000000000000000000000000000000000000000,792f52e0c7dd42cbc54b0eb47e25b0fbf1a706b8..792f52e0c7dd42cbc54b0eb47e25b0fbf1a706b8
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/axiado/ax3000.dtsi
+++ b/dts/upstream/src/arm64/axiado/ax3000.dtsi

diff --cc dts/upstream/src/arm64/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
index 0000000000000000000000000000000000000000,6ea3c102e0d6765d20d809c8680013ec8b6da076..6ea3c102e0d6765d20d809c8680013ec8b6da076
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts
+++ b/dts/upstream/src/arm64/broadcom/bcm2712-rpi-5-b-ovl-rp1.dts

diff --cc dts/upstream/src/arm64/broadcom/bcm2712-rpi-5-b.dts
Simple merge

diff --cc dts/upstream/src/arm64/broadcom/bcmbca/bcm4908.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/broadcom/bcmbca/bcm63158.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/broadcom/bcmbca/bcm6856.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/broadcom/bcmbca/bcm6858.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/broadcom/northstar2/ns2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/broadcom/rp1-common.dtsi
index 0000000000000000000000000000000000000000,5002a375eb0b2dca4829945384dd86a0a438256f..5002a375eb0b2dca4829945384dd86a0a438256f
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/broadcom/rp1-common.dtsi
+++ b/dts/upstream/src/arm64/broadcom/rp1-common.dtsi

diff --cc dts/upstream/src/arm64/broadcom/rp1-nexus.dtsi
index 0000000000000000000000000000000000000000,0ef30d7f1c3521cced0548214c1bf8e4c6185af5..0ef30d7f1c3521cced0548214c1bf8e4c6185af5
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/broadcom/rp1-nexus.dtsi
+++ b/dts/upstream/src/arm64/broadcom/rp1-nexus.dtsi

diff --cc dts/upstream/src/arm64/broadcom/rp1.dtso
index 0000000000000000000000000000000000000000,ab4f146d22c06449e6f56909291de14563fa3c74..ab4f146d22c06449e6f56909291de14563fa3c74
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/broadcom/rp1.dtso
+++ b/dts/upstream/src/arm64/broadcom/rp1.dtso

diff --cc dts/upstream/src/arm64/cavium/thunder2-99xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/cix/sky1-orion-o6.dts
index 0000000000000000000000000000000000000000,d74964d53c3bc29fb299725de408e4dcfecf8a12..d74964d53c3bc29fb299725de408e4dcfecf8a12
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/cix/sky1-orion-o6.dts
+++ b/dts/upstream/src/arm64/cix/sky1-orion-o6.dts

diff --cc dts/upstream/src/arm64/cix/sky1.dtsi
index 0000000000000000000000000000000000000000,7dfe7677e649bb2506610684153fb32c9396d348..7dfe7677e649bb2506610684153fb32c9396d348
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/cix/sky1.dtsi
+++ b/dts/upstream/src/arm64/cix/sky1.dtsi

diff --cc dts/upstream/src/arm64/exynos/exynos2200-g0s.dts
index 0000000000000000000000000000000000000000,0e348c5cf7df116c497d854aa7f57e207e1a466b..0e348c5cf7df116c497d854aa7f57e207e1a466b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/exynos/exynos2200-g0s.dts
+++ b/dts/upstream/src/arm64/exynos/exynos2200-g0s.dts

diff --cc dts/upstream/src/arm64/exynos/exynos2200-pinctrl.dtsi
index 0000000000000000000000000000000000000000,f618ff290604e7945bb53eb4efc157a897089a1e..f618ff290604e7945bb53eb4efc157a897089a1e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/exynos/exynos2200-pinctrl.dtsi
+++ b/dts/upstream/src/arm64/exynos/exynos2200-pinctrl.dtsi

diff --cc dts/upstream/src/arm64/exynos/exynos2200.dtsi
index 0000000000000000000000000000000000000000,6b5ac02d010f45e8700ad0e087e8c9e907ed2dac..6b5ac02d010f45e8700ad0e087e8c9e907ed2dac
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/exynos/exynos2200.dtsi
+++ b/dts/upstream/src/arm64/exynos/exynos2200.dtsi

diff --cc dts/upstream/src/arm64/exynos/exynos5433-tm2-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/exynos/exynos7870-j6lte.dts
Simple merge

diff --cc dts/upstream/src/arm64/exynos/exynos7870-on7xelte.dts
Simple merge

diff --cc dts/upstream/src/arm64/exynos/exynos7870.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/exynos/exynosautov920.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/exynos/google/gs101-pixel-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/exynos/google/gs101.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-ls1043a-tqmls1043a-mbls10xxa.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-ls1043a-tqmls1043a.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-ls1043a.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-ls1046a-tqmls1046a-mbls10xxa.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-ls1046a-tqmls1046a.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-ls1046a.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-ls1088a-tqmls1088a-mbls10xxa.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-ls1088a-tqmls1088a.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-lx2160a-qds.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8-ss-img.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8-ss-security.dtsi
index 0000000000000000000000000000000000000000,3e04142aca5cf5009b5838b468f06a24ba5e7bc4..3e04142aca5cf5009b5838b468f06a24ba5e7bc4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8-ss-security.dtsi
+++ b/dts/upstream/src/arm64/freescale/imx8-ss-security.dtsi

diff --cc dts/upstream/src/arm64/freescale/imx8mm-beacon-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-venice-gw700x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-venice-gw7901.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-venice-gw7902.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-venice-gw7903.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-venice-gw7904.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mn-beacon-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mn-tqma8mqnl-mba8mx.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mn-tqma8mqnl.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mn-venice-gw7902.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mn.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-data-modul-edm-sbc.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-dhcom-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-nominal.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-pinfunc.h
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-toradex-smarc-dev.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-toradex-smarc.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-tqma8mpql-mba8mpxl-lvds-tm070jvhg33.dtso
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-tqma8mpql-mba8mpxl.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-tqma8mpql.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-tx8p-ml81-moduline-display-106-av101hdt-a10.dtso
index 0000000000000000000000000000000000000000,e3965caca6be42a17aa89b77bd5b919382c84151..e3965caca6be42a17aa89b77bd5b919382c84151
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mp-tx8p-ml81-moduline-display-106-av101hdt-a10.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8mp-tx8p-ml81-moduline-display-106-av101hdt-a10.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8mp-tx8p-ml81-moduline-display-106-av123z7m-n17.dtso
index 0000000000000000000000000000000000000000,3eb665ce9d5d2a1c742ffb4feca046e406e29956..3eb665ce9d5d2a1c742ffb4feca046e406e29956
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mp-tx8p-ml81-moduline-display-106-av123z7m-n17.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8mp-tx8p-ml81-moduline-display-106-av123z7m-n17.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts
index 0000000000000000000000000000000000000000,afd886dd590ff6f125d1d0e91aa71ae0063b5fd1..afd886dd590ff6f125d1d0e91aa71ae0063b5fd1
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts
+++ b/dts/upstream/src/arm64/freescale/imx8mp-tx8p-ml81-moduline-display-106.dts

diff --cc dts/upstream/src/arm64/freescale/imx8mp-tx8p-ml81.dtsi
index 0000000000000000000000000000000000000000,fe8ba16eb40e718d032a44fb74804df986b2d581..fe8ba16eb40e718d032a44fb74804df986b2d581
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mp-tx8p-ml81.dtsi
+++ b/dts/upstream/src/arm64/freescale/imx8mp-tx8p-ml81.dtsi

diff --cc dts/upstream/src/arm64/freescale/imx8mp-var-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-venice-gw702x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-venice-gw74xx.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qm-mek-ov5640-csi0.dtso
index 0000000000000000000000000000000000000000,ceb63c28b21a63f9866857646725ab508dfea20a..ceb63c28b21a63f9866857646725ab508dfea20a
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8qm-mek-ov5640-csi0.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8qm-mek-ov5640-csi0.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8qm-mek-ov5640-csi1.dtso
index 0000000000000000000000000000000000000000,9e6d33c0315ef5fa2282c62257a58f393dc1a054..9e6d33c0315ef5fa2282c62257a58f393dc1a054
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8qm-mek-ov5640-csi1.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8qm-mek-ov5640-csi1.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8qm-mek.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qm-ss-img.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qm.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qxp-mek-ov5640-csi.dtso
index 0000000000000000000000000000000000000000,dd65ed8bb37cd0411a1acbb7d74c092550a8087e..dd65ed8bb37cd0411a1acbb7d74c092550a8087e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8qxp-mek-ov5640-csi.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8qxp-mek-ov5640-csi.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8qxp-mek.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qxp-ss-img.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qxp-ss-security.dtsi
index 0000000000000000000000000000000000000000,15f1239dab244f8b941c8010a08bff107f2d24e5..15f1239dab244f8b941c8010a08bff107f2d24e5
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8qxp-ss-security.dtsi
+++ b/dts/upstream/src/arm64/freescale/imx8qxp-ss-security.dtsi

diff --cc dts/upstream/src/arm64/freescale/imx8qxp.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8ulp.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-11x11-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-14x14-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-9x9-qsb.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-phyboard-nash-peb-wlbt-07.dtso
index 0000000000000000000000000000000000000000,7381b87444e8ae006c38b0ef30a34797dc92de47..7381b87444e8ae006c38b0ef30a34797dc92de47
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx93-phyboard-nash-peb-wlbt-07.dtso
+++ b/dts/upstream/src/arm64/freescale/imx93-phyboard-nash-peb-wlbt-07.dtso

diff --cc dts/upstream/src/arm64/freescale/imx93-phyboard-nash.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-phyboard-segin-peb-eval-01.dtso
index 0000000000000000000000000000000000000000,a2089873474163b0b7dad5aa4b84a56a0b7e7767..a2089873474163b0b7dad5aa4b84a56a0b7e7767
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx93-phyboard-segin-peb-eval-01.dtso
+++ b/dts/upstream/src/arm64/freescale/imx93-phyboard-segin-peb-eval-01.dtso

diff --cc dts/upstream/src/arm64/freescale/imx93-phyboard-segin-peb-wlbt-05.dtso
index 0000000000000000000000000000000000000000,a7285f0095661ace6db1fdd832a472b400bf5c9c..a7285f0095661ace6db1fdd832a472b400bf5c9c
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx93-phyboard-segin-peb-wlbt-05.dtso
+++ b/dts/upstream/src/arm64/freescale/imx93-phyboard-segin-peb-wlbt-05.dtso

diff --cc dts/upstream/src/arm64/freescale/imx93-phyboard-segin.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-phycore-rpmsg.dtso
index 0000000000000000000000000000000000000000,23bede7833f8b4aba570b0818a1fa20ba2d87603..23bede7833f8b4aba570b0818a1fa20ba2d87603
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx93-phycore-rpmsg.dtso
+++ b/dts/upstream/src/arm64/freescale/imx93-phycore-rpmsg.dtso

diff --cc dts/upstream/src/arm64/freescale/imx93-phycore-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-tqma9352.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-var-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx94.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx943-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx95-15x15-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx95-19x19-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx95-libra-rdk-fpsc.dts
index 0000000000000000000000000000000000000000,26c2df9b1b60a89fbd8456db6aec8c8d72abbd3e..26c2df9b1b60a89fbd8456db6aec8c8d72abbd3e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx95-libra-rdk-fpsc.dts
+++ b/dts/upstream/src/arm64/freescale/imx95-libra-rdk-fpsc.dts

diff --cc dts/upstream/src/arm64/freescale/imx95-phycore-fpsc.dtsi
index 0000000000000000000000000000000000000000,7519d5bd06ba800807aaba5495b317cb54632b6c..7519d5bd06ba800807aaba5495b317cb54632b6c
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx95-phycore-fpsc.dtsi
+++ b/dts/upstream/src/arm64/freescale/imx95-phycore-fpsc.dtsi

diff --cc dts/upstream/src/arm64/freescale/imx95.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/mba8mx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32g2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32g3.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32gxxxa-evb.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32gxxxa-rdb.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/tqmls1088a-mbls10xxa-mc.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/tqmls10xxa-mbls10xxa.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/tqmls10xxa.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/intel/socfpga_agilex.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/lg/lg1312.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/lg/lg1313.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/lg/lg131x.dtsi
index 0000000000000000000000000000000000000000,4cb1e451089752a12298d271e97187f0e634f664..4cb1e451089752a12298d271e97187f0e634f664
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/lg/lg131x.dtsi
+++ b/dts/upstream/src/arm64/lg/lg131x.dtsi

diff --cc dts/upstream/src/arm64/marvell/armada-8040-mcbin.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/cn9130-cf.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/cn9131-cf-solidwan.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/cn9132-clearfog.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/cn9132-sr-cex7.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/mmp/pxa1908-samsung-coreprimevelte.dts
index 0000000000000000000000000000000000000000,47a4f01a7077bfafe2cc50d0e59c37685ec9c2e9..47a4f01a7077bfafe2cc50d0e59c37685ec9c2e9
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/marvell/mmp/pxa1908-samsung-coreprimevelte.dts
+++ b/dts/upstream/src/arm64/marvell/mmp/pxa1908-samsung-coreprimevelte.dts

diff --cc dts/upstream/src/arm64/marvell/mmp/pxa1908.dtsi
index 0000000000000000000000000000000000000000,cf2b9109688ce560eec8a1397251ead68d78a239..cf2b9109688ce560eec8a1397251ead68d78a239
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/marvell/mmp/pxa1908.dtsi
+++ b/dts/upstream/src/arm64/marvell/mmp/pxa1908.dtsi

diff --cc dts/upstream/src/arm64/mediatek/mt7988a-bananapi-bpi-r4.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt7988a.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8173.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8183-kukui.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8186-corsola-squirtle.dts
index 0000000000000000000000000000000000000000,f721ad4e5c97825550692dba3363973fbcbe6c54..f721ad4e5c97825550692dba3363973fbcbe6c54
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/mediatek/mt8186-corsola-squirtle.dts
+++ b/dts/upstream/src/arm64/mediatek/mt8186-corsola-squirtle.dts

diff --cc dts/upstream/src/arm64/mediatek/mt8186-corsola-steelix.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8186-corsola-tentacool-sku327683.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8186-corsola-tentacruel-sku262148.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8186-corsola-voltorb.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8186-corsola.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8192-asurada-spherion-r0.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8192-asurada.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8195.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8370.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8390-genio-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8395-genio-1200-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/nuvoton/nuvoton-common-npcm8xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/nvidia/tegra264-p3834-0008.dtsi
index 0000000000000000000000000000000000000000,94ace678474978866671babedf55b634fd387435..94ace678474978866671babedf55b634fd387435
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/nvidia/tegra264-p3834-0008.dtsi
+++ b/dts/upstream/src/arm64/nvidia/tegra264-p3834-0008.dtsi

diff --cc dts/upstream/src/arm64/nvidia/tegra264-p3834.dtsi
index 0000000000000000000000000000000000000000,06795c82427ad1247265e222f5c02cff0be4f011..06795c82427ad1247265e222f5c02cff0be4f011
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/nvidia/tegra264-p3834.dtsi
+++ b/dts/upstream/src/arm64/nvidia/tegra264-p3834.dtsi

diff --cc dts/upstream/src/arm64/nvidia/tegra264-p3971-0089+p3834-0008.dts
index 0000000000000000000000000000000000000000,3a6f4b7e6b756079e6fcb10cd56b0d8aff2ca86d..3a6f4b7e6b756079e6fcb10cd56b0d8aff2ca86d
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/nvidia/tegra264-p3971-0089+p3834-0008.dts
+++ b/dts/upstream/src/arm64/nvidia/tegra264-p3971-0089+p3834-0008.dts

diff --cc dts/upstream/src/arm64/nvidia/tegra264-p3971-0089+p3834.dtsi
index 0000000000000000000000000000000000000000,46cfa8f1da1cc911ab3ed7722f653df1ddfe0dec..46cfa8f1da1cc911ab3ed7722f653df1ddfe0dec
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/nvidia/tegra264-p3971-0089+p3834.dtsi
+++ b/dts/upstream/src/arm64/nvidia/tegra264-p3971-0089+p3834.dtsi

diff --cc dts/upstream/src/arm64/nvidia/tegra264-p3971-0089.dtsi
index 0000000000000000000000000000000000000000,e8576cf2a0b68ef6082114eda440975d08fa5550..e8576cf2a0b68ef6082114eda440975d08fa5550
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/nvidia/tegra264-p3971-0089.dtsi
+++ b/dts/upstream/src/arm64/nvidia/tegra264-p3971-0089.dtsi

diff --cc dts/upstream/src/arm64/nvidia/tegra264-p3971.dtsi
index 0000000000000000000000000000000000000000,6b6259b7310fb1a09049e20ddd40685330a40421..6b6259b7310fb1a09049e20ddd40685330a40421
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/nvidia/tegra264-p3971.dtsi
+++ b/dts/upstream/src/arm64/nvidia/tegra264-p3971.dtsi

diff --cc dts/upstream/src/arm64/nvidia/tegra264.dtsi
index 0000000000000000000000000000000000000000,e02659efa2332e946b9569a2528b97a7cd2ced1e..e02659efa2332e946b9569a2528b97a7cd2ced1e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/nvidia/tegra264.dtsi
+++ b/dts/upstream/src/arm64/nvidia/tegra264.dtsi

diff --cc dts/upstream/src/arm64/qcom/apq8016-sbc-d3-camera-mezzanine.dtso
Simple merge

diff --cc dts/upstream/src/arm64/qcom/ipq6018.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/ipq8074.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/msm8976-longcheer-l9360.dts
index 0000000000000000000000000000000000000000,e524d58cf0a4b7693741036e3988700559a507f0..e524d58cf0a4b7693741036e3988700559a507f0
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/qcom/msm8976-longcheer-l9360.dts
+++ b/dts/upstream/src/arm64/qcom/msm8976-longcheer-l9360.dts

diff --cc dts/upstream/src/arm64/qcom/msm8976.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/msm8996.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/msm8998.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/qcm2290.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/qcs615-ride.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/qcs615.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/qcs8300-ride.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/qcs8300.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/qrb5165-rb5-vision-mezzanine.dtso
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sa8775p-ride.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sa8775p.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sar2130p.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sc7180.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sc7280.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sc8180x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sdm845.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sdm850-lenovo-yoga-c630.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm6115.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm6350.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8150.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8250.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8350.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8450.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8550.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8650-hdk.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8650-mtp.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8650-qrd.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8650.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8750-mtp.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8750-qrd.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sm8750.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/x1-asus-zenbook-a14.dtsi
index 0000000000000000000000000000000000000000,c771fd1d8029b567dca349f2b0f2013f736c2b9f..c771fd1d8029b567dca349f2b0f2013f736c2b9f
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/qcom/x1-asus-zenbook-a14.dtsi
+++ b/dts/upstream/src/arm64/qcom/x1-asus-zenbook-a14.dtsi

diff --cc dts/upstream/src/arm64/qcom/x1e80100-asus-zenbook-a14.dts
index 0000000000000000000000000000000000000000,0d0bcc50207d7540285d82304dbc99e82858f6f0..0d0bcc50207d7540285d82304dbc99e82858f6f0
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/qcom/x1e80100-asus-zenbook-a14.dts
+++ b/dts/upstream/src/arm64/qcom/x1e80100-asus-zenbook-a14.dts

diff --cc dts/upstream/src/arm64/qcom/x1e80100-dell-xps13-9345.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/x1e80100-hp-omnibook-x14.dts
Simple merge

diff --cc dts/upstream/src/arm64/qcom/x1e80100.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/x1p42100-asus-zenbook-a14.dts
index 0000000000000000000000000000000000000000,bd75ff898601a0e1d79a5c3986c946046eecf789..bd75ff898601a0e1d79a5c3986c946046eecf789
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/qcom/x1p42100-asus-zenbook-a14.dts
+++ b/dts/upstream/src/arm64/qcom/x1p42100-asus-zenbook-a14.dts

diff --cc dts/upstream/src/arm64/qcom/x1p42100.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/condor-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/draak.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/ebisu.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/gray-hawk-single.dtsi
index 0000000000000000000000000000000000000000,2edb5cb3407b4590cf1957d2c16bbaa7e7efbf70..2edb5cb3407b4590cf1957d2c16bbaa7e7efbf70
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/gray-hawk-single.dtsi
+++ b/dts/upstream/src/arm64/renesas/gray-hawk-single.dtsi

diff --cc dts/upstream/src/arm64/renesas/r8a779g0.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779g3-sparrow-hawk.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779h0-gray-hawk-single.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779h2-gray-hawk-single.dts
index 0000000000000000000000000000000000000000,aeb32c77099ea20fad70131c6795b06f6d4d5445..aeb32c77099ea20fad70131c6795b06f6d4d5445
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/r8a779h2-gray-hawk-single.dts
+++ b/dts/upstream/src/arm64/renesas/r8a779h2-gray-hawk-single.dts

diff --cc dts/upstream/src/arm64/renesas/r8a779h2.dtsi
index 0000000000000000000000000000000000000000,2707d2d36766199425c6330b021771e0f3231cb9..2707d2d36766199425c6330b021771e0f3231cb9
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/r8a779h2.dtsi
+++ b/dts/upstream/src/arm64/renesas/r8a779h2.dtsi

diff --cc dts/upstream/src/arm64/renesas/r9a09g047.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r9a09g047e57-smarc-cru-csi-ov5645.dtso
index 0000000000000000000000000000000000000000,0f18f68f8120853637f9bdccfa1008ec950fabad..0f18f68f8120853637f9bdccfa1008ec950fabad
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/r9a09g047e57-smarc-cru-csi-ov5645.dtso
+++ b/dts/upstream/src/arm64/renesas/r9a09g047e57-smarc-cru-csi-ov5645.dtso

diff --cc dts/upstream/src/arm64/renesas/r9a09g047e57-smarc.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r9a09g056.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r9a09g056n48-rzv2n-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r9a09g057.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r9a09g057h44-rzv2h-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/renesas-smarc2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/rzg3e-smarc-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/rzv2-evk-cn15-emmc.dtso
index 0000000000000000000000000000000000000000,eda2b31f6d798039fdd1ddebddc3215de1c5b603..eda2b31f6d798039fdd1ddebddc3215de1c5b603
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/rzv2-evk-cn15-emmc.dtso
+++ b/dts/upstream/src/arm64/renesas/rzv2-evk-cn15-emmc.dtso

diff --cc dts/upstream/src/arm64/renesas/rzv2-evk-cn15-sd.dtso
index 0000000000000000000000000000000000000000,0af1e0a6c7f482922a5bc2362a816549612d1091..0af1e0a6c7f482922a5bc2362a816549612d1091
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/rzv2-evk-cn15-sd.dtso
+++ b/dts/upstream/src/arm64/renesas/rzv2-evk-cn15-sd.dtso

diff --cc dts/upstream/src/arm64/renesas/salvator-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/ulcb.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-cobra-ltk050h3146w-a2.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-cobra-ltk050h3146w.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-cobra-ltk050h3148w.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-cobra-ltk500hd1829.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-evb.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-pp1516-ltk050h3146w-a2.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-pp1516-ltk050h3148w.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-pp1516.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-ringneck-haikou-video-demo.dtso
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts
index 0000000000000000000000000000000000000000,e5e6b800c2d163ba25e3164b6e125df4b26f4ca1..e5e6b800c2d163ba25e3164b6e125df4b26f4ca1
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3308-sakurapi-rk3308b.dts

diff --cc dts/upstream/src/arm64/rockchip/rk3326-anbernic-rg351m.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3326-gameforce-chi.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3326-odroid-go.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3328.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3368-lba3368.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-base.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-gru-chromebook.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-gru-scarlet.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-hugsun-x99.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-pinebook-pro.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-pinephone-pro.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-puma-haikou-video-demo.dtso
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-rock-4c-plus.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-rockpro64-screen.dtso
index 0000000000000000000000000000000000000000,dabe535f2111656abc67d25492aa074466e0011b..dabe535f2111656abc67d25492aa074466e0011b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3399-rockpro64-screen.dtso
+++ b/dts/upstream/src/arm64/rockchip/rk3399-rockpro64-screen.dtso

diff --cc dts/upstream/src/arm64/rockchip/rk3399-rockpro64.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-sapphire-excavator.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3528-pinctrl.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3528-radxa-e20c.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3528.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3562.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3566-anbernic-rgxx3.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3566-bigtreetech-cb2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3566-pinenote.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3566-pinetab2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3568-evb1-v10.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3568-nanopi-r5s.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3568-nanopi-r5s.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3576-armsom-sige5-v1.2-wifibt.dtso
index 0000000000000000000000000000000000000000,242ccfaf711bbd73e60a51580873e40da872eae2..242ccfaf711bbd73e60a51580873e40da872eae2
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3576-armsom-sige5-v1.2-wifibt.dtso
+++ b/dts/upstream/src/arm64/rockchip/rk3576-armsom-sige5-v1.2-wifibt.dtso

diff --cc dts/upstream/src/arm64/rockchip/rk3576-armsom-sige5.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3576-evb1-v10.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3576-luckfox-core3576.dtsi
index 0000000000000000000000000000000000000000,9187012d6fa42495f26b738e28641393ab9e003c..9187012d6fa42495f26b738e28641393ab9e003c
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3576-luckfox-core3576.dtsi
+++ b/dts/upstream/src/arm64/rockchip/rk3576-luckfox-core3576.dtsi

diff --cc dts/upstream/src/arm64/rockchip/rk3576-luckfox-omni3576.dts
index 0000000000000000000000000000000000000000,6c75959adfe19998cfbb2237232b6fcebf3b7fe1..6c75959adfe19998cfbb2237232b6fcebf3b7fe1
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3576-luckfox-omni3576.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3576-luckfox-omni3576.dts

diff --cc dts/upstream/src/arm64/rockchip/rk3576-nanopi-m5.dts
index 0000000000000000000000000000000000000000,cce34c541f7c5fc6f90004ed2102d46c71c63712..cce34c541f7c5fc6f90004ed2102d46c71c63712
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3576-nanopi-m5.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3576-nanopi-m5.dts

diff --cc dts/upstream/src/arm64/rockchip/rk3576-rock-4d.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3576.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3582-radxa-e52c.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-armsom-sige7.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-evb1-v10.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-friendlyelec-cm3588-nas.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-jaguar-ethernet-switch.dtso
index 0000000000000000000000000000000000000000,7d9b1f080b3fcc9e19ff4973e90b763bfaa573b5..7d9b1f080b3fcc9e19ff4973e90b763bfaa573b5
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3588-jaguar-ethernet-switch.dtso
+++ b/dts/upstream/src/arm64/rockchip/rk3588-jaguar-ethernet-switch.dtso

diff --cc dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-orangepi-5-plus.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-orangepi-5.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-rock-5b-5bp-5t.dtsi
index 0000000000000000000000000000000000000000,973d39a7e0e09897ee72a89c836ecdc6e2cf91b5..973d39a7e0e09897ee72a89c836ecdc6e2cf91b5
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3588-rock-5b-5bp-5t.dtsi
+++ b/dts/upstream/src/arm64/rockchip/rk3588-rock-5b-5bp-5t.dtsi

diff --cc dts/upstream/src/arm64/rockchip/rk3588-rock-5b.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-rock-5t.dts
index 0000000000000000000000000000000000000000,f16ff0064309ae0d88d82d2d7deec15c9ceb8cdb..f16ff0064309ae0d88d82d2d7deec15c9ceb8cdb
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3588-rock-5t.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3588-rock-5t.dts

diff --cc dts/upstream/src/arm64/rockchip/rk3588-turing-rk1.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588j.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-gameforce-ace.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-roc-pc.dts
index 0000000000000000000000000000000000000000,7e179862da6e56dfbc12e13b8f942bb675b0beb3..7e179862da6e56dfbc12e13b8f942bb675b0beb3
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3588s-roc-pc.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3588s-roc-pc.dts

diff --cc dts/upstream/src/arm64/sophgo/sg2000-milkv-duo-module-01-evb.dts
index 0000000000000000000000000000000000000000,a281fee0d76e7db8b6daa7f6c7dab7918bcd15d7..a281fee0d76e7db8b6daa7f6c7dab7918bcd15d7
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/sophgo/sg2000-milkv-duo-module-01-evb.dts
+++ b/dts/upstream/src/arm64/sophgo/sg2000-milkv-duo-module-01-evb.dts

diff --cc dts/upstream/src/arm64/sophgo/sg2000-milkv-duo-module-01.dtsi
index 0000000000000000000000000000000000000000,32c988f3c58fb7ae50d1ee9368d2ee010cc90f60..32c988f3c58fb7ae50d1ee9368d2ee010cc90f60
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/sophgo/sg2000-milkv-duo-module-01.dtsi
+++ b/dts/upstream/src/arm64/sophgo/sg2000-milkv-duo-module-01.dtsi

diff --cc dts/upstream/src/arm64/sophgo/sg2000.dtsi
index 0000000000000000000000000000000000000000,51177dfe9ed2f26749a769d61bf6fbfd248f6503..51177dfe9ed2f26749a769d61bf6fbfd248f6503
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/sophgo/sg2000.dtsi
+++ b/dts/upstream/src/arm64/sophgo/sg2000.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp25-pinctrl.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/st/stm32mp251.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/st/stm32mp257f-ev1.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62-lp-sk.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62-main.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62-verdin.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am625-sk.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62a-main.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62a-wakeup.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62a7-sk.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62d2-evm.dts
index 0000000000000000000000000000000000000000,daea18b0bc61c67fc1a1c8f4f47b4fd40b0235e1..daea18b0bc61c67fc1a1c8f4f47b4fd40b0235e1
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/ti/k3-am62d2-evm.dts
+++ b/dts/upstream/src/arm64/ti/k3-am62d2-evm.dts

diff --cc dts/upstream/src/arm64/ti/k3-am62d2.dtsi
index 0000000000000000000000000000000000000000,c7d8ab43c72f9cb3adae3f286c3377f7add6366d..c7d8ab43c72f9cb3adae3f286c3377f7add6366d
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/ti/k3-am62d2.dtsi
+++ b/dts/upstream/src/arm64/ti/k3-am62d2.dtsi

diff --cc dts/upstream/src/arm64/ti/k3-am62p-j722s-common-main.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62p-j722s-common-thermal.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62p-verdin.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62p5-sk.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62p5.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62x-sk-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am642-evm-pcie0-ep.dtso
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am642-phyboard-electra-rdk.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am65-main.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am65-wakeup.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am654-base-board.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am654-pcie-usb2.dtso
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am654-pcie-usb3.dtso
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am68-sk-base-board.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am69-sk.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-j721s2-main.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-j722s-evm.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-j722s-main.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-j722s.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-j784s4-j742s2-main-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-pinctrl.h
Simple merge

diff --cc dts/upstream/src/loongarch/loongson-2k0500-ref.dts
Simple merge

diff --cc dts/upstream/src/loongarch/loongson-2k0500.dtsi
Simple merge

diff --cc dts/upstream/src/loongarch/loongson-2k1000-ref.dts
Simple merge

diff --cc dts/upstream/src/loongarch/loongson-2k1000.dtsi
Simple merge

diff --cc dts/upstream/src/loongarch/loongson-2k2000-ref.dts
Simple merge

diff --cc dts/upstream/src/loongarch/loongson-2k2000.dtsi
Simple merge

diff --cc dts/upstream/src/mips/lantiq/danube_easy50712.dts
Simple merge

diff --cc dts/upstream/src/mips/mobileye/eyeq5-epm5.dts
Simple merge

diff --cc dts/upstream/src/mips/mobileye/eyeq5.dtsi
Simple merge

diff --cc dts/upstream/src/mips/mobileye/eyeq6h.dtsi
Simple merge

diff --cc dts/upstream/src/mips/qca/ar9132.dtsi
Simple merge

diff --cc dts/upstream/src/mips/qca/ar9132_tl_wr1043nd_v1.dts
Simple merge

diff --cc dts/upstream/src/mips/qca/ar9331.dtsi
Simple merge

diff --cc dts/upstream/src/mips/qca/ar9331_dpt_module.dts
Simple merge

diff --cc dts/upstream/src/mips/qca/ar9331_dragino_ms14.dts
Simple merge

diff --cc dts/upstream/src/mips/qca/ar9331_omega.dts
Simple merge

diff --cc dts/upstream/src/mips/qca/ar9331_openembed_som9331_board.dts
Simple merge

diff --cc dts/upstream/src/mips/qca/ar9331_tl_mr3020.dts
Simple merge

diff --cc dts/upstream/src/mips/ralink/gardena_smart_gateway_mt7688.dts
Simple merge

diff --cc dts/upstream/src/mips/ralink/mt7620a.dtsi
Simple merge

diff --cc dts/upstream/src/mips/ralink/mt7628a.dtsi
Simple merge

diff --cc dts/upstream/src/mips/realtek/cameo-rtl9302c-2x-rtl8224-2xge.dts
Simple merge

diff --cc dts/upstream/src/mips/realtek/rtl930x.dtsi
Simple merge

diff --cc dts/upstream/src/powerpc/microwatt.dts
Simple merge

diff --cc dts/upstream/src/riscv/allwinner/sun20i-d1-devterm-v3.14.dts
Simple merge

diff --cc dts/upstream/src/riscv/andes/qilai-voyager.dts
index 0000000000000000000000000000000000000000,fa7d2b32a9b4bb90c0134cc1e2a3506862caec6d..fa7d2b32a9b4bb90c0134cc1e2a3506862caec6d
mode 000000,100644..100644
--- /dev/null
--- 2/src/riscv/andes/qilai-voyager.dts
+++ b/dts/upstream/src/riscv/andes/qilai-voyager.dts

diff --cc dts/upstream/src/riscv/andes/qilai.dtsi
index 0000000000000000000000000000000000000000,de3de32f8c399601c9f451f69779998a167edc28..de3de32f8c399601c9f451f69779998a167edc28
mode 000000,100644..100644
--- /dev/null
--- 2/src/riscv/andes/qilai.dtsi
+++ b/dts/upstream/src/riscv/andes/qilai.dtsi

diff --cc dts/upstream/src/riscv/sifive/hifive-unleashed-a00.dts
Simple merge

diff --cc dts/upstream/src/riscv/sifive/hifive-unmatched-a00.dts
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/cv180x.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/cv1812h-huashan-pi.dts
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/cv18xx-reset.h
index 0000000000000000000000000000000000000000,7e7c5ca2dbbd781ef44b56cb8bdaa9d0f085ccc9..7e7c5ca2dbbd781ef44b56cb8bdaa9d0f085ccc9
mode 000000,100644..100644
--- /dev/null
--- 2/src/riscv/sophgo/cv18xx-reset.h
+++ b/dts/upstream/src/riscv/sophgo/cv18xx-reset.h

diff --cc dts/upstream/src/riscv/sophgo/sg2042-cpus.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/sg2042-evb-v1.dts
index 0000000000000000000000000000000000000000,3320bc1dd2c66ab1a77fce719f145070ad51f297..3320bc1dd2c66ab1a77fce719f145070ad51f297
mode 000000,100644..100644
--- /dev/null
--- 2/src/riscv/sophgo/sg2042-evb-v1.dts
+++ b/dts/upstream/src/riscv/sophgo/sg2042-evb-v1.dts

diff --cc dts/upstream/src/riscv/sophgo/sg2042-evb-v2.dts
index 0000000000000000000000000000000000000000,46980e41b886ce17dacce791fa5f2cef14cfa214..46980e41b886ce17dacce791fa5f2cef14cfa214
mode 000000,100644..100644
--- /dev/null
--- 2/src/riscv/sophgo/sg2042-evb-v2.dts
+++ b/dts/upstream/src/riscv/sophgo/sg2042-evb-v2.dts

diff --cc dts/upstream/src/riscv/sophgo/sg2042.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/sg2044-cpus.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/sg2044-sophgo-srd3-10.dts
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/sg2044.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/spacemit/k1-bananapi-f3.dts
Simple merge

diff --cc dts/upstream/src/riscv/spacemit/k1-pinctrl.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/spacemit/k1.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/starfive/jh7110-common.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dts
Simple merge

diff --cc dts/upstream/src/riscv/thead/th1520.dtsi
Simple merge