Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20834a40 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: timer: r8a73a4 and r8a7790 are multi-platform only 



Since commits e0426818 ("ARM: shmobile: r8a7790: Remove legacy
code") and 9d07d414 ("ARM: shmobile: r8a73a4: ape6evm: Remove
legacy platform"), the R-Mobile APE6 and R-Car H2 SoCs are supported by
multiplatform kernels only.
Hence we can drop checks for these SoCs in legacy kernel builds.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent d62ba10c

arch/arm/mach-shmobile/timer.c

+0 −12
Original line number Diff line number Diff line
@@ -70,18 +70,6 @@ void __init shmobile_init_delay(void) 
	if (!max_freq)

		return;



#ifdef CONFIG_ARCH_SHMOBILE_LEGACY

	/* Non-multiplatform r8a73a4 SoC cannot use arch timer due

	 * to GIC being initialized from C and arch timer via DT */

	if (of_machine_is_compatible("renesas,r8a73a4"))

		has_arch_timer = false;



	/* Non-multiplatform r8a7790 SoC cannot use arch timer due

	 * to GIC being initialized from C and arch timer via DT */

	if (of_machine_is_compatible("renesas,r8a7790"))

		has_arch_timer = false;

#endif



	if (!has_arch_timer || !IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) {

		if (is_a7_a8_a9)

			shmobile_setup_delay_hz(max_freq, 1, 3);