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

Commit 0dc50fd3 authored by Ulrich Hecht's avatar Ulrich Hecht Committed by Simon Horman
Browse files

ARM: shmobile: support Cortex-A7 in shmobile_init_delay() 



Signed-off-by: default avatarUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: default avatarMagnus Damm <damm+renesas@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 86155b35

arch/arm/mach-shmobile/timer.c

+5 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz, 
void __init shmobile_init_delay(void)

{

	struct device_node *np, *cpus;

	bool is_a8_a9 = false;

	bool is_a7_a8_a9 = false;

	bool is_a15 = false;

	u32 max_freq = 0;
@@ -74,9 +74,10 @@ void __init shmobile_init_delay(void) 
		if (!of_property_read_u32(np, "clock-frequency", &freq))

			max_freq = max(max_freq, freq);



		if (of_device_is_compatible(np, "arm,cortex-a8") ||

		if (of_device_is_compatible(np, "arm,cortex-a7") ||

		    of_device_is_compatible(np, "arm,cortex-a8") ||

		    of_device_is_compatible(np, "arm,cortex-a9"))

			is_a8_a9 = true;

			is_a7_a8_a9 = true;

		else if (of_device_is_compatible(np, "arm,cortex-a15"))

			is_a15 = true;

	}
@@ -86,7 +87,7 @@ void __init shmobile_init_delay(void) 
	if (!max_freq)

		return;



	if (is_a8_a9)

	if (is_a7_a8_a9)

		shmobile_setup_delay_hz(max_freq, 1, 3);

	else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER))

		shmobile_setup_delay_hz(max_freq, 2, 4);