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

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

Signed-off-by: Tom Rini <trini@konsulko.com>

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

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

diff --cc dts/upstream/Bindings/arm/arm,coresight-tmc.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/arm,morello.yaml
index 0000000,e843b97..e843b97
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/arm/arm,morello.yaml
+++ b/dts/upstream/Bindings/arm/arm,morello.yaml

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

diff --cc dts/upstream/Bindings/arm/atmel-sysregs.txt
Simple merge

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/google.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/marvell/armada-37xx.yaml
Simple merge

diff --cc dts/upstream/Bindings/arm/marvell/armada-7k-8k.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/arm/qcom,coresight-ctcu.yaml
index 0000000,843b52e..843b52e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/arm/qcom,coresight-ctcu.yaml
+++ b/dts/upstream/Bindings/arm/qcom,coresight-ctcu.yaml

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

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

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

diff --cc dts/upstream/Bindings/arm/stm32/st,stm32-syscon.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/ti/omap.yaml
Simple merge

diff --cc dts/upstream/Bindings/ata/ceva,ahci-1v84.yaml
Simple merge

diff --cc dts/upstream/Bindings/ata/fsl,pq-sata.yaml
index 0000000,1d19ee8..1d19ee8
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/ata/fsl,pq-sata.yaml
+++ b/dts/upstream/Bindings/ata/fsl,pq-sata.yaml

diff --cc dts/upstream/Bindings/clock/allwinner,sun55i-a523-ccu.yaml
index 0000000,f5f62e9..f5f62e9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/allwinner,sun55i-a523-ccu.yaml
+++ b/dts/upstream/Bindings/clock/allwinner,sun55i-a523-ccu.yaml

diff --cc dts/upstream/Bindings/clock/atmel,at91rm9200-pmc.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/imx8m-clock.yaml
Simple merge

diff --cc dts/upstream/Bindings/clock/imx8mp-audiomix.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/clock/qcom,ipq9574-nsscc.yaml
index 0000000,17252b6..17252b6
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/qcom,ipq9574-nsscc.yaml
+++ b/dts/upstream/Bindings/clock/qcom,ipq9574-nsscc.yaml

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

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

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

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

diff --cc dts/upstream/Bindings/clock/rockchip,rk3562-cru.yaml
index 0000000,36a353f..36a353f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/rockchip,rk3562-cru.yaml
+++ b/dts/upstream/Bindings/clock/rockchip,rk3562-cru.yaml

diff --cc dts/upstream/Bindings/clock/samsung,exynos2200-cmu.yaml
index 0000000,89433e6..89433e6
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/samsung,exynos2200-cmu.yaml
+++ b/dts/upstream/Bindings/clock/samsung,exynos2200-cmu.yaml

diff --cc dts/upstream/Bindings/clock/samsung,exynos7870-cmu.yaml
index 0000000,3c58712..3c58712
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/samsung,exynos7870-cmu.yaml
+++ b/dts/upstream/Bindings/clock/samsung,exynos7870-cmu.yaml

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

diff --cc dts/upstream/Bindings/clock/ti,clkctrl.yaml
index 0000000,4978755..4978755
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/clock/ti,clkctrl.yaml
+++ b/dts/upstream/Bindings/clock/ti,clkctrl.yaml

diff --cc dts/upstream/Bindings/connector/gocontroll,moduline-module-slot.yaml
index 0000000,a16ae27..a16ae27
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/connector/gocontroll,moduline-module-slot.yaml
+++ b/dts/upstream/Bindings/connector/gocontroll,moduline-module-slot.yaml

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

diff --cc dts/upstream/Bindings/crypto/fsl,sec2.0.yaml
index 0000000,2091b89..2091b89
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/crypto/fsl,sec2.0.yaml
+++ b/dts/upstream/Bindings/crypto/fsl,sec2.0.yaml

diff --cc dts/upstream/Bindings/crypto/inside-secure,safexcel-eip93.yaml
index 0000000,997bf97..997bf97
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/crypto/inside-secure,safexcel-eip93.yaml
+++ b/dts/upstream/Bindings/crypto/inside-secure,safexcel-eip93.yaml

diff --cc dts/upstream/Bindings/crypto/inside-secure,safexcel.yaml
Simple merge

diff --cc dts/upstream/Bindings/crypto/qcom,prng.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/display/apple,h7-display-pipe-mipi.yaml
index 0000000,5e6da66..5e6da66
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/apple,h7-display-pipe-mipi.yaml
+++ b/dts/upstream/Bindings/display/apple,h7-display-pipe-mipi.yaml

diff --cc dts/upstream/Bindings/display/apple,h7-display-pipe.yaml
index 0000000,102fb18..102fb18
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/apple,h7-display-pipe.yaml
+++ b/dts/upstream/Bindings/display/apple,h7-display-pipe.yaml

diff --cc dts/upstream/Bindings/display/bridge/lvds-codec.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/bridge/nwl-dsi.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/bridge/ti,sn65dsi83.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/display/mediatek/mediatek,dsc.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-common.yaml
Simple merge

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

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

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

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

diff --cc dts/upstream/Bindings/display/panel/apple,summit.yaml
index 0000000,f081755..f081755
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/panel/apple,summit.yaml
+++ b/dts/upstream/Bindings/display/panel/apple,summit.yaml

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

diff --cc dts/upstream/Bindings/display/panel/mitsubishi,aa104xd12.yaml
Simple merge

diff --cc dts/upstream/Bindings/display/panel/panel-simple-lvds-dual-ports.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
index 0000000,54c9c0e..54c9c0e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/panel/raydium,rm67200.yaml
+++ b/dts/upstream/Bindings/display/panel/raydium,rm67200.yaml

diff --cc dts/upstream/Bindings/display/panel/visionox,rm692e5.yaml
index 0000000,d4b4672..d4b4672
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/display/panel/visionox,rm692e5.yaml
+++ b/dts/upstream/Bindings/display/panel/visionox,rm692e5.yaml

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

diff --cc dts/upstream/Bindings/display/rockchip/rockchip,rk3588-dw-hdmi-qp.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/display/tegra/nvidia,tegra114-mipi.yaml
Simple merge

diff --cc dts/upstream/Bindings/dma/atmel,at91sam9g45-dma.yaml
index 0000000,a58dc40..a58dc40
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dma/atmel,at91sam9g45-dma.yaml
+++ b/dts/upstream/Bindings/dma/atmel,at91sam9g45-dma.yaml

diff --cc dts/upstream/Bindings/dma/atmel,sama5d4-dma.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/dma/fsl,elo-dma.yaml
index 0000000,92288d7..92288d7
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dma/fsl,elo-dma.yaml
+++ b/dts/upstream/Bindings/dma/fsl,elo-dma.yaml

diff --cc dts/upstream/Bindings/dma/fsl,elo3-dma.yaml
index 0000000,0f5e475..0f5e475
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dma/fsl,elo3-dma.yaml
+++ b/dts/upstream/Bindings/dma/fsl,elo3-dma.yaml

diff --cc dts/upstream/Bindings/dma/fsl,eloplus-dma.yaml
index 0000000,8992f24..8992f24
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/dma/fsl,eloplus-dma.yaml
+++ b/dts/upstream/Bindings/dma/fsl,eloplus-dma.yaml

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

diff --cc dts/upstream/Bindings/dma/snps,dw-axi-dmac.yaml
Simple merge

diff --cc dts/upstream/Bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/dts-coding-style.rst
Simple merge

diff --cc dts/upstream/Bindings/edac/altr,socfpga-ecc-manager.yaml
index 0000000,ec4634c..ec4634c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/edac/altr,socfpga-ecc-manager.yaml
+++ b/dts/upstream/Bindings/edac/altr,socfpga-ecc-manager.yaml

diff --cc dts/upstream/Bindings/eeprom/at24.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/firmware/google,gs101-acpm-ipc.yaml
index 0000000,2cdad1b..2cdad1b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/firmware/google,gs101-acpm-ipc.yaml
+++ b/dts/upstream/Bindings/firmware/google,gs101-acpm-ipc.yaml

diff --cc dts/upstream/Bindings/firmware/thead,th1520-aon.yaml
index 0000000,bbc1832..bbc1832
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/firmware/thead,th1520-aon.yaml
+++ b/dts/upstream/Bindings/firmware/thead,th1520-aon.yaml

diff --cc dts/upstream/Bindings/fsi/ibm,p9-scom.yaml
Simple merge

diff --cc dts/upstream/Bindings/gpio/aspeed,ast2400-gpio.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/gpio/loongson,ls-gpio.yaml
Simple merge

diff --cc dts/upstream/Bindings/gpio/nxp,pcf8575.yaml
Simple merge

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

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

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

diff --cc dts/upstream/Bindings/hwinfo/samsung,exynos-chipid.yaml
Simple merge

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

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

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

diff --cc dts/upstream/Bindings/hwmon/gpio-fan.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/maxim,max6639.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/hwmon/microchip,emc2305.yaml
index 0000000,d3f06eb..d3f06eb
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/hwmon/microchip,emc2305.yaml
+++ b/dts/upstream/Bindings/hwmon/microchip,emc2305.yaml

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

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

diff --cc dts/upstream/Bindings/hwmon/nuvoton,nct6775.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/nuvoton,nct7363.yaml
Simple merge

diff --cc dts/upstream/Bindings/hwmon/nuvoton,nct7802.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/hwmon/ti,ads7828.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/hwmon/ti,tmp513.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/hwmon/winbond,w83781d.yaml
Simple merge

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

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

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

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

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

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

diff --cc dts/upstream/Bindings/i2c/spacemit,k1-i2c.yaml
index 0000000,3d6aefb..3d6aefb
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/i2c/spacemit,k1-i2c.yaml
+++ b/dts/upstream/Bindings/i2c/spacemit,k1-i2c.yaml

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

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

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

diff --cc dts/upstream/Bindings/iio/adc/adi,ad4030.yaml
index 0000000,54e7349..54e7349
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/adc/adi,ad4030.yaml
+++ b/dts/upstream/Bindings/iio/adc/adi,ad4030.yaml

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

diff --cc dts/upstream/Bindings/iio/adc/adi,ad4851.yaml
index 0000000,c6676d9..c6676d9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/adc/adi,ad4851.yaml
+++ b/dts/upstream/Bindings/iio/adc/adi,ad4851.yaml

diff --cc dts/upstream/Bindings/iio/adc/adi,ad7191.yaml
index 0000000,801ed31..801ed31
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/adc/adi,ad7191.yaml
+++ b/dts/upstream/Bindings/iio/adc/adi,ad7191.yaml

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

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

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

diff --cc dts/upstream/Bindings/iio/adc/rockchip-saradc.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/adc/ti,ads7138.yaml
index 0000000,a51893e..a51893e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/adc/ti,ads7138.yaml
+++ b/dts/upstream/Bindings/iio/adc/ti,ads7138.yaml

diff --cc dts/upstream/Bindings/iio/adc/xlnx,zynqmp-ams.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/dac/adi,ad5380.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/frequency/adf4371.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/humidity/sciosense,ens210.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/imu/adi,adis16550.yaml
index 0000000,a4c273c..a4c273c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/imu/adi,adis16550.yaml
+++ b/dts/upstream/Bindings/iio/imu/adi,adis16550.yaml

diff --cc dts/upstream/Bindings/iio/light/brcm,apds9160.yaml
index 0000000,bb1cc44..bb1cc44
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/light/brcm,apds9160.yaml
+++ b/dts/upstream/Bindings/iio/light/brcm,apds9160.yaml

diff --cc dts/upstream/Bindings/iio/light/dynaimage,al3010.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/magnetometer/silabs,si7210.yaml
index 0000000,d4a3f79..d4a3f79
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/iio/magnetometer/silabs,si7210.yaml
+++ b/dts/upstream/Bindings/iio/magnetometer/silabs,si7210.yaml

diff --cc dts/upstream/Bindings/iio/temperature/maxim,max31865.yaml
Simple merge

diff --cc dts/upstream/Bindings/iio/temperature/ti,tmp117.yaml
Simple merge

diff --cc dts/upstream/Bindings/input/gpio-matrix-keypad.yaml
index 0000000,ebfff9e..ebfff9e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/input/gpio-matrix-keypad.yaml
+++ b/dts/upstream/Bindings/input/gpio-matrix-keypad.yaml

diff --cc dts/upstream/Bindings/input/mediatek,mt6779-keypad.yaml
Simple merge

diff --cc dts/upstream/Bindings/input/qcom,pm8921-keypad.yaml
Simple merge

diff --cc dts/upstream/Bindings/input/qcom,pm8921-pwrkey.yaml
Simple merge

diff --cc dts/upstream/Bindings/input/touchscreen/apple,z2-multitouch.yaml
index 0000000,402ca6b..402ca6b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/input/touchscreen/apple,z2-multitouch.yaml
+++ b/dts/upstream/Bindings/input/touchscreen/apple,z2-multitouch.yaml

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

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

diff --cc dts/upstream/Bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/brcm,bcm2712-msix.yaml
index 0000000,c846146..c846146
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/brcm,bcm2712-msix.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/brcm,bcm2712-msix.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/fsl,irqsteer.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/nxp,lpc3220-mic.yaml
index 0000000,724c869..724c869
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/nxp,lpc3220-mic.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/nxp,lpc3220-mic.yaml

diff --cc dts/upstream/Bindings/interrupt-controller/renesas,rzv2h-icu.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/riscv,aplic.yaml
Simple merge

diff --cc dts/upstream/Bindings/interrupt-controller/sophgo,sg2042-msi.yaml
index 0000000,e1ffd55..e1ffd55
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/interrupt-controller/sophgo,sg2042-msi.yaml
+++ b/dts/upstream/Bindings/interrupt-controller/sophgo,sg2042-msi.yaml

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

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

diff --cc dts/upstream/Bindings/leds/backlight/apple,dwi-bl.yaml
index 0000000,29caeb3..29caeb3
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/leds/backlight/apple,dwi-bl.yaml
+++ b/dts/upstream/Bindings/leds/backlight/apple,dwi-bl.yaml

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

diff --cc dts/upstream/Bindings/leds/ti,tlc59116.yaml
index 0000000,ce97137..ce97137
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/leds/ti,tlc59116.yaml
+++ b/dts/upstream/Bindings/leds/ti,tlc59116.yaml

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

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

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

diff --cc dts/upstream/Bindings/media/aspeed,video-engine.yaml
index 0000000,682bba2..682bba2
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/media/aspeed,video-engine.yaml
+++ b/dts/upstream/Bindings/media/aspeed,video-engine.yaml

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

diff --cc dts/upstream/Bindings/media/i2c/st,st-mipid02.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/mediatek,vcodec-encoder.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/mediatek,vcodec-subdev-decoder.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/mediatek-jpeg-decoder.yaml
Simple merge

diff --cc dts/upstream/Bindings/media/mediatek-jpeg-encoder.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/media/qcom,sdm670-camss.yaml
index 0000000,35c40fe..35c40fe
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/media/qcom,sdm670-camss.yaml
+++ b/dts/upstream/Bindings/media/qcom,sdm670-camss.yaml

diff --cc dts/upstream/Bindings/media/qcom,sm8550-camss.yaml
index 0000000,cd34f14..cd34f14
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/media/qcom,sm8550-camss.yaml
+++ b/dts/upstream/Bindings/media/qcom,sm8550-camss.yaml

diff --cc dts/upstream/Bindings/media/qcom,sm8550-iris.yaml
index 0000000,e424ea8..e424ea8
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/media/qcom,sm8550-iris.yaml
+++ b/dts/upstream/Bindings/media/qcom,sm8550-iris.yaml

diff --cc dts/upstream/Bindings/media/snps,dw-hdmi-rx.yaml
index 0000000,510e94e..510e94e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/media/snps,dw-hdmi-rx.yaml
+++ b/dts/upstream/Bindings/media/snps,dw-hdmi-rx.yaml

diff --cc dts/upstream/Bindings/media/st,stm32mp25-csi.yaml
Simple merge

diff --cc dts/upstream/Bindings/memory-controllers/exynos-srom.yaml
Simple merge

diff --cc dts/upstream/Bindings/memory-controllers/mc-peripheral-props.yaml
Simple merge

diff --cc dts/upstream/Bindings/memory-controllers/qcom,ebi2-peripheral-props.yaml
index 0000000,29f8c30..29f8c30
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/memory-controllers/qcom,ebi2-peripheral-props.yaml
+++ b/dts/upstream/Bindings/memory-controllers/qcom,ebi2-peripheral-props.yaml

diff --cc dts/upstream/Bindings/memory-controllers/qcom,ebi2.yaml
Simple merge

diff --cc dts/upstream/Bindings/memory-controllers/samsung,exynos4210-srom-peripheral-props.yaml
index 0000000,c474f90..c474f90
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/memory-controllers/samsung,exynos4210-srom-peripheral-props.yaml
+++ b/dts/upstream/Bindings/memory-controllers/samsung,exynos4210-srom-peripheral-props.yaml

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

diff --cc dts/upstream/Bindings/mfd/atmel,sama5d2-flexcom.yaml
Simple merge

diff --cc dts/upstream/Bindings/mfd/fsl,mcu-mpc8349emitx.yaml
index 0000000,8beb2ed..8beb2ed
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mfd/fsl,mcu-mpc8349emitx.yaml
+++ b/dts/upstream/Bindings/mfd/fsl,mcu-mpc8349emitx.yaml

diff --cc dts/upstream/Bindings/mfd/maxim,max77705.yaml
index 0000000,0ec89f0..0ec89f0
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mfd/maxim,max77705.yaml
+++ b/dts/upstream/Bindings/mfd/maxim,max77705.yaml

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

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

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

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

diff --cc dts/upstream/Bindings/mfd/syscon.yaml
Simple merge

diff --cc dts/upstream/Bindings/mips/mti,mips-cm.yaml
index 0000000,d129d63..d129d63
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mips/mti,mips-cm.yaml
+++ b/dts/upstream/Bindings/mips/mti,mips-cm.yaml

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

diff --cc dts/upstream/Bindings/mmc/amlogic,meson-mx-sdio.yaml
Simple merge

diff --cc dts/upstream/Bindings/mmc/atmel,hsmci.yaml
index 0000000,151b414..151b414
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mmc/atmel,hsmci.yaml
+++ b/dts/upstream/Bindings/mmc/atmel,hsmci.yaml

diff --cc dts/upstream/Bindings/mmc/fsl-imx-esdhc.yaml
Simple merge

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

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

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

diff --cc dts/upstream/Bindings/mmc/rockchip-dw-mshc.yaml
Simple merge

diff --cc dts/upstream/Bindings/mmc/samsung,exynos-dw-mshc.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/mtd/atmel,dataflash.yaml
index 0000000,8c72fa3..8c72fa3
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/mtd/atmel,dataflash.yaml
+++ b/dts/upstream/Bindings/mtd/atmel,dataflash.yaml

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

diff --cc dts/upstream/Bindings/mtd/mtd-physmap.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/net/airoha,en7581-eth.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/airoha,en7581-npu.yaml
index 0000000,76dd97c..76dd97c
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/airoha,en7581-npu.yaml
+++ b/dts/upstream/Bindings/net/airoha,en7581-npu.yaml

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

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

diff --cc dts/upstream/Bindings/net/bluetooth/qualcomm-bluetooth.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/can/fsl,flexcan.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/can/microchip,mcp2510.yaml
Simple merge

diff --cc dts/upstream/Bindings/net/can/microchip,mcp251xfd.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/ethernet-controller.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/net/fsl,gianfar-mdio.yaml
index 0000000,03c819b..03c819b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/fsl,gianfar-mdio.yaml
+++ b/dts/upstream/Bindings/net/fsl,gianfar-mdio.yaml

diff --cc dts/upstream/Bindings/net/fsl,gianfar.yaml
index 0000000,f92f284..f92f284
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/fsl,gianfar.yaml
+++ b/dts/upstream/Bindings/net/fsl,gianfar.yaml

diff --cc dts/upstream/Bindings/net/fsl-tsec-phy.txt
Simple merge

diff --cc dts/upstream/Bindings/net/ieee802154/ca8210.txt
Simple merge

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

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

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

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

diff --cc dts/upstream/Bindings/net/realtek,rtl9301-mdio.yaml
index 0000000,02e4e33..02e4e33
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/realtek,rtl9301-mdio.yaml
+++ b/dts/upstream/Bindings/net/realtek,rtl9301-mdio.yaml

diff --cc dts/upstream/Bindings/net/realtek,rtl9301-switch.yaml
Simple merge

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

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

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

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

diff --cc dts/upstream/Bindings/net/sophgo,sg2044-dwmac.yaml
index 0000000,4dd2dc9..4dd2dc9
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/sophgo,sg2044-dwmac.yaml
+++ b/dts/upstream/Bindings/net/sophgo,sg2044-dwmac.yaml

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

diff --cc dts/upstream/Bindings/net/tesla,fsd-ethqos.yaml
index 0000000,dd7481b..dd7481b
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/net/tesla,fsd-ethqos.yaml
+++ b/dts/upstream/Bindings/net/tesla,fsd-ethqos.yaml

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

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

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

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

diff --cc dts/upstream/Bindings/net/wireless/qcom,ath12k-wsi.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/nvmem/qcom,qfprom.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/pci/altr,pcie-root-port.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/amd,versal2-mdb-host.yaml
index 0000000,43dc258..43dc258
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/amd,versal2-mdb-host.yaml
+++ b/dts/upstream/Bindings/pci/amd,versal2-mdb-host.yaml

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

diff --cc dts/upstream/Bindings/pci/fsl,imx6q-pcie.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/fsl,layerscape-pcie-ep.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/fsl,mpc8xxx-pci.yaml
index 0000000,28759ab..28759ab
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/fsl,mpc8xxx-pci.yaml
+++ b/dts/upstream/Bindings/pci/fsl,mpc8xxx-pci.yaml

diff --cc dts/upstream/Bindings/pci/mediatek-pcie-gen3.yaml
Simple merge

diff --cc dts/upstream/Bindings/pci/pci-ep-bus.yaml
index 0000000,a2cd790..a2cd790
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pci/pci-ep-bus.yaml
+++ b/dts/upstream/Bindings/pci/pci-ep-bus.yaml

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

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

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

diff --cc dts/upstream/Bindings/pci/xilinx-versal-cpm.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/allwinner,sun50i-a64-usb-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/phy-rockchip-naneng-combphy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/qcom,ipq5332-uniphy-pcie-phy.yaml
index 0000000,e39168d..e39168d
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/qcom,ipq5332-uniphy-pcie-phy.yaml
+++ b/dts/upstream/Bindings/phy/qcom,ipq5332-uniphy-pcie-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-ufs-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/rockchip,rk3588-hdptx-phy.yaml
Simple merge

diff --cc dts/upstream/Bindings/phy/rockchip,rk3588-mipi-dcphy.yaml
index 0000000,c8ff5ba..c8ff5ba
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/phy/rockchip,rk3588-mipi-dcphy.yaml
+++ b/dts/upstream/Bindings/phy/rockchip,rk3588-mipi-dcphy.yaml

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

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

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

diff --cc dts/upstream/Bindings/pinctrl/allwinner,sun55i-a523-pinctrl.yaml
index 0000000,154e03d..154e03d
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/allwinner,sun55i-a523-pinctrl.yaml
+++ b/dts/upstream/Bindings/pinctrl/allwinner,sun55i-a523-pinctrl.yaml

diff --cc dts/upstream/Bindings/pinctrl/amlogic,pinctrl-a4.yaml
index 0000000,8eb50ca..8eb50ca
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/amlogic,pinctrl-a4.yaml
+++ b/dts/upstream/Bindings/pinctrl/amlogic,pinctrl-a4.yaml

diff --cc dts/upstream/Bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
Simple merge

diff --cc dts/upstream/Bindings/pinctrl/brcm,bcm21664-pinctrl.yaml
index 0000000,1283a58..1283a58
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/brcm,bcm21664-pinctrl.yaml
+++ b/dts/upstream/Bindings/pinctrl/brcm,bcm21664-pinctrl.yaml

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

diff --cc dts/upstream/Bindings/pinctrl/qcom,sa8775p-tlmm.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/pinctrl/samsung,pinctrl-wakeup-interrupt.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/pinctrl/sophgo,sg2042-pinctrl.yaml
index 0000000,924dfe1..924dfe1
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pinctrl/sophgo,sg2042-pinctrl.yaml
+++ b/dts/upstream/Bindings/pinctrl/sophgo,sg2042-pinctrl.yaml

diff --cc dts/upstream/Bindings/platform/huawei,gaokun-ec.yaml
index 0000000,4a03b0e..4a03b0e
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/platform/huawei,gaokun-ec.yaml
+++ b/dts/upstream/Bindings/platform/huawei,gaokun-ec.yaml

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

diff --cc dts/upstream/Bindings/power/apple,pmgr-pwrstate.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/qcom,kpss-acc-v2.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/reset/atmel,sama5d2-shdwc.yaml
Simple merge

diff --cc dts/upstream/Bindings/power/reset/xlnx,zynqmp-power.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/power/supply/maxim,max77705.yaml
index 0000000,bce7fab..bce7fab
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/power/supply/maxim,max77705.yaml
+++ b/dts/upstream/Bindings/power/supply/maxim,max77705.yaml

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

diff --cc dts/upstream/Bindings/power/wakeup-source.txt
Simple merge

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

diff --cc dts/upstream/Bindings/pwm/imx-tpm-pwm.yaml
Simple merge

diff --cc dts/upstream/Bindings/pwm/pwm-nexus-node.yaml
index 0000000,3b40e27..3b40e27
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pwm/pwm-nexus-node.yaml
+++ b/dts/upstream/Bindings/pwm/pwm-nexus-node.yaml

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

diff --cc dts/upstream/Bindings/pwm/renesas,tpu-pwm.yaml
Simple merge

diff --cc dts/upstream/Bindings/pwm/sophgo,sg2042-pwm.yaml
index 0000000,bbb6326..bbb6326
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/pwm/sophgo,sg2042-pwm.yaml
+++ b/dts/upstream/Bindings/pwm/sophgo,sg2042-pwm.yaml

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

diff --cc dts/upstream/Bindings/regulator/richtek,rtq2208.yaml
Simple merge

diff --cc dts/upstream/Bindings/regulator/samsung,s2mpu05.yaml
index 0000000,378518a..378518a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/regulator/samsung,s2mpu05.yaml
+++ b/dts/upstream/Bindings/regulator/samsung,s2mpu05.yaml

diff --cc dts/upstream/Bindings/regulator/ti,tps65219.yaml
Simple merge

diff --cc dts/upstream/Bindings/remoteproc/qcom,msm8916-mss-pil.yaml
Simple merge

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

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

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

diff --cc dts/upstream/Bindings/remoteproc/qcom,wcnss-pil.yaml
Simple merge

diff --cc dts/upstream/Bindings/reset/atmel,at91sam9260-reset.yaml
Simple merge

diff --cc dts/upstream/Bindings/reset/xlnx,zynqmp-reset.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/rng/rockchip,rk3588-rng.yaml
index 0000000,ca71b40..ca71b40
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/rng/rockchip,rk3588-rng.yaml
+++ b/dts/upstream/Bindings/rng/rockchip,rk3588-rng.yaml

diff --cc dts/upstream/Bindings/rtc/adi,max31335.yaml
Simple merge

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

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

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

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

diff --cc dts/upstream/Bindings/serial/nvidia,tegra264-utc.yaml
index 0000000,572cc57..572cc57
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/serial/nvidia,tegra264-utc.yaml
+++ b/dts/upstream/Bindings/serial/nvidia,tegra264-utc.yaml

diff --cc dts/upstream/Bindings/serial/pl011.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/serial/sprd-uart.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/fsl/fsl,ls1028a-reset.yaml
Simple merge

diff --cc dts/upstream/Bindings/soc/imx/fsl,aips-bus.yaml
Simple merge

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

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

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

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/exynos-usi.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/sound/allwinner,sun4i-a10-codec.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/atmel,at91-ssc.yaml
index 0000000,a05e614..a05e614
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/atmel,at91-ssc.yaml
+++ b/dts/upstream/Bindings/sound/atmel,at91-ssc.yaml

diff --cc dts/upstream/Bindings/sound/atmel,at91sam9g20ek-wm8731.yaml
index 0000000,627da2d..627da2d
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/atmel,at91sam9g20ek-wm8731.yaml
+++ b/dts/upstream/Bindings/sound/atmel,at91sam9g20ek-wm8731.yaml

diff --cc dts/upstream/Bindings/sound/audio-graph-card2.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/awinic,aw88395.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/dmic-codec.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/everest,es8328.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/sound/fsl,imx-asrc.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/fsl,imx95-cm7-sof.yaml
index 0000000,f00ae32..f00ae32
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/fsl,imx95-cm7-sof.yaml
+++ b/dts/upstream/Bindings/sound/fsl,imx95-cm7-sof.yaml

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

diff --cc dts/upstream/Bindings/sound/fsl,sof-cpu.yaml
index 0000000,3186393..3186393
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/fsl,sof-cpu.yaml
+++ b/dts/upstream/Bindings/sound/fsl,sof-cpu.yaml

diff --cc dts/upstream/Bindings/sound/imx-audio-card.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/invensense,ics43432.yaml
index 0000000,7bd9848..7bd9848
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/invensense,ics43432.yaml
+++ b/dts/upstream/Bindings/sound/invensense,ics43432.yaml

diff --cc dts/upstream/Bindings/sound/mediatek,mt8188-mt6359.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/nvidia,tegra30-hda.yaml
Simple merge

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

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

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

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

diff --cc dts/upstream/Bindings/sound/wlf,wm8904.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/wlf,wm8960.yaml
Simple merge

diff --cc dts/upstream/Bindings/sound/xlnx,audio-formatter.yaml
index 0000000,82fa448..82fa448
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/xlnx,audio-formatter.yaml
+++ b/dts/upstream/Bindings/sound/xlnx,audio-formatter.yaml

diff --cc dts/upstream/Bindings/sound/xlnx,i2s.yaml
index 0000000,3c2b0be..3c2b0be
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/xlnx,i2s.yaml
+++ b/dts/upstream/Bindings/sound/xlnx,i2s.yaml

diff --cc dts/upstream/Bindings/sound/xlnx,spdif.yaml
index 0000000,a45d8a0..a45d8a0
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/sound/xlnx,spdif.yaml
+++ b/dts/upstream/Bindings/sound/xlnx,spdif.yaml

diff --cc dts/upstream/Bindings/spi/adi,axi-spi-engine.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/cdns,qspi-nor.yaml
Simple merge

diff --cc dts/upstream/Bindings/spi/fsl,espi.yaml
index 0000000,d267bbf..d267bbf
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/spi/fsl,espi.yaml
+++ b/dts/upstream/Bindings/spi/fsl,espi.yaml

diff --cc dts/upstream/Bindings/spi/fsl,spi.yaml
index 0000000,d74792f..d74792f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/spi/fsl,spi.yaml
+++ b/dts/upstream/Bindings/spi/fsl,spi.yaml

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

diff --cc dts/upstream/Bindings/spi/qcom,spi-qpic-snand.yaml
index 0000000,aa3f933..aa3f933
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/spi/qcom,spi-qpic-snand.yaml
+++ b/dts/upstream/Bindings/spi/qcom,spi-qpic-snand.yaml

diff --cc dts/upstream/Bindings/spi/snps,dw-apb-ssi.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/spi/spi-sg2044-nor.yaml
index 0000000,948ff7a..948ff7a
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/spi/spi-sg2044-nor.yaml
+++ b/dts/upstream/Bindings/spi/spi-sg2044-nor.yaml

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

diff --cc dts/upstream/Bindings/spi/st,stm32mp25-ospi.yaml
index 0000000,5f276f2..5f276f2
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/spi/st,stm32mp25-ospi.yaml
+++ b/dts/upstream/Bindings/spi/st,stm32mp25-ospi.yaml

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

diff --cc dts/upstream/Bindings/thermal/allwinner,sun8i-a83t-ths.yaml
Simple merge

diff --cc dts/upstream/Bindings/thermal/brcm,avs-tmon.yaml
Simple merge

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

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

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

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

diff --cc dts/upstream/Bindings/timer/arm,twd-timer.yaml
Simple merge

diff --cc dts/upstream/Bindings/timer/nxp,sysctr-timer.yaml
Simple merge

diff --cc dts/upstream/Bindings/timer/renesas,cmt.yaml
Simple merge

diff --cc dts/upstream/Bindings/timer/renesas,em-sti.yaml
Simple merge

diff --cc dts/upstream/Bindings/timer/renesas,mtu2.yaml
Simple merge

diff --cc dts/upstream/Bindings/timer/renesas,ostm.yaml
Simple merge

diff --cc dts/upstream/Bindings/timer/renesas,tmu.yaml
Simple merge

diff --cc dts/upstream/Bindings/timer/samsung,exynos4210-mct.yaml
Simple merge

diff --cc dts/upstream/Bindings/timer/sifive,clint.yaml
Simple merge

diff --cc dts/upstream/Bindings/trigger-source/pwm-trigger.yaml
index 0000000,1eac200..1eac200
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/trigger-source/pwm-trigger.yaml
+++ b/dts/upstream/Bindings/trigger-source/pwm-trigger.yaml

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

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

diff --cc dts/upstream/Bindings/ufs/rockchip,rk3576-ufshc.yaml
index 0000000,c7d17cf..c7d17cf
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/ufs/rockchip,rk3576-ufshc.yaml
+++ b/dts/upstream/Bindings/ufs/rockchip,rk3576-ufshc.yaml

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

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

diff --cc dts/upstream/Bindings/usb/mediatek,mtk-xhci.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/usb/microchip,usb2514.yaml
Simple merge

diff --cc dts/upstream/Bindings/usb/microchip,usb5744.yaml
Simple merge

diff --cc dts/upstream/Bindings/usb/parade,ps8830.yaml
index 0000000,935d57f..935d57f
mode 000000,100644..100644
--- /dev/null
--- 2/Bindings/usb/parade,ps8830.yaml
+++ b/dts/upstream/Bindings/usb/parade,ps8830.yaml

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

diff --cc dts/upstream/Bindings/usb/richtek,rt1711h.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/usb/samsung,exynos-dwc3.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/usb/xlnx,usb2.yaml
Simple merge

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

diff --cc dts/upstream/Bindings/watchdog/allwinner,sun4i-a10-wdt.yaml
Simple merge

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

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

diff --cc dts/upstream/Bindings/xilinx.txt
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/mediatek,mt8188-clk.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/mediatek,mtmips-sysc.h
index 0000000,a03335b..a03335b
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/mediatek,mtmips-sysc.h
+++ b/dts/upstream/include/dt-bindings/clock/mediatek,mtmips-sysc.h

diff --cc dts/upstream/include/dt-bindings/clock/qcom,dsi-phy-28nm.h
index 0000000,ab94d58..ab94d58
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,dsi-phy-28nm.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,dsi-phy-28nm.h

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

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

diff --cc dts/upstream/include/dt-bindings/clock/qcom,ipq9574-nsscc.h
index 0000000,21a16dc..21a16dc
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/qcom,ipq9574-nsscc.h
+++ b/dts/upstream/include/dt-bindings/clock/qcom,ipq9574-nsscc.h

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

diff --cc dts/upstream/include/dt-bindings/clock/rk3188-cru-common.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/rockchip,rk3562-cru.h
index 0000000,a5b0b15..a5b0b15
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/rockchip,rk3562-cru.h
+++ b/dts/upstream/include/dt-bindings/clock/rockchip,rk3562-cru.h

diff --cc dts/upstream/include/dt-bindings/clock/rockchip,rk3576-cru.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/samsung,exynos2200-cmu.h
index 0000000,310552b..310552b
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/samsung,exynos2200-cmu.h
+++ b/dts/upstream/include/dt-bindings/clock/samsung,exynos2200-cmu.h

diff --cc dts/upstream/include/dt-bindings/clock/samsung,exynos7870-cmu.h
index 0000000,57d04bb..57d04bb
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/samsung,exynos7870-cmu.h
+++ b/dts/upstream/include/dt-bindings/clock/samsung,exynos7870-cmu.h

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

diff --cc dts/upstream/include/dt-bindings/clock/sun50i-h616-ccu.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/clock/sun55i-a523-ccu.h
index 0000000,c8259ac..c8259ac
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/sun55i-a523-ccu.h
+++ b/dts/upstream/include/dt-bindings/clock/sun55i-a523-ccu.h

diff --cc dts/upstream/include/dt-bindings/clock/sun55i-a523-r-ccu.h
index 0000000,3656474..3656474
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/clock/sun55i-a523-r-ccu.h
+++ b/dts/upstream/include/dt-bindings/clock/sun55i-a523-r-ccu.h

diff --cc dts/upstream/include/dt-bindings/clock/xlnx-zynqmp-clk.h
index cdc4c0b,0000000..f0f7ddd
mode 100644,000000..100644
--- 1/dts/upstream/include/dt-bindings/clock/xlnx-zynqmp-clk.h
--- /dev/null
+++ b/dts/upstream/include/dt-bindings/clock/xlnx-zynqmp-clk.h
@@@ -1,126 -1,0 +1,133 @@@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +/*
 + * Xilinx Zynq MPSoC Firmware layer
 + *
 + *  Copyright (C) 2014-2018 Xilinx, Inc.
 + *
 + */
 +
 +#ifndef _DT_BINDINGS_CLK_ZYNQMP_H
 +#define _DT_BINDINGS_CLK_ZYNQMP_H
 +
++/*
++ * These bindings are deprecated, because they do not match the actual
++ * concept of bindings but rather contain pure firmware values.
++ * Instead include the header in the DTS source directory.
++ */
++#warning "These bindings are deprecated. Instead use the header in the DTS source directory."
++
 +#define IOPLL                 0
 +#define RPLL                  1
 +#define APLL                  2
 +#define DPLL                  3
 +#define VPLL                  4
 +#define IOPLL_TO_FPD          5
 +#define RPLL_TO_FPD           6
 +#define APLL_TO_LPD           7
 +#define DPLL_TO_LPD           8
 +#define VPLL_TO_LPD           9
 +#define ACPU                  10
 +#define ACPU_HALF             11
 +#define DBF_FPD                       12
 +#define DBF_LPD                       13
 +#define DBG_TRACE             14
 +#define DBG_TSTMP             15
 +#define DP_VIDEO_REF          16
 +#define DP_AUDIO_REF          17
 +#define DP_STC_REF            18
 +#define GDMA_REF              19
 +#define DPDMA_REF             20
 +#define DDR_REF                       21
 +#define SATA_REF              22
 +#define PCIE_REF              23
 +#define GPU_REF                       24
 +#define GPU_PP0_REF           25
 +#define GPU_PP1_REF           26
 +#define TOPSW_MAIN            27
 +#define TOPSW_LSBUS           28
 +#define GTGREF0_REF           29
 +#define LPD_SWITCH            30
 +#define LPD_LSBUS             31
 +#define USB0_BUS_REF          32
 +#define USB1_BUS_REF          33
 +#define USB3_DUAL_REF         34
 +#define USB0                  35
 +#define USB1                  36
 +#define CPU_R5                        37
 +#define CPU_R5_CORE           38
 +#define CSU_SPB                       39
 +#define CSU_PLL                       40
 +#define PCAP                  41
 +#define IOU_SWITCH            42
 +#define GEM_TSU_REF           43
 +#define GEM_TSU                       44
 +#define GEM0_TX                       45
 +#define GEM1_TX                       46
 +#define GEM2_TX                       47
 +#define GEM3_TX                       48
 +#define GEM0_RX                       49
 +#define GEM1_RX                       50
 +#define GEM2_RX                       51
 +#define GEM3_RX                       52
 +#define QSPI_REF              53
 +#define SDIO0_REF             54
 +#define SDIO1_REF             55
 +#define UART0_REF             56
 +#define UART1_REF             57
 +#define SPI0_REF              58
 +#define SPI1_REF              59
 +#define NAND_REF              60
 +#define I2C0_REF              61
 +#define I2C1_REF              62
 +#define CAN0_REF              63
 +#define CAN1_REF              64
 +#define CAN0                  65
 +#define CAN1                  66
 +#define DLL_REF                       67
 +#define ADMA_REF              68
 +#define TIMESTAMP_REF         69
 +#define AMS_REF                       70
 +#define PL0_REF                       71
 +#define PL1_REF                       72
 +#define PL2_REF                       73
 +#define PL3_REF                       74
 +#define WDT                   75
 +#define IOPLL_INT             76
 +#define IOPLL_PRE_SRC         77
 +#define IOPLL_HALF            78
 +#define IOPLL_INT_MUX         79
 +#define IOPLL_POST_SRC                80
 +#define RPLL_INT              81
 +#define RPLL_PRE_SRC          82
 +#define RPLL_HALF             83
 +#define RPLL_INT_MUX          84
 +#define RPLL_POST_SRC         85
 +#define APLL_INT              86
 +#define APLL_PRE_SRC          87
 +#define APLL_HALF             88
 +#define APLL_INT_MUX          89
 +#define APLL_POST_SRC         90
 +#define DPLL_INT              91
 +#define DPLL_PRE_SRC          92
 +#define DPLL_HALF             93
 +#define DPLL_INT_MUX          94
 +#define DPLL_POST_SRC         95
 +#define VPLL_INT              96
 +#define VPLL_PRE_SRC          97
 +#define VPLL_HALF             98
 +#define VPLL_INT_MUX          99
 +#define VPLL_POST_SRC         100
 +#define CAN0_MIO              101
 +#define CAN1_MIO              102
 +#define ACPU_FULL             103
 +#define GEM0_REF              104
 +#define GEM1_REF              105
 +#define GEM2_REF              106
 +#define GEM3_REF              107
 +#define GEM0_REF_UNG          108
 +#define GEM1_REF_UNG          109
 +#define GEM2_REF_UNG          110
 +#define GEM3_REF_UNG          111
 +#define LPD_WDT                       112
 +
 +#endif

diff --cc dts/upstream/include/dt-bindings/iio/adc/adi,ad4695.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/pinctrl/amlogic,pinctrl.h
index 0000000,7d40aec..7d40aec
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/pinctrl/amlogic,pinctrl.h
+++ b/dts/upstream/include/dt-bindings/pinctrl/amlogic,pinctrl.h

diff --cc dts/upstream/include/dt-bindings/pinctrl/pinctrl-sg2042.h
index 0000000,79d5bb8..79d5bb8
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/pinctrl/pinctrl-sg2042.h
+++ b/dts/upstream/include/dt-bindings/pinctrl/pinctrl-sg2042.h

diff --cc dts/upstream/include/dt-bindings/pinctrl/pinctrl-sg2044.h
index 0000000,2a619f6..2a619f6
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/pinctrl/pinctrl-sg2044.h
+++ b/dts/upstream/include/dt-bindings/pinctrl/pinctrl-sg2044.h

diff --cc dts/upstream/include/dt-bindings/power/allwinner,sun8i-v853-ppu.h
index 0000000,b1c18a4..b1c18a4
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/power/allwinner,sun8i-v853-ppu.h
+++ b/dts/upstream/include/dt-bindings/power/allwinner,sun8i-v853-ppu.h

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

diff --cc dts/upstream/include/dt-bindings/power/thead,th1520-power.h
index 0000000,8395bd1..8395bd1
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/power/thead,th1520-power.h
+++ b/dts/upstream/include/dt-bindings/power/thead,th1520-power.h

diff --cc dts/upstream/include/dt-bindings/reset/imx8mp-reset-audiomix.h
index 0000000,746c133..746c133
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/reset/imx8mp-reset-audiomix.h
+++ b/dts/upstream/include/dt-bindings/reset/imx8mp-reset-audiomix.h

diff --cc dts/upstream/include/dt-bindings/reset/qcom,ipq9574-nsscc.h
index 0000000,7f152e9..7f152e9
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/reset/qcom,ipq9574-nsscc.h
+++ b/dts/upstream/include/dt-bindings/reset/qcom,ipq9574-nsscc.h

diff --cc dts/upstream/include/dt-bindings/reset/rockchip,rk3562-cru.h
index 0000000,8df9511..8df9511
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/reset/rockchip,rk3562-cru.h
+++ b/dts/upstream/include/dt-bindings/reset/rockchip,rk3562-cru.h

diff --cc dts/upstream/include/dt-bindings/reset/rockchip,rk3588-cru.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/reset/sun50i-h616-ccu.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/reset/sun55i-a523-ccu.h
index 0000000,70df503..70df503
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/reset/sun55i-a523-ccu.h
+++ b/dts/upstream/include/dt-bindings/reset/sun55i-a523-ccu.h

diff --cc dts/upstream/include/dt-bindings/reset/sun55i-a523-r-ccu.h
index 0000000,dd6fbb3..dd6fbb3
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/reset/sun55i-a523-r-ccu.h
+++ b/dts/upstream/include/dt-bindings/reset/sun55i-a523-r-ccu.h

diff --cc dts/upstream/include/dt-bindings/soc/samsung,exynos-usi.h
Simple merge

diff --cc dts/upstream/include/dt-bindings/sound/qcom,wcd934x.h
index 0000000,8b30d34..8b30d34
mode 000000,100644..100644
--- /dev/null
--- 2/include/dt-bindings/sound/qcom,wcd934x.h
+++ b/dts/upstream/include/dt-bindings/sound/qcom,wcd934x.h

diff --cc dts/upstream/src/arm/allwinner/sun8i-v3s-netcube-kumquat.dts
index 0000000,5143cb4..5143cb4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/allwinner/sun8i-v3s-netcube-kumquat.dts
+++ b/dts/upstream/src/arm/allwinner/sun8i-v3s-netcube-kumquat.dts

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

diff --cc dts/upstream/src/arm/amlogic/meson8.dtsi
Simple merge

diff --cc dts/upstream/src/arm/amlogic/meson8b-ec100.dts
Simple merge

diff --cc dts/upstream/src/arm/amlogic/meson8b-mxq.dts
Simple merge

diff --cc dts/upstream/src/arm/amlogic/meson8b-odroidc1.dts
Simple merge

diff --cc dts/upstream/src/arm/amlogic/meson8b.dtsi
Simple merge

diff --cc dts/upstream/src/arm/cirrus/ep7211-edb7211.dts
Simple merge

diff --cc dts/upstream/src/arm/intel/ixp/intel-ixp42x-netgear-wg302v1.dts
Simple merge

diff --cc dts/upstream/src/arm/intel/ixp/intel-ixp4xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm/marvell/armada-385-clearfog-gtr.dtsi
Simple merge

diff --cc dts/upstream/src/arm/marvell/armada-388-clearfog-base.dts
Simple merge

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

diff --cc dts/upstream/src/arm/microchip/aks-cdu.dts
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc dts/upstream/src/arm/microchip/at91-sama5d4ek.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/at91-vinco.dts
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc dts/upstream/src/arm/microchip/evk-pro3.dts
Simple merge

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

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

diff --cc dts/upstream/src/arm/microchip/sam9x60.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/sama5d3xmb.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/tny_a9260.dts
Simple merge

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

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

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

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

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

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

diff --cc dts/upstream/src/arm/microchip/usb_a9g20-dab-mmx.dtsi
Simple merge

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

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

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

diff --cc dts/upstream/src/arm/nvidia/tegra114.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nvidia/tegra124.dtsi
Simple merge

diff --cc dts/upstream/src/arm/nvidia/tegra20-asus-tf101.dts
Simple merge

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

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

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

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

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

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

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-colibri-v1.2-aster.dts
index 0000000,44c78c0..44c78c0
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6dl-colibri-v1.2-aster.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6dl-colibri-v1.2-aster.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts
index 0000000,93fd0af..93fd0af
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6dl-colibri-v1.2-eval-v3.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts
index 0000000,92d41fc..92d41fc
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6dl-colibri-v1.2-iris-v2.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6dl-colibri-v1.2-iris.dts
index 0000000,c895794..c895794
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6dl-colibri-v1.2-iris.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6dl-colibri-v1.2-iris.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts
index 0000000,908dab5..908dab5
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-eval-v1.2.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-eval.dts
index 0000000,5463d41..5463d41
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6q-apalis-v1.2-eval.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-eval.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts
index 0000000,84eabf8..84eabf8
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-ixora-v1.1.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts
index 0000000,d7cfab4..d7cfab4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-ixora-v1.2.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-ixora.dts
index 0000000,189b074..189b074
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6q-apalis-v1.2-ixora.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6q-apalis-v1.2-ixora.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-apalis-v1.2.dtsi
index 0000000,83fa04f..83fa04f
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6qdl-apalis-v1.2.dtsi
+++ b/dts/upstream/src/arm/nxp/imx/imx6qdl-apalis-v1.2.dtsi

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

diff --cc dts/upstream/src/arm/nxp/imx/imx6qdl-colibri-v1.2.dtsi
index 0000000,d11bf91..d11bf91
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6qdl-colibri-v1.2.dtsi
+++ b/dts/upstream/src/arm/nxp/imx/imx6qdl-colibri-v1.2.dtsi

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

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

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

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

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

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-14x14-evk.dtsi
Simple merge

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

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

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts
Simple merge

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

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-var-som-concerto.dts
index 0000000,9ff3b37..9ff3b37
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6ul-var-som-concerto.dts
+++ b/dts/upstream/src/arm/nxp/imx/imx6ul-var-som-concerto.dts

diff --cc dts/upstream/src/arm/nxp/imx/imx6ul-var-som.dtsi
index 0000000,4e536e0..4e536e0
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/imx/imx6ul-var-som.dtsi
+++ b/dts/upstream/src/arm/nxp/imx/imx6ul-var-som.dtsi

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

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

diff --cc dts/upstream/src/arm/nxp/imx/imx7d-sdb.dts
Simple merge

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

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

diff --cc dts/upstream/src/arm/nxp/mxs/imx28-btt3-0.dts
index 0000000,6ac46e4..6ac46e4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/mxs/imx28-btt3-0.dts
+++ b/dts/upstream/src/arm/nxp/mxs/imx28-btt3-0.dts

diff --cc dts/upstream/src/arm/nxp/mxs/imx28-btt3-1.dts
index 0000000,213fe93..213fe93
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/mxs/imx28-btt3-1.dts
+++ b/dts/upstream/src/arm/nxp/mxs/imx28-btt3-1.dts

diff --cc dts/upstream/src/arm/nxp/mxs/imx28-btt3-2.dts
index 0000000,4bccd78..4bccd78
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/mxs/imx28-btt3-2.dts
+++ b/dts/upstream/src/arm/nxp/mxs/imx28-btt3-2.dts

diff --cc dts/upstream/src/arm/nxp/mxs/imx28-btt3.dtsi
index 0000000,2c52e67..2c52e67
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/nxp/mxs/imx28-btt3.dtsi
+++ b/dts/upstream/src/arm/nxp/mxs/imx28-btt3.dtsi

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

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

diff --cc dts/upstream/src/arm/nxp/vf/vf610-colibri.dtsi
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/vfxxx.dtsi
Simple merge

diff --cc dts/upstream/src/arm/renesas/r8a7790-lager.dts
Simple merge

diff --cc dts/upstream/src/arm/renesas/r8a7790-stout.dts
Simple merge

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

diff --cc dts/upstream/src/arm/renesas/r8a7791-koelsch.dts
Simple merge

diff --cc dts/upstream/src/arm/renesas/r8a7791-porter.dts
Simple merge

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

diff --cc dts/upstream/src/arm/renesas/r8a7792-blanche.dts
Simple merge

diff --cc dts/upstream/src/arm/renesas/r8a7792-wheat.dts
Simple merge

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

diff --cc dts/upstream/src/arm/renesas/r8a7793-gose.dts
Simple merge

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

diff --cc dts/upstream/src/arm/renesas/r8a7794-alt.dts
Simple merge

diff --cc dts/upstream/src/arm/renesas/r8a7794-silk.dts
Simple merge

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

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

diff --cc dts/upstream/src/arm/st/stm32f746-disco.dts
Simple merge

diff --cc dts/upstream/src/arm/st/stm32f769-disco.dts
Simple merge

diff --cc dts/upstream/src/arm/st/stm32mp131.dtsi
Simple merge

diff --cc dts/upstream/src/arm/st/stm32mp133c-prihmb.dts
index 0000000,663b6de..663b6de
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/st/stm32mp133c-prihmb.dts
+++ b/dts/upstream/src/arm/st/stm32mp133c-prihmb.dts

diff --cc dts/upstream/src/arm/st/stm32mp135f-dhcor-dhsbc.dts
Simple merge

diff --cc dts/upstream/src/arm/st/stm32mp15-pinctrl.dtsi
Simple merge

diff --cc dts/upstream/src/arm/st/stm32mp151.dtsi
Simple merge

diff --cc dts/upstream/src/arm/st/stm32mp151c-plyaqm.dts
index 0000000,39a3211..39a3211
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/st/stm32mp151c-plyaqm.dts
+++ b/dts/upstream/src/arm/st/stm32mp151c-plyaqm.dts

diff --cc dts/upstream/src/arm/st/stm32mp153c-lxa-fairytux2-gen1.dts
index 0000000,3a0e842..3a0e842
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/st/stm32mp153c-lxa-fairytux2-gen1.dts
+++ b/dts/upstream/src/arm/st/stm32mp153c-lxa-fairytux2-gen1.dts

diff --cc dts/upstream/src/arm/st/stm32mp153c-lxa-fairytux2-gen2.dts
index 0000000,66e6da9..66e6da9
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/st/stm32mp153c-lxa-fairytux2-gen2.dts
+++ b/dts/upstream/src/arm/st/stm32mp153c-lxa-fairytux2-gen2.dts

diff --cc dts/upstream/src/arm/st/stm32mp153c-lxa-fairytux2.dtsi
index 0000000,9eeb9d6..9eeb9d6
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm/st/stm32mp153c-lxa-fairytux2.dtsi
+++ b/dts/upstream/src/arm/st/stm32mp153c-lxa-fairytux2.dtsi

diff --cc dts/upstream/src/arm/st/stm32mp157c-dk2.dts
Simple merge

diff --cc dts/upstream/src/arm/ti/davinci/da850-lego-ev3.dts
Simple merge

diff --cc dts/upstream/src/arm/ti/omap/omap3-evm-processor-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm/ti/omap/omap4-l4.dtsi
Simple merge

diff --cc dts/upstream/src/arm/ti/omap/omap4-panda-a4.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-7000.dtsi
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-cc108.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-ebaz4205.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-microzed.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-parallella.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-zc702.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-zc706.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-zc770-xm010.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-zc770-xm011.dts
index 56732e8,0000000..f9a086f
mode 100644,000000..100644
--- 1/dts/upstream/src/arm/xilinx/zynq-zc770-xm011.dts
--- /dev/null
+++ b/dts/upstream/src/arm/xilinx/zynq-zc770-xm011.dts
@@@ -1,64 -1,0 +1,95 @@@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Xilinx ZC770 XM011 board DTS
 + *
 + * Copyright (C) 2013-2018 Xilinx, Inc.
 + */
 +/dts-v1/;
 +#include "zynq-7000.dtsi"
 +
 +/ {
 +      model = "Xilinx ZC770 XM011 board";
 +      compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
 +
 +      aliases {
 +              i2c0 = &i2c1;
 +              serial0 = &uart1;
 +              spi0 = &spi0;
 +      };
 +
 +      chosen {
 +              bootargs = "";
 +              stdout-path = "serial0:115200n8";
 +      };
 +
 +      memory@0 {
 +              device_type = "memory";
 +              reg = <0x0 0x40000000>;
 +      };
 +
 +      usb_phy1: phy1 {
 +              compatible = "usb-nop-xceiv";
 +              #phy-cells = <0>;
 +      };
 +};
 +
 +&can0 {
 +      status = "okay";
 +};
 +
 +&i2c1 {
 +      status = "okay";
 +      clock-frequency = <400000>;
 +
 +      eeprom: eeprom@52 {
 +              compatible = "atmel,24c02";
 +              reg = <0x52>;
 +      };
 +};
 +
++&nfc0 {
++      status = "okay";
++      #address-cells = <1>;
++      #size-cells = <0>;
++      nand@0 {
++              reg = <0>;
++              partitions {
++                      compatible = "fixed-partitions";
++                      #address-cells = <1>;
++                      #size-cells = <1>;
++                      partition@0 {
++                              label = "nand-fsbl-uboot";
++                              reg = <0x0 0x1000000>;
++                      };
++                      partition@1000000 {
++                              label = "nand-linux";
++                              reg = <0x1000000 0x2000000>;
++                      };
++                      partition@3000000 {
++                              label = "nand-rootfs";
++                              reg = <0x3000000 0x200000>;
++                      };
++              };
++      };
++};
++
++&smcc {
++      status = "okay";
++};
++
 +&spi0 {
 +      status = "okay";
 +      num-cs = <4>;
 +      is-decoded-cs = <0>;
 +};
 +
 +&uart1 {
++      bootph-all;
 +      status = "okay";
 +};
 +
 +&usb1 {
 +      status = "okay";
 +      dr_mode = "host";
 +      usb-phy = <&usb_phy1>;
 +};

diff --cc dts/upstream/src/arm/xilinx/zynq-zc770-xm012.dts
index d2359b7,0000000..24520e7
mode 100644,000000..100644
--- 1/dts/upstream/src/arm/xilinx/zynq-zc770-xm012.dts
--- /dev/null
+++ b/dts/upstream/src/arm/xilinx/zynq-zc770-xm012.dts
@@@ -1,64 -1,0 +1,99 @@@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Xilinx ZC770 XM012 board DTS
 + *
 + * Copyright (C) 2013-2018 Xilinx, Inc.
 + */
 +/dts-v1/;
 +#include "zynq-7000.dtsi"
 +
 +/ {
 +      model = "Xilinx ZC770 XM012 board";
 +      compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
 +
 +      aliases {
 +              i2c0 = &i2c0;
 +              i2c1 = &i2c1;
 +              serial0 = &uart1;
 +              spi0 = &spi1;
 +      };
 +
 +      chosen {
 +              bootargs = "";
 +              stdout-path = "serial0:115200n8";
 +      };
 +
 +      memory@0 {
 +              device_type = "memory";
 +              reg = <0x0 0x40000000>;
 +      };
 +};
 +
 +&can1 {
 +      status = "okay";
 +};
 +
 +&i2c0 {
 +      status = "okay";
 +      clock-frequency = <400000>;
 +
 +      eeprom0: eeprom@52 {
 +              compatible = "atmel,24c02";
 +              reg = <0x52>;
 +      };
 +};
 +
 +&i2c1 {
 +      status = "okay";
 +      clock-frequency = <400000>;
 +
 +      eeprom1: eeprom@52 {
 +              compatible = "atmel,24c02";
 +              reg = <0x52>;
 +      };
 +};
 +
++&nor0 {
++      status = "okay";
++      bank-width = <1>;
++      partitions {
++              compatible = "fixed-partitions";
++              #address-cells = <1>;
++              #size-cells = <1>;
++              partition@0 {
++                      label = "nor-fsbl-uboot";
++                      reg = <0x0 0x100000>;
++              };
++              partition@100000 {
++                      label = "nor-linux";
++                      reg = <0x100000 0x500000>;
++              };
++              partition@600000 {
++                      label = "nor-device-tree";
++                      reg = <0x600000 0x20000>;
++              };
++              partition@620000 {
++                      label = "nor-rootfs";
++                      reg = <0x620000 0x5e0000>;
++              };
++              partition@c00000 {
++                      label = "nor-bitstream";
++                      reg = <0xc00000 0x400000>;
++              };
++      };
++};
++
++&smcc {
++      status = "okay";
++};
++
 +&spi1 {
 +      status = "okay";
 +      num-cs = <4>;
 +      is-decoded-cs = <0>;
 +};
 +
 +&uart1 {
++      bootph-all;
 +      status = "okay";
 +};

diff --cc dts/upstream/src/arm/xilinx/zynq-zc770-xm013.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-zed.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-zturn-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-zybo-z7.dts
Simple merge

diff --cc dts/upstream/src/arm/xilinx/zynq-zybo.dts
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-allwinner-perf1.dts
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun50i-a100-cpu-opp.dtsi
index 0000000,c6a2efa..c6a2efa
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/allwinner/sun50i-a100-cpu-opp.dtsi
+++ b/dts/upstream/src/arm64/allwinner/sun50i-a100-cpu-opp.dtsi

diff --cc dts/upstream/src/arm64/allwinner/sun50i-a100.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun50i-h6-beelink-gs1.dts
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun50i-h6-orangepi-3.dts
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun50i-h6-orangepi.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun50i-h700-anbernic-rg35xx-2024.dts
Simple merge

diff --cc dts/upstream/src/arm64/allwinner/sun50i-h700-anbernic-rg35xx-h.dts
Simple merge

diff --cc dts/upstream/src/arm64/amazon/alpine-v2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amazon/alpine-v3.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amd/amd-overdrive-rev-b0.dts
Simple merge

diff --cc dts/upstream/src/arm64/amd/amd-overdrive-rev-b1.dts
Simple merge

diff --cc dts/upstream/src/arm64/amd/amd-seattle-clks.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amd/amd-seattle-soc.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amd/amd-seattle-xgbe-b.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/amlogic-a4.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/amlogic-a5.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-axg.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12a-fbx8am.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12a-radxa-zero.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12a-sei510.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12a-u200.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12a-x96-max.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-g12b-bananapi-cm4.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12b-bananapi.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12b-dreambox.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12b-khadas-vim3.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12b-odroid.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12b-radxa-zero2.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-g12b-w400.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gx-libretech-pc.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gx-p23x-q20x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxbb-nanopi-k2.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxbb-nexbox-a95x.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxbb-p20x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxbb-vega-s95.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxbb-wetek.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxbb.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxl-s805x-p241.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxl-s905x-hwacom-amazetv.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxl-s905x-khadas-vim.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxl-s905x-nexbox-a95x.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxl-s905x-p212.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxl.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxm-khadas-vim2.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-gxm-rbox-pro.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-libretech-cottonwood.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-sm1-ac2xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-sm1-bananapi.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-sm1-khadas-vim3l.dts
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-sm1-odroid.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/amlogic/meson-sm1-sei610.dts
Simple merge

diff --cc dts/upstream/src/arm64/apple/s5l8960x-5s.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s5l8960x-air1.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s5l8960x-mini2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s5l8960x-opp.dtsi
index 0000000,e4d568c..e4d568c
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/s5l8960x-opp.dtsi
+++ b/dts/upstream/src/arm64/apple/s5l8960x-opp.dtsi

diff --cc dts/upstream/src/arm64/apple/s5l8960x-pmgr.dtsi
index 0000000,da265f4..da265f4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/s5l8960x-pmgr.dtsi
+++ b/dts/upstream/src/arm64/apple/s5l8960x-pmgr.dtsi

diff --cc dts/upstream/src/arm64/apple/s5l8960x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s5l8965x-opp.dtsi
index 0000000,d34dae7..d34dae7
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/s5l8965x-opp.dtsi
+++ b/dts/upstream/src/arm64/apple/s5l8965x-opp.dtsi

diff --cc dts/upstream/src/arm64/apple/s800-0-3-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s800-0-3-pmgr.dtsi
index 0000000,196b8e7..196b8e7
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/s800-0-3-pmgr.dtsi
+++ b/dts/upstream/src/arm64/apple/s800-0-3-pmgr.dtsi

diff --cc dts/upstream/src/arm64/apple/s800-0-3.dtsi
index 0000000,c0e9ae4..c0e9ae4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/s800-0-3.dtsi
+++ b/dts/upstream/src/arm64/apple/s800-0-3.dtsi

diff --cc dts/upstream/src/arm64/apple/s8000.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s8001-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s8001-j98a-j99a.dtsi
index 0000000,e66a4c1..e66a4c1
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/s8001-j98a-j99a.dtsi
+++ b/dts/upstream/src/arm64/apple/s8001-j98a-j99a.dtsi

diff --cc dts/upstream/src/arm64/apple/s8001-j98a.dts
Simple merge

diff --cc dts/upstream/src/arm64/apple/s8001-j99a.dts
Simple merge

diff --cc dts/upstream/src/arm64/apple/s8001-pmgr.dtsi
index 0000000,859ab77..859ab77
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/s8001-pmgr.dtsi
+++ b/dts/upstream/src/arm64/apple/s8001-pmgr.dtsi

diff --cc dts/upstream/src/arm64/apple/s8001.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s8003.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s800x-6s.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s800x-ipad5.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/s800x-se.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/spi1-nvram.dtsi
index 0000000,3df2fd3..3df2fd3
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/spi1-nvram.dtsi
+++ b/dts/upstream/src/arm64/apple/spi1-nvram.dtsi

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/t600x-gpio-pins.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t600x-j314-j316.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t600x-j375.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t7000-6.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t7000-handheld.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t7000-j42d.dts
Simple merge

diff --cc dts/upstream/src/arm64/apple/t7000-mini4.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t7000-n102.dts
Simple merge

diff --cc dts/upstream/src/arm64/apple/t7000-pmgr.dtsi
index 0000000,5948fa7..5948fa7
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t7000-pmgr.dtsi
+++ b/dts/upstream/src/arm64/apple/t7000-pmgr.dtsi

diff --cc dts/upstream/src/arm64/apple/t7000.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t7001-air2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t7001-pmgr.dtsi
index 0000000,7321cfd..7321cfd
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t7001-pmgr.dtsi
+++ b/dts/upstream/src/arm64/apple/t7001-pmgr.dtsi

diff --cc dts/upstream/src/arm64/apple/t7001.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8010-7.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8010-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8010-ipad6.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8010-n112.dts
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8010-pmgr.dtsi
index 0000000,6d45108..6d45108
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8010-pmgr.dtsi
+++ b/dts/upstream/src/arm64/apple/t8010-pmgr.dtsi

diff --cc dts/upstream/src/arm64/apple/t8010.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8011-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8011-pmgr.dtsi
index 0000000,c44e3f9..c44e3f9
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8011-pmgr.dtsi
+++ b/dts/upstream/src/arm64/apple/t8011-pmgr.dtsi

diff --cc dts/upstream/src/arm64/apple/t8011-pro2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8011.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8012-j132.dts
index 0000000,778a69b..778a69b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j132.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j132.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j137.dts
index 0000000,dbde1ad..dbde1ad
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j137.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j137.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j140a.dts
index 0000000,5df1ff7..5df1ff7
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j140a.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j140a.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j140k.dts
index 0000000,a0ef158..a0ef158
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j140k.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j140k.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j152f.dts
index 0000000,261416e..261416e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j152f.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j152f.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j160.dts
index 0000000,fbcc060..fbcc060
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j160.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j160.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j174.dts
index 0000000,d11c70f..d11c70f
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j174.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j174.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j185.dts
index 0000000,33492f5..33492f5
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j185.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j185.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j185f.dts
index 0000000,3a4abdd..3a4abdd
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j185f.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j185f.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j213.dts
index 0000000,8270812..8270812
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j213.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j213.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j214k.dts
index 0000000,5b8e425..5b8e425
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j214k.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j214k.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j215.dts
index 0000000,ad574fb..ad574fb
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j215.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j215.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j223.dts
index 0000000,de75d77..de75d77
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j223.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j223.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j230k.dts
index 0000000,4b19bc7..4b19bc7
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j230k.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j230k.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j680.dts
index 0000000,aa5a72e..aa5a72e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j680.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j680.dts

diff --cc dts/upstream/src/arm64/apple/t8012-j780.dts
index 0000000,9cee891..9cee891
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-j780.dts
+++ b/dts/upstream/src/arm64/apple/t8012-j780.dts

diff --cc dts/upstream/src/arm64/apple/t8012-jxxx.dtsi
index 0000000,36e8263..36e8263
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-jxxx.dtsi
+++ b/dts/upstream/src/arm64/apple/t8012-jxxx.dtsi

diff --cc dts/upstream/src/arm64/apple/t8012-pmgr.dtsi
index 0000000,35a462e..35a462e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-pmgr.dtsi
+++ b/dts/upstream/src/arm64/apple/t8012-pmgr.dtsi

diff --cc dts/upstream/src/arm64/apple/t8012-touchbar.dtsi
index 0000000,fc4a80d..fc4a80d
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012-touchbar.dtsi
+++ b/dts/upstream/src/arm64/apple/t8012-touchbar.dtsi

diff --cc dts/upstream/src/arm64/apple/t8012.dtsi
index 0000000,42df2f5..42df2f5
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8012.dtsi
+++ b/dts/upstream/src/arm64/apple/t8012.dtsi

diff --cc dts/upstream/src/arm64/apple/t8015-8.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8015-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8015-pmgr.dtsi
index 0000000,e238c2d..e238c2d
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/apple/t8015-pmgr.dtsi
+++ b/dts/upstream/src/arm64/apple/t8015-pmgr.dtsi

diff --cc dts/upstream/src/arm64/apple/t8015.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8103-j293.dts
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8103-jxxx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8103-pmgr.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8103.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8112-j493.dts
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8112-jxxx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/apple/t8112.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/arm/corstone1000-fvp.dts
Simple merge

diff --cc dts/upstream/src/arm64/arm/corstone1000.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/arm/morello-fvp.dts
index 0000000,2072c0b..2072c0b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/arm/morello-fvp.dts
+++ b/dts/upstream/src/arm64/arm/morello-fvp.dts

diff --cc dts/upstream/src/arm64/arm/morello-sdp.dts
index 0000000,cee49de..cee49de
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/arm/morello-sdp.dts
+++ b/dts/upstream/src/arm64/arm/morello-sdp.dts

diff --cc dts/upstream/src/arm64/arm/morello.dtsi
index 0000000,5bc1c72..5bc1c72
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/arm/morello.dtsi
+++ b/dts/upstream/src/arm64/arm/morello.dtsi

diff --cc dts/upstream/src/arm64/exynos/exynos8895-dreamlte.dts
Simple merge

diff --cc dts/upstream/src/arm64/exynos/exynos8895.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/exynos/exynos990.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/exynos/exynosautov920.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/exynos/google/gs101-oriole.dts
Simple merge

diff --cc dts/upstream/src/arm64/exynos/google/gs101-pixel-common.dtsi
index 0000000,b252304..b252304
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/exynos/google/gs101-pixel-common.dtsi
+++ b/dts/upstream/src/arm64/exynos/google/gs101-pixel-common.dtsi

diff --cc dts/upstream/src/arm64/exynos/google/gs101-raven.dts
index 0000000,1e7e6b3..1e7e6b3
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/exynos/google/gs101-raven.dts
+++ b/dts/upstream/src/arm64/exynos/google/gs101-raven.dts

diff --cc dts/upstream/src/arm64/exynos/google/gs101.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/fsl-ls1088a-ten64.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8-apalis-v1.1.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8-ss-hsio.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8dxl-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-kontron-bl.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-kontron-osm-s.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-phyboard-polis-peb-av-10.dtso
index 0000000,840f832..840f832
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mm-phyboard-polis-peb-av-10.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8mm-phyboard-polis-peb-av-10.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8mm-phyboard-polis-peb-eval-01.dtso
index 0000000,a28f51e..a28f51e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mm-phyboard-polis-peb-eval-01.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8mm-phyboard-polis-peb-eval-01.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8mm-phyboard-polis-rdk.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-phycore-no-eth.dtso
index 0000000,0fb4b6d..0fb4b6d
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mm-phycore-no-eth.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8mm-phycore-no-eth.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8mm-phycore-no-spiflash.dtso
index 0000000,7bfc366..7bfc366
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mm-phycore-no-spiflash.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8mm-phycore-no-spiflash.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8mm-phycore-rpmsg.dtso
index 0000000,43d5905..43d5905
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mm-phycore-rpmsg.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8mm-phycore-rpmsg.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8mm-phycore-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-phygate-tauri-l.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-tqma8mqml.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mm-verdin.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mn-bsh-smm-s2pro.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mn-tqma8mqnl.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-kontron-osm-s.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-nominal.dtsi
index 0000000,2ce1860..2ce1860
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mp-nominal.dtsi
+++ b/dts/upstream/src/arm64/freescale/imx8mp-nominal.dtsi

diff --cc dts/upstream/src/arm64/freescale/imx8mp-skov-basic.dts
index 0000000,5a2629f..5a2629f
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mp-skov-basic.dts
+++ b/dts/upstream/src/arm64/freescale/imx8mp-skov-basic.dts

diff --cc dts/upstream/src/arm64/freescale/imx8mp-skov-reva.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-skov-revb-hdmi.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-skov-revb-lt6.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp-skov-revc-bd500.dts
index 0000000,b816c6c..b816c6c
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mp-skov-revc-bd500.dts
+++ b/dts/upstream/src/arm64/freescale/imx8mp-skov-revc-bd500.dts

diff --cc dts/upstream/src/arm64/freescale/imx8mp-skov-revc-tian-g07017.dts
index 0000000,9a562c0..9a562c0
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8mp-skov-revc-tian-g07017.dts
+++ b/dts/upstream/src/arm64/freescale/imx8mp-skov-revc-tian-g07017.dts

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-var-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mp.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mq-librem5-devkit.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mq-librem5.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8mq-tqma8mq.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qm-apalis-v1.1.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qm-apalis.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qm-mek.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qm-ss-hsio.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8qxp-mek-pcie-ep.dtso
index 0000000,4f562eb..4f562eb
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx8qxp-mek-pcie-ep.dtso
+++ b/dts/upstream/src/arm64/freescale/imx8qxp-mek-pcie-ep.dtso

diff --cc dts/upstream/src/arm64/freescale/imx8qxp-mek.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx8x-colibri.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-kontron-osm-s.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-tqma9352-mba93xxca.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93-tqma9352-mba93xxla.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx93.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/imx95-15x15-evk.dts
index 0000000,514f242..514f242
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/imx95-15x15-evk.dts
+++ b/dts/upstream/src/arm64/freescale/imx95-15x15-evk.dts

diff --cc dts/upstream/src/arm64/freescale/imx95-19x19-evk.dts
Simple merge

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/mba8xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32g2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32g274a-evb.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32g274a-rdb2.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32g3.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32g399a-rdb3.dts
Simple merge

diff --cc dts/upstream/src/arm64/freescale/s32gxxxa-evb.dtsi
index 0000000,d26af0f..d26af0f
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/s32gxxxa-evb.dtsi
+++ b/dts/upstream/src/arm64/freescale/s32gxxxa-evb.dtsi

diff --cc dts/upstream/src/arm64/freescale/s32gxxxa-rdb.dtsi
index 0000000,ba53ec6..ba53ec6
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/freescale/s32gxxxa-rdb.dtsi
+++ b/dts/upstream/src/arm64/freescale/s32gxxxa-rdb.dtsi

diff --cc dts/upstream/src/arm64/freescale/tqma8xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/hisilicon/hi3660-coresight.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/ac5-98dx25xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-3720-db.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-3720-espressobin-emmc.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-3720-espressobin-ultra.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-3720-espressobin-v7-emmc.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-3720-espressobin-v7.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-3720-espressobin.dts
index c5a834b,0000000..1542d83
mode 100644,000000..100644
--- 1/dts/upstream/src/arm64/marvell/armada-3720-espressobin.dts
--- /dev/null
+++ b/dts/upstream/src/arm64/marvell/armada-3720-espressobin.dts
@@@ -1,20 -1,0 +1,20 @@@
-       compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3700";
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Device Tree file for Globalscale Marvell ESPRESSOBin Board
 + * Copyright (C) 2016 Marvell
 + *
 + * Romain Perier <romain.perier@free-electrons.com>
 + *
 + */
 +/*
 + * Schematic available at http://espressobin.net/wp-content/uploads/2017/08/ESPRESSObin_V5_Schematics.pdf
 + */
 +
 +/dts-v1/;
 +
 +#include "armada-3720-espressobin.dtsi"
 +
 +/ {
 +      model = "Globalscale Marvell ESPRESSOBin Board";
++      compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";
 +};

diff --cc dts/upstream/src/arm64/marvell/armada-3720-gl-mv1000.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-3720-turris-mox.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-3720-uDPU.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-372x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-37xx.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-7020.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-7040.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-8020.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-8040-clearfog-gt-8k.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-8040-puzzle-m801.dts
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-8040.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-8080.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-ap806-dual.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-ap806-quad.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-ap806.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-ap807-quad.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-ap807.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-ap80x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-ap810-ap0-octa-core.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-ap810-ap0.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-cp110.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-cp115.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/armada-cp11x.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/marvell/cn9130-sr-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt6359.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8173-elm.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8173.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8183-kukui-jacuzzi-damu.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8188-geralt.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8188.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8195-cherry.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8195.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8365-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8365.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8370-genio-510-evk.dts
index 0000000,71a8cbe..71a8cbe
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/mediatek/mt8370-genio-510-evk.dts
+++ b/dts/upstream/src/arm64/mediatek/mt8370-genio-510-evk.dts

diff --cc dts/upstream/src/arm64/mediatek/mt8370.dtsi
index 0000000,cf1a375..cf1a375
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/mediatek/mt8370.dtsi
+++ b/dts/upstream/src/arm64/mediatek/mt8370.dtsi

diff --cc dts/upstream/src/arm64/mediatek/mt8390-genio-700-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8390-genio-common.dtsi
index 0000000,60139e6..60139e6
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/mediatek/mt8390-genio-common.dtsi
+++ b/dts/upstream/src/arm64/mediatek/mt8390-genio-common.dtsi

diff --cc dts/upstream/src/arm64/mediatek/mt8395-genio-1200-evk.dts
Simple merge

diff --cc dts/upstream/src/arm64/mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso
index 0000000,0389c9c..0389c9c
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso
+++ b/dts/upstream/src/arm64/mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso

diff --cc dts/upstream/src/arm64/mediatek/mt8395-radxa-nio-12l.dts
Simple merge

diff --cc dts/upstream/src/arm64/nvidia/tegra210-p2180.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/nvidia/tegra210-p2597.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/nvidia/tegra210-p3450-0000.dts
Simple merge

diff --cc dts/upstream/src/arm64/nvidia/tegra210.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/nvidia/tegra234-p3740-0002+p3701-0008.dts
Simple merge

diff --cc dts/upstream/src/arm64/nvidia/tegra234-p3768-0000+p3767.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/qcom/sc8280xp-huawei-gaokun3.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/beacon-renesom-som.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/hihope-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a774a1.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a774b1.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a774c0-cat874.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a774c0.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a774e1.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77951.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77960.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77961.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77965.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77970-eagle-function-expansion.dtso
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77970-eagle.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77970-v3msk.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77970.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77980-v3hsk.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77980.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77990.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a77995.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779a0-falcon-cpu.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779a0.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779f0-spider-cpu.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779f0-spider-ethernet.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779f0.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779f4-s4sk.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779g0.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779h0-gray-hawk-single.dts
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r8a779h0.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r9a07g044l2-remi-pi.dts
index 0000000,3267e7b..3267e7b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/r9a07g044l2-remi-pi.dts
+++ b/dts/upstream/src/arm64/renesas/r9a07g044l2-remi-pi.dts

diff --cc dts/upstream/src/arm64/renesas/r9a08g045.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/r9a08g045s33-smarc-pmod1-type-3a.dtso
index 0000000,4a81e3a..4a81e3a
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/r9a08g045s33-smarc-pmod1-type-3a.dtso
+++ b/dts/upstream/src/arm64/renesas/r9a08g045s33-smarc-pmod1-type-3a.dtso

diff --cc dts/upstream/src/arm64/renesas/r9a09g047.dtsi
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/r9a09g057h48-kakip.dts
index 0000000,d2586d2..d2586d2
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/r9a09g057h48-kakip.dts
+++ b/dts/upstream/src/arm64/renesas/r9a09g057h48-kakip.dts

diff --cc dts/upstream/src/arm64/renesas/rzg3e-smarc-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/rzg3s-smarc-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/rzg3s-smarc-switches.h
index 0000000,bbf908a..bbf908a
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/renesas/rzg3s-smarc-switches.h
+++ b/dts/upstream/src/arm64/renesas/rzg3s-smarc-switches.h

diff --cc dts/upstream/src/arm64/renesas/rzg3s-smarc.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/salvator-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/ulcb-kf-audio-graph-card-mix+split.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/ulcb-kf-audio-graph-card2-mix+split.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/ulcb-kf-simple-audio-card-mix+split.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/ulcb.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/white-hawk-cpu-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/renesas/white-hawk-csi-dsi.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-engicam-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-engicam-ctouch2.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-engicam-px30-core-edimm2.2.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-ringneck-haikou-lvds-9904379.dtso
index 0000000,3fc088a..3fc088a
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/px30-ringneck-haikou-lvds-9904379.dtso
+++ b/dts/upstream/src/arm64/rockchip/px30-ringneck-haikou-lvds-9904379.dtso

diff --cc dts/upstream/src/arm64/rockchip/px30-ringneck-haikou-video-demo.dtso
index 0000000,7d9ea5a..7d9ea5a
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/px30-ringneck-haikou-video-demo.dtso
+++ b/dts/upstream/src/arm64/rockchip/px30-ringneck-haikou-video-demo.dtso

diff --cc dts/upstream/src/arm64/rockchip/px30-ringneck-haikou.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/px30-ringneck.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3308-roc-cc.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3318-a95x-z2.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3328-rock-pi-e.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-nanopi4.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-puma-haikou-video-demo.dtso
index 0000000,0377ec8..0377ec8
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3399-puma-haikou-video-demo.dtso
+++ b/dts/upstream/src/arm64/rockchip/rk3399-puma-haikou-video-demo.dtso

diff --cc dts/upstream/src/arm64/rockchip/rk3399-puma-haikou.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-puma.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-roc-pc-plus.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3399-rock-pi-4.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-quartz64-a.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3566-quartz64-b.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3568-photonicat.dts
index 0000000,58c1052..58c1052
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3568-photonicat.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3568-photonicat.dts

diff --cc dts/upstream/src/arm64/rockchip/rk3568-qnap-ts433.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3568-rock-3a.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk356x-base.dtsi
Simple merge

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-rock-4d.dts
index 0000000,6756403..6756403
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3576-rock-4d.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3576-rock-4d.dts

diff --cc dts/upstream/src/arm64/rockchip/rk3576.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-armsom-lm7.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-armsom-sige7.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-base.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-evb.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5-genbook.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-coolpi-cm5.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-edgeble-neu6a-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-edgeble-neu6a-io.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-evb1-v10.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-extra.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-fet3588-c.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-firefly-core-3588j.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-firefly-icore-3588q.dtsi
index 0000000,6726eeb..6726eeb
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3588-firefly-icore-3588q.dtsi
+++ b/dts/upstream/src/arm64/rockchip/rk3588-firefly-icore-3588q.dtsi

diff --cc dts/upstream/src/arm64/rockchip/rk3588-firefly-itx-3588j.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-friendlyelec-cm3588.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-h96-max-v58.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-jaguar-pre-ict-tester.dtso
index 0000000,9d44dfe..9d44dfe
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3588-jaguar-pre-ict-tester.dtso
+++ b/dts/upstream/src/arm64/rockchip/rk3588-jaguar-pre-ict-tester.dtso

diff --cc dts/upstream/src/arm64/rockchip/rk3588-jaguar.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-mnt-reform2.dts
index 0000000,78a4e89..78a4e89
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3588-mnt-reform2.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3588-mnt-reform2.dts

diff --cc dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-ok3588-c.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-orangepi-5-compact.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-orangepi-5-max.dts
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-ultra.dts
index 0000000,f8c6c08..f8c6c08
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/rockchip/rk3588-orangepi-5-ultra.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3588-orangepi-5-ultra.dts

diff --cc dts/upstream/src/arm64/rockchip/rk3588-orangepi-5.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-quartzpro64.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-rock-5-itx.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-rock-5b.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-tiger-haikou.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-tiger.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588-toybrick-x0.dts
Simple merge

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-coolpi-4b.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-evb1-v10.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-gameforce-ace.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-indiedroid-nova.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-khadas-edge2.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-nanopi-r6.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-odroid-m2.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts
Simple merge

diff --cc dts/upstream/src/arm64/rockchip/rk3588s-rock-5c.dts
Simple merge

diff --cc dts/upstream/src/arm64/st/stm32mp211.dtsi
index 0000000,bf888d6..bf888d6
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp211.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp211.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp213.dtsi
index 0000000,fdd2dc4..fdd2dc4
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp213.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp213.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp215.dtsi
index 0000000,a7df77f..a7df77f
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp215.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp215.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp215f-dk.dts
index 0000000,7bdaeaa..7bdaeaa
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp215f-dk.dts
+++ b/dts/upstream/src/arm64/st/stm32mp215f-dk.dts

diff --cc dts/upstream/src/arm64/st/stm32mp21xc.dtsi
index 0000000,e33b00b..e33b00b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp21xc.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp21xc.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp21xf.dtsi
index 0000000,e33b00b..e33b00b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp21xc.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp21xf.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp231.dtsi
index 0000000,75697ac..75697ac
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp231.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp231.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp233.dtsi
index 0000000,78f4059..78f4059
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp233.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp233.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp235.dtsi
index 0000000,2719c08..2719c08
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp235.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp235.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp235f-dk.dts
index 0000000,04d1b43..04d1b43
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp235f-dk.dts
+++ b/dts/upstream/src/arm64/st/stm32mp235f-dk.dts

diff --cc dts/upstream/src/arm64/st/stm32mp23xc.dtsi
index 0000000,e33b00b..e33b00b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp21xc.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp23xc.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp23xf.dtsi
index 0000000,e33b00b..e33b00b
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp21xc.dtsi
+++ b/dts/upstream/src/arm64/st/stm32mp23xf.dtsi

diff --cc dts/upstream/src/arm64/st/stm32mp251.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/st/stm32mp257f-dk.dts
index 0000000,a278a1e..a278a1e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/st/stm32mp257f-dk.dts
+++ b/dts/upstream/src/arm64/st/stm32mp257f-dk.dts

diff --cc dts/upstream/src/arm64/tesla/fsd.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62-phycore-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62-verdin-dahlia.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am625-beagleplay.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62a-mcu.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62a-phycore-som.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62a7-sk.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62p-j722s-common-mcu.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62p-j722s-common-wakeup.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62p-main.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62p5-sk.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-am62x-phyboard-lyra.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-am64-phycore-som.dtsi
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-am642-phyboard-electra-x27-gpio1-spi1-uart3.dtso
index 0000000,996c42e..996c42e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/ti/k3-am642-phyboard-electra-x27-gpio1-spi1-uart3.dtso
+++ b/dts/upstream/src/arm64/ti/k3-am642-phyboard-electra-x27-gpio1-spi1-uart3.dtso

diff --cc dts/upstream/src/arm64/ti/k3-j721e-common-proc-board.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-j721e-sk.dts
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-j721s2-som-p0.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-j784s4-evm-quad-port-eth-exp1.dtso
Simple merge

diff --cc dts/upstream/src/arm64/ti/k3-j784s4-j742s2-main-common.dtsi
Simple merge

diff --cc dts/upstream/src/arm64/xilinx/versal-net-clk.dtsi
index 0000000,b7a8a1a..b7a8a1a
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/xilinx/versal-net-clk.dtsi
+++ b/dts/upstream/src/arm64/xilinx/versal-net-clk.dtsi

diff --cc dts/upstream/src/arm64/xilinx/versal-net-vn-x-b2197-01-revA.dts
index 0000000,06b2301..06b2301
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/xilinx/versal-net-vn-x-b2197-01-revA.dts
+++ b/dts/upstream/src/arm64/xilinx/versal-net-vn-x-b2197-01-revA.dts

diff --cc dts/upstream/src/arm64/xilinx/versal-net.dtsi
index 0000000,fc9f49e..fc9f49e
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/xilinx/versal-net.dtsi
+++ b/dts/upstream/src/arm64/xilinx/versal-net.dtsi

diff --cc dts/upstream/src/arm64/xilinx/xlnx-zynqmp-clk.h
index 0000000,0aa17f2..0aa17f2
mode 000000,100644..100644
--- /dev/null
--- 2/src/arm64/xilinx/xlnx-zynqmp-clk.h
+++ b/dts/upstream/src/arm64/xilinx/xlnx-zynqmp-clk.h

diff --cc dts/upstream/src/arm64/xilinx/zynqmp-clk-ccf.dtsi
Simple merge

diff --cc dts/upstream/src/loongarch/loongson-2k1000-ref.dts
Simple merge

diff --cc dts/upstream/src/mips/ingenic/gcw0.dts
Simple merge

diff --cc dts/upstream/src/mips/ingenic/rs90.dts
Simple merge

diff --cc dts/upstream/src/mips/mobileye/eyeq6h.dtsi
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/mt7620a_eval.dts
Simple merge

diff --cc dts/upstream/src/mips/ralink/mt7628a.dtsi
Simple merge

diff --cc dts/upstream/src/mips/ralink/omega2p.dts
Simple merge

diff --cc dts/upstream/src/mips/ralink/rt2880.dtsi
Simple merge

diff --cc dts/upstream/src/mips/ralink/rt2880_eval.dts
Simple merge

diff --cc dts/upstream/src/mips/ralink/rt3050.dtsi
Simple merge

diff --cc dts/upstream/src/mips/ralink/rt3883.dtsi
Simple merge

diff --cc dts/upstream/src/mips/ralink/rt3883_eval.dts
Simple merge

diff --cc dts/upstream/src/mips/realtek/cisco_sg220-26.dts
Simple merge

diff --cc dts/upstream/src/mips/realtek/rtl838x.dtsi
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/microchip/mpfs-icicle-kit-fabric.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/microchip/mpfs-m100pfs-fabric.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/microchip/mpfs-polarberry-fabric.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/cv18xx.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/sg2042-milkv-pioneer.dts
Simple merge

diff --cc dts/upstream/src/riscv/sophgo/sg2042.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/spacemit/k1-milkv-jupiter.dts
index 0000000,4483192..4483192
mode 000000,100644..100644
--- /dev/null
--- 2/src/riscv/spacemit/k1-milkv-jupiter.dts
+++ b/dts/upstream/src/riscv/spacemit/k1-milkv-jupiter.dts

diff --cc dts/upstream/src/riscv/starfive/jh7110-common.dtsi
Simple merge

diff --cc dts/upstream/src/riscv/starfive/jh7110-deepcomputing-fml13v01.dts
Simple merge

diff --cc dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dts
Simple merge

diff --cc dts/upstream/src/riscv/starfive/jh7110.dtsi
Simple merge