Skip to content

Commit b10dbd6

Browse files
committed
Merge tag 'v6.2-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
Disabling of the unreliable arm-global-timer on earliest Rockchip SoCs, due to its frequency being bound to the changing cpu clock. * tag 'v6.2-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: disable arm_global_timer on rk3066 and rk3188
2 parents 706450b + da74858 commit b10dbd6

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

arch/arm/boot/dts/rk3188.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,6 @@
607607

608608
&global_timer {
609609
interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
610-
status = "disabled";
611610
};
612611

613612
&local_timer {

arch/arm/boot/dts/rk3xxx.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@
7676
reg = <0x1013c200 0x20>;
7777
interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>;
7878
clocks = <&cru CORE_PERI>;
79+
status = "disabled";
80+
/* The clock source and the sched_clock provided by the arm_global_timer
81+
* on Rockchip rk3066a/rk3188 are quite unstable because their rates
82+
* depend on the CPU frequency.
83+
* Keep the arm_global_timer disabled in order to have the
84+
* DW_APB_TIMER (rk3066a) or ROCKCHIP_TIMER (rk3188) selected by default.
85+
*/
7986
};
8087

8188
local_timer: local-timer@1013c600 {

0 commit comments

Comments
 (0)