clocksource: remove LOCAL_TIMER config in meson64_a32

PD#169652: clocksource: remove LOCAL_TIMER config in meson64_a32

use soc timer instead of local timer

Change-Id: Ie2fd614cc6978496474fefcd39f0f21136197f34
Signed-off-by: Ao Xu <ao.xu@amlogic.com>

diff --git a/arch/arm/configs/meson64_a32_defconfig b/arch/arm/configs/meson64_a32_defconfig
index 03caad6..8e7d564 100644 (file)
--- a/arch/arm/configs/meson64_a32_defconfig
+++ b/arch/arm/configs/meson64_a32_defconfig
@@ -229,7 +229,6 @@ CONFIG_AMLOGIC_MESON64_VERSION=y
 CONFIG_AMLOGIC_CPU_INFO=y
 CONFIG_AMLOGIC_REG_ACCESS=y
 CONFIG_AMLOGIC_TIMER=y
-CONFIG_AMLOGIC_LOCAL_TIMER=y
 CONFIG_AMLOGIC_BC_TIMER=y
 CONFIG_AMLOGIC_CLK=y
 CONFIG_AMLOGIC_COMMON_CLK_SCPI=y

diff --git a/drivers/amlogic/clocksource/meson_bc_timer.c b/drivers/amlogic/clocksource/meson_bc_timer.c
index 8e5541c..cf26ae1 100644 (file)
--- a/drivers/amlogic/clocksource/meson_bc_timer.c
+++ b/drivers/amlogic/clocksource/meson_bc_timer.c
@@ -270,7 +270,7 @@ int clockevent_init_and_register(struct device_node *np)
 }
 
 /*meson broadcast timer*/
-int __init meson_timer_init(struct device_node *np)
+static int __init meson_timer_init(struct device_node *np)
 {
        timer_ctrl_base = of_iomap(np, 0);
        if (clockevent_init_and_register(np) < 0)

diff --git a/drivers/amlogic/clocksource/meson_timer.c b/drivers/amlogic/clocksource/meson_timer.c
index d70e2f9..b6412d4 100644 (file)
--- a/drivers/amlogic/clocksource/meson_timer.c
+++ b/drivers/amlogic/clocksource/meson_timer.c
@@ -276,7 +276,7 @@ int  meson_local_timer_stop(unsigned int cpuidx)
        return 0;
 }
 
-int __init meson_timer_init(struct device_node *np)
+static int __init meson_timer_init(struct device_node *np)
 {
        int i;
        static struct delay_timer aml_delay_timer;