Unverified Commit 23e4b053 authored Apr 01, 2026 by Arnd Bergmann

Merge tag 'samsung-soc-7.1' of...

Merge tag 'samsung-soc-7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/arm

Samsung mach/soc changes for v7.1

Fix booting of secondary CPU on Exynos5250 based Google Manta board -
difference in TZ firmware.

* tag 'samsung-soc-7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: samsung: exynos5250: Allow CPU1 to boot

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 6de23f81 32d4b991

arch/arm/mach-exynos/firmware.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,10 +61,10 @@ static int exynos_cpu_boot(int cpu)
		* Exynos3250 doesn't need to send smc command for secondary CPU boot
		* because Exynos3250 removes WFE in secure mode.
		*
		* On Exynos5 devices the call is ignored by trustzone firmware.
		* On most Exynos5 devices the call is ignored by trustzone firmware.
		*/
		if (!soc_is_exynos4210() && !soc_is_exynos4212() &&
		!soc_is_exynos4412())
		!soc_is_exynos4412() && !of_machine_is_compatible("google,manta"))
		return 0;

		/*