提交 abb09230 编写于 作者: A Anthoine Bourgeois 提交者: Zheng Zengkai

ARM: dts: Use 32KiHz oscillator on devkit8000

stable inclusion
from stable-v5.10.104
commit 44709130793bb7e23c929e54b248b0b3816944d6
bugzilla: https://gitee.com/openeuler/kernel/issues/I56XAC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=44709130793bb7e23c929e54b248b0b3816944d6

--------------------------------

[ Upstream commit 8840f546 ]

Devkit8000 board seems to always used 32k_counter as clocksource.
Restore this behavior.

If clocksource is back to 32k_counter, timer12 is now the clockevent
source (as before) and timer2 is not longer needed here.

This commit fixes the same issue observed with commit 23885389
("ARM: dts: Fix timer regression for beagleboard revision c") when sleep
is blocked until hitting keys over serial console.

Fixes: aba1ad05 ("clocksource/drivers/timer-ti-dm: Add clockevent and clocksource support")
Fixes: e428e250 ("ARM: dts: Configure system timers for omap3")
Signed-off-by: NAnthoine Bourgeois <anthoine.bourgeois@gmail.com>
Signed-off-by: NTony Lindgren <tony@atomide.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NYu Liao <liaoyu15@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 ac835e8c
...@@ -158,11 +158,6 @@ ...@@ -158,11 +158,6 @@
status = "disabled"; status = "disabled";
}; };
/* Unusable as clocksource because of unreliable oscillator */
&counter32k {
status = "disabled";
};
/* Unusable as clockevent because if unreliable oscillator, allow to idle */ /* Unusable as clockevent because if unreliable oscillator, allow to idle */
&timer1_target { &timer1_target {
/delete-property/ti,no-reset-on-init; /delete-property/ti,no-reset-on-init;
...@@ -172,7 +167,7 @@ ...@@ -172,7 +167,7 @@
}; };
}; };
/* Preferred always-on timer for clocksource */ /* Preferred timer for clockevent */
&timer12_target { &timer12_target {
ti,no-reset-on-init; ti,no-reset-on-init;
ti,no-idle; ti,no-idle;
...@@ -181,16 +176,6 @@ ...@@ -181,16 +176,6 @@
}; };
}; };
/* Preferred timer for clockevent */
&timer2_target {
ti,no-reset-on-init;
ti,no-idle;
timer@0 {
assigned-clocks = <&gpt2_fck>;
assigned-clock-parents = <&sys_ck>;
};
};
&twl_gpio { &twl_gpio {
ti,use-leds; ti,use-leds;
/* /*
......
...@@ -241,8 +241,7 @@ static void __init dmtimer_systimer_assign_alwon(void) ...@@ -241,8 +241,7 @@ static void __init dmtimer_systimer_assign_alwon(void)
bool quirk_unreliable_oscillator = false; bool quirk_unreliable_oscillator = false;
/* Quirk unreliable 32 KiHz oscillator with incomplete dts */ /* Quirk unreliable 32 KiHz oscillator with incomplete dts */
if (of_machine_is_compatible("ti,omap3-beagle-ab4") || if (of_machine_is_compatible("ti,omap3-beagle-ab4")) {
of_machine_is_compatible("timll,omap3-devkit8000")) {
quirk_unreliable_oscillator = true; quirk_unreliable_oscillator = true;
counter_32k = -ENODEV; counter_32k = -ENODEV;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册