aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/timer.c
diff options
context:
space:
mode:
authorUlrich Hecht <ulrich.hecht+renesas@gmail.com>2014-09-04 10:02:27 -0400
committerSimon Horman <horms+renesas@verge.net.au>2014-09-05 04:23:45 -0400
commit0dc50fd3dc4a70d0d317103188c129d378125643 (patch)
treed61ba2705dded462c92378c3ae4cba5805293415 /arch/arm/mach-shmobile/timer.c
parent86155b35d173317518458c6f9c0a3ea8c5324bed (diff)
ARM: shmobile: support Cortex-A7 in shmobile_init_delay()
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> Acked-by: Magnus Damm <damm+renesas@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/timer.c')
-rw-r--r--arch/arm/mach-shmobile/timer.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index 942efdc82a62..0b01770c2b37 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -60,7 +60,7 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz,
60void __init shmobile_init_delay(void) 60void __init shmobile_init_delay(void)
61{ 61{
62 struct device_node *np, *cpus; 62 struct device_node *np, *cpus;
63 bool is_a8_a9 = false; 63 bool is_a7_a8_a9 = false;
64 bool is_a15 = false; 64 bool is_a15 = false;
65 u32 max_freq = 0; 65 u32 max_freq = 0;
66 66
@@ -74,9 +74,10 @@ void __init shmobile_init_delay(void)
74 if (!of_property_read_u32(np, "clock-frequency", &freq)) 74 if (!of_property_read_u32(np, "clock-frequency", &freq))
75 max_freq = max(max_freq, freq); 75 max_freq = max(max_freq, freq);
76 76
77 if (of_device_is_compatible(np, "arm,cortex-a8") || 77 if (of_device_is_compatible(np, "arm,cortex-a7") ||
78 of_device_is_compatible(np, "arm,cortex-a8") ||
78 of_device_is_compatible(np, "arm,cortex-a9")) 79 of_device_is_compatible(np, "arm,cortex-a9"))
79 is_a8_a9 = true; 80 is_a7_a8_a9 = true;
80 else if (of_device_is_compatible(np, "arm,cortex-a15")) 81 else if (of_device_is_compatible(np, "arm,cortex-a15"))
81 is_a15 = true; 82 is_a15 = true;
82 } 83 }
@@ -86,7 +87,7 @@ void __init shmobile_init_delay(void)
86 if (!max_freq) 87 if (!max_freq)
87 return; 88 return;
88 89
89 if (is_a8_a9) 90 if (is_a7_a8_a9)
90 shmobile_setup_delay_hz(max_freq, 1, 3); 91 shmobile_setup_delay_hz(max_freq, 1, 3);
91 else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) 92 else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
92 shmobile_setup_delay_hz(max_freq, 2, 4); 93 shmobile_setup_delay_hz(max_freq, 2, 4);