Merge tag 'v2024.07-rc4' into next

Prepare v2024.070-rc4

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

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

diff --cc arch/arm/mach-exynos/mmu-arm64.c
Simple merge

diff --cc arch/arm/mach-k3/am62px/Makefile
index 5902862b29c87b44d6ff31650c044fb9a92c8ca4,0000000000000000000000000000000000000000..eed91a033eb8a60af3b1e10d6e5979aad4b8a85a
mode 100644,000000..100644
--- 1/arch/arm/mach-k3/am62px/Makefile
--- /dev/null
+++ b/arch/arm/mach-k3/am62px/Makefile
@@@ -1,6 -1,0 +1,7 @@@
 +# SPDX-License-Identifier: GPL-2.0+
 +#
 +# Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
 +#     Andrew Davis <[email protected]>
 +
++obj-$(CONFIG_OF_SYSTEM_SETUP) += am62p5_fdt.o
 +obj-$(CONFIG_SPL_BUILD) += am62p5_init.o

diff --cc arch/arm/mach-k3/am62px/am62p5_fdt.c
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..29c832d28acf54d2ad73f76a4a3d135643bb6bb4
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/arch/arm/mach-k3/am62px/am62p5_fdt.c
@@@ -1,0 -1,0 +1,16 @@@
++// SPDX-License-Identifier: GPL-2.0-or-later
++/*
++ * Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
++ */
++
++#include <asm/hardware.h>
++#include "../common_fdt.h"
++#include <fdt_support.h>
++
++int ft_system_setup(void *blob, struct bd_info *bd)
++{
++      fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x80000);
++      fdt_fixup_reserved(blob, "optee", CONFIG_K3_OPTEE_LOAD_ADDR, 0x1800000);
++
++      return 0;
++}

diff --cc board/isee/igep00x0/igep00x0.c
Simple merge

diff --cc board/microchip/mpfs_icicle/mpfs_icicle.c
Simple merge

diff --cc cmd/tpm-v2.c
Simple merge

diff --cc drivers/cache/cache-andes-l2.c
Simple merge

diff --cc drivers/clk/rockchip/clk_rk3588.c
Simple merge

diff --cc drivers/tpm/tpm2_tis_spi.c
Simple merge

diff --cc lib/efi_loader/efi_tcg2.c
Simple merge