Merge tag 'renesas-soc3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / mach-shmobile / timer.c

diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index adce98b44f8a690a924494d0a2d35f9b5a58bc3b..87c6be1e79bd989d24c64ccfc4a95342be5ddc4d 100644 (file)
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -43,7 +43,7 @@ static void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz,
 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;
 
@@ -57,9 +57,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;
        }
@@ -69,7 +70,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);