1 files changed, 7 insertions, 23 deletions

diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index 942efdc82a62..87c6be1e79bd 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -23,8 +23,8 @@
 #include <linux/delay.h>
 #include <linux/of_address.h>
 
-void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz,
-                                    unsigned int mult, unsigned int div)
+static void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz,
+                                           unsigned int mult, unsigned int div)
 {
         /* calculate a worst-case loops-per-jiffy value
          * based on maximum cpu core hz setting and the
@@ -40,27 +40,10 @@ void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz,
                 preset_lpj = max_cpu_core_hz / value;
 }
 
-void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz,
-                                 unsigned int mult, unsigned int div)
-{
-        /* calculate a worst-case loops-per-jiffy value
-         * based on maximum cpu core mhz setting and the
-         * __delay() implementation in arch/arm/lib/delay.S
-         *
-         * this will result in a longer delay than expected
-         * when the cpu core runs on lower frequencies.
-         */
-
-        unsigned int value = (1000000 * mult) / (HZ * div);
-
-        if (!preset_lpj)
-                preset_lpj = max_cpu_core_mhz * value;
-}
-
 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 +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;
         }
@@ -86,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);