Merge branch 'master' into next

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/dts/rk3188-radxarock-u-boot.dtsi
index fe6aba7,de29959..7bcbc29
--- 1/arch/arm/dts/rk3188-radxarock-u-boot.dtsi
--- 2/arch/arm/dts/rk3188-radxarock-u-boot.dtsi
+++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi
@@@ -52,9 -52,8 +52,8 @@@
  };
  
  &timer3 {
-       compatible = "rockchip,rk3368-timer", "rockchip,rk3288-timer";
        clock-frequency = <24000000>;
 -      u-boot,dm-spl;
 +      bootph-pre-ram;
  };
  
  &uart2 {

diff --cc arch/arm/dts/rk356x-u-boot.dtsi
index ecf88e0,6eef99e..0a764ce
--- 1/arch/arm/dts/rk356x-u-boot.dtsi
--- 2/arch/arm/dts/rk356x-u-boot.dtsi
+++ b/arch/arm/dts/rk356x-u-boot.dtsi
@@@ -34,13 -34,8 +34,8 @@@
        };
  };
  
- &combphy1 {
-       /delete-property/ assigned-clocks;
-       /delete-property/ assigned-clock-rates;
- };
- 
  &cru {
 -      u-boot,dm-pre-reloc;
 +      bootph-all;
        status = "okay";
  };
  

diff --cc arch/m68k/dts/stmark2.dts
Simple merge

diff --cc arch/x86/dts/bayleybay.dts
Simple merge

diff --cc arch/x86/dts/baytrail_som-db5800-som-6867.dts
Simple merge

diff --cc arch/x86/dts/conga-qeval20-qa3-e3845.dts
Simple merge

diff --cc arch/x86/dts/dfi-bt700.dtsi
Simple merge

diff --cc arch/x86/dts/minnowmax.dts
Simple merge

diff --cc boot/Kconfig
Simple merge

diff --cc configs/imx93_11x11_evk_defconfig
index 93c478c,694f8c3..4f87771
--- 1/configs/imx93_11x11_evk_defconfig
--- 2/configs/imx93_11x11_evk_defconfig
+++ b/configs/imx93_11x11_evk_defconfig
@@@ -22,10 -22,11 +22,10 @@@ CONFIG_SPL_LOAD_IMX_CONTAINER=
  CONFIG_SYS_LOAD_ADDR=0x80400000
  CONFIG_SYS_MEMTEST_START=0x80000000
  CONFIG_SYS_MEMTEST_END=0x90000000
- CONFIG_DISTRO_DEFAULTS=y
  CONFIG_REMAKE_ELF=y
  CONFIG_SYS_MONITOR_LEN=524288
+ CONFIG_DISTRO_DEFAULTS=y
  CONFIG_DEFAULT_FDT_FILE="imx93-11x11-evk.dtb"
 -CONFIG_ARCH_MISC_INIT=y
  CONFIG_BOARD_EARLY_INIT_F=y
  CONFIG_BOARD_LATE_INIT=y
  CONFIG_SPL_MAX_SIZE=0x26000

diff --cc configs/mvebu_ac5_rd_defconfig
Simple merge

diff --cc configs/sandbox64_defconfig
Simple merge

diff --cc configs/sandbox_defconfig
Simple merge

diff --cc configs/sandbox_flattree_defconfig
Simple merge

diff --cc configs/wandboard_defconfig
Simple merge

diff --cc configs/xilinx_versal_net_virt_defconfig
Simple merge

diff --cc configs/xilinx_versal_virt_defconfig
Simple merge

diff --cc configs/xilinx_zynqmp_virt_defconfig
Simple merge

diff --cc drivers/clk/renesas/clk-rcar-gen3.c
Simple merge