Commit b10dbd6f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.2-rockchip-dts32-1' of... 

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
parents 706450b5 da74858a

arch/arm/boot/dts/rk3188.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -607,7 +607,6 @@ 


&global_timer {

	interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;

	status = "disabled";

};



&local_timer {

arch/arm/boot/dts/rk3xxx.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -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 {