diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-11-24 15:36:13 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-11-24 15:36:13 +0100 |
| commit | b10dbd6fbd7d097afa1ffa5f94a74b355a4e4743 (patch) | |
| tree | f0aac02c0333f87a632ec4d9516b54ec34c8342b | |
| parent | 706450b5c3212a7d372e68170a28170239ccfe6e (diff) | |
| parent | da74858a475782a3f16470907814c8cc5950ad68 (diff) | |
| download | user-namespace-b10dbd6fbd7d097afa1ffa5f94a74b355a4e4743.tar.gz | |
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
| -rw-r--r-- | arch/arm/boot/dts/rk3188.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3xxx.dtsi | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index b8f34bef0efaea..44b54af0bbf9fa 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -607,7 +607,6 @@ &global_timer { interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; - status = "disabled"; }; &local_timer { diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index bf285091a9eb11..cb4e42ede56a9a 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -76,6 +76,13 @@ reg = <0x1013c200 0x20>; interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>; clocks = <&cru CORE_PERI>; + status = "disabled"; + /* The clock source and the sched_clock provided by the arm_global_timer + * on Rockchip rk3066a/rk3188 are quite unstable because their rates + * depend on the CPU frequency. + * Keep the arm_global_timer disabled in order to have the + * DW_APB_TIMER (rk3066a) or ROCKCHIP_TIMER (rk3188) selected by default. + */ }; local_timer: local-timer@1013c600 { |