Merge tag 'v2024.04-rc4' into next

Prepare v2024.04-rc4

diff --cc .azure-pipelines.yml
Simple merge

diff --cc .gitlab-ci.yml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc arch/arm/mach-k3/am62a7_init.c
Simple merge

diff --cc arch/arm/mach-k3/common.c
index ed8aec360c9a19f42c44067c4d83125041d2b0c6,b54f2ddc47299f86c24d2ec804cbc3f421e58edd..b0fb87b97a20962688ef06eaf33362319e1017ff
--- 1/arch/arm/mach-k3/common.c
--- 2/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@@ -28,6 -28,29 +28,8 @@@
  #include <elf.h>
  #include <soc.h>
  
 -#if IS_ENABLED(CONFIG_SYS_K3_SPL_ATF)
 -enum {
 -      IMAGE_ID_ATF,
 -      IMAGE_ID_OPTEE,
 -      IMAGE_ID_SPL,
 -      IMAGE_ID_DM_FW,
 -      IMAGE_AMT,
 -};
 -
 -#if CONFIG_IS_ENABLED(FIT_IMAGE_POST_PROCESS)
 -static const char *image_os_match[IMAGE_AMT] = {
 -      "arm-trusted-firmware",
 -      "tee",
 -      "U-Boot",
 -      "DM",
 -};
 -#endif
 -
 -static struct image_info fit_image_info[IMAGE_AMT];
 -#endif
 -
+ #include <asm/arch/k3-qos.h>
+ 
  struct ti_sci_handle *get_ti_sci_handle(void)
  {
        struct udevice *dev;

diff --cc arch/arm/mach-k3/include/mach/hardware.h
index 74692b745adf0a7ed0506b042e91d352cdf02499,52ef82e70b074565d8496f838edba4afa271b778..055715f20d6f22278754a8c99bcc821e2b19caa6
--- 1/arch/arm/mach-k3/include/mach/hardware.h
--- 2/arch/arm/mach-k3/include/mach/hardware.h
+++ b/arch/arm/mach-k3/include/mach/hardware.h
@@@ -30,13 -30,8 +30,12 @@@
  
  #ifdef CONFIG_SOC_K3_AM62A7
  #include "am62a_hardware.h"
- #include "am62a_qos.h"
  #endif
  
 +#ifdef CONFIG_SOC_K3_J784S4
 +#include "j784s4_hardware.h"
 +#endif
 +
  /* Assuming these addresses and definitions stay common across K3 devices */
  #define CTRLMMR_WKUP_JTAG_ID  (WKUP_CTRL_MMR0_BASE + 0x14)
  #define JTAG_ID_VARIANT_SHIFT 28

diff --cc arch/arm/mach-k3/r5/Kconfig
Simple merge

diff --cc configs/am62ax_evm_a53_defconfig
Simple merge

diff --cc configs/am62x_beagleplay_a53_defconfig
Simple merge

diff --cc configs/am62x_evm_a53_defconfig
Simple merge

diff --cc configs/am64x_evm_a53_defconfig
index 27aa78a5331fb5abf33cba74065c45654a1316c1,8e7002fd0e8f9ecb137f31cefb6851a6fbb9807d..ad5472c457107c2f27351b67a0ae096025c80f59
--- 1/configs/am64x_evm_a53_defconfig
--- 2/configs/am64x_evm_a53_defconfig
+++ b/configs/am64x_evm_a53_defconfig
@@@ -58,13 -56,9 +57,12 @@@ CONFIG_SPL_NET_VCI_STRING="AM64X U-Boo
  CONFIG_SPL_POWER_DOMAIN=y
  CONFIG_SPL_RAM_SUPPORT=y
  CONFIG_SPL_RAM_DEVICE=y
 +# CONFIG_SPL_SPI_FLASH_TINY is not set
 +CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y
  CONFIG_SPL_SPI_LOAD=y
 -CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
 +CONFIG_SYS_SPI_U_BOOT_OFFS=0x300000
 +CONFIG_SPL_THERMAL=y
  CONFIG_SPL_YMODEM_SUPPORT=y
- CONFIG_SYS_MAXARGS=64
  CONFIG_CMD_ASKENV=y
  CONFIG_CMD_DFU=y
  CONFIG_CMD_GPT=y

diff --cc configs/am64x_evm_r5_defconfig
index 29e6bba9d303714df5d089820b566cca5e0a21e0,2afaceb72cf4535bbb8e9b2d5189c306ebd3b60c..555d69bb1179e76d140c60d796e3b5ae61f2caf9
--- 1/configs/am64x_evm_r5_defconfig
--- 2/configs/am64x_evm_r5_defconfig
+++ b/configs/am64x_evm_r5_defconfig
@@@ -65,14 -63,10 +65,13 @@@ CONFIG_SPL_POWER_DOMAIN=
  CONFIG_SPL_RAM_SUPPORT=y
  CONFIG_SPL_RAM_DEVICE=y
  CONFIG_SPL_REMOTEPROC=y
 +# CONFIG_SPL_SPI_FLASH_TINY is not set
 +CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y
  CONFIG_SPL_SPI_LOAD=y
 -CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 +CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
 +CONFIG_SPL_THERMAL=y
  CONFIG_SPL_YMODEM_SUPPORT=y
  CONFIG_HUSH_PARSER=y
- CONFIG_SYS_MAXARGS=64
  CONFIG_CMD_ASKENV=y
  CONFIG_CMD_DFU=y
  CONFIG_CMD_GPT=y

diff --cc configs/dragonboard410c_defconfig
Simple merge

diff --cc configs/dragonboard820c_defconfig
Simple merge

diff --cc configs/j721e_evm_a72_defconfig
Simple merge

diff --cc configs/j721e_evm_r5_defconfig
Simple merge

diff --cc configs/phycore_am62x_a53_defconfig
Simple merge

diff --cc configs/verdin-am62_a53_defconfig
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge