From 850405f42db809b8be38de926cae36df1726ed38 Mon Sep 17 00:00:00 2001 From: Hanjie Lin Date: Wed, 17 Oct 2018 16:51:28 +0800 Subject: [PATCH] dts: aarch32: modify timer for aarch32 [1/1] PD#SWPL-663 Problem: 32bit_kernel VtsKernelLinuxKselftest module 1 fail can't find __vdso_gettimeofday Solution: modify timer for aarch32 Verify: p212 boot normal Change-Id: Id7a6f656eabf5230dcd60f6c25f39419577bba64 Signed-off-by: Hanjie Lin --- arch/arm/boot/dts/amlogic/mesonaxg.dtsi | 2 +- arch/arm/boot/dts/amlogic/mesong12a.dtsi | 2 +- arch/arm/boot/dts/amlogic/mesongxl.dtsi | 2 +- arch/arm/boot/dts/amlogic/mesontxlx.dtsi | 2 +- drivers/clocksource/arm_arch_timer.c | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/mesonaxg.dtsi b/arch/arm/boot/dts/amlogic/mesonaxg.dtsi index 63b8bd3..0292a1e 100644 --- a/arch/arm/boot/dts/amlogic/mesonaxg.dtsi +++ b/arch/arm/boot/dts/amlogic/mesonaxg.dtsi @@ -101,7 +101,7 @@ }; timer { - compatible = "arm,armv8-timer"; + compatible = "arm,armv7-timer"; interrupts = , , , diff --git a/arch/arm/boot/dts/amlogic/mesong12a.dtsi b/arch/arm/boot/dts/amlogic/mesong12a.dtsi index 8e611df..fb5c8f3 100644 --- a/arch/arm/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm/boot/dts/amlogic/mesong12a.dtsi @@ -136,7 +136,7 @@ }; timer { - compatible = "arm,armv8-timer"; + compatible = "arm,armv7-timer"; interrupts = , , , diff --git a/arch/arm/boot/dts/amlogic/mesongxl.dtsi b/arch/arm/boot/dts/amlogic/mesongxl.dtsi index 3b47f09..10a3a83 100644 --- a/arch/arm/boot/dts/amlogic/mesongxl.dtsi +++ b/arch/arm/boot/dts/amlogic/mesongxl.dtsi @@ -113,7 +113,7 @@ }; timer { - compatible = "arm,armv8-timer"; + compatible = "arm,armv7-timer"; interrupts = , , , diff --git a/arch/arm/boot/dts/amlogic/mesontxlx.dtsi b/arch/arm/boot/dts/amlogic/mesontxlx.dtsi index 7696827..bbc9680 100644 --- a/arch/arm/boot/dts/amlogic/mesontxlx.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontxlx.dtsi @@ -112,7 +112,7 @@ }; timer { - compatible = "arm,armv8-timer"; + compatible = "arm,armv7-timer"; interrupts = , , , diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index e3bc592..c425327 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -454,6 +454,11 @@ static void arch_counter_set_user_access(void) else cntkctl &= ~ARCH_TIMER_USR_VCT_ACCESS_EN; +#ifdef CONFIG_AMLOGIC_MODIFY + /* Enable user access to the phyical counter for __vdso_gettimeofday */ + cntkctl |= ARCH_TIMER_USR_PCT_ACCESS_EN; +#endif + arch_timer_set_cntkctl(cntkctl); } -- 2.7.4