From: Samuel Holland <samuel@sholland.org>
Date: Sun, 13 Jan 2019 02:17:19 +0000 (-0600)
Subject: arm64: dts: allwinner: a64: Enable A64 timer workaround
X-Git-Tag: archive/raspbian/5.2.17-1+rpi1^2^2^2~213
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=16f2e3da266d0e432234cdf4b146fa5eb7a6d66b;p=linux.git

arm64: dts: allwinner: a64: Enable A64 timer workaround

As instability in the architectural timer has been observed on multiple
devices using this SoC, inluding the Pine64 and the Orange Pi Win,
enable the workaround in the SoC's device tree.

Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

Gbp-Pq: Topic bugfix/arm64
Gbp-Pq: Name arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch
---

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index d3daf90a871..7bc32fdb1fe 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -159,6 +159,7 @@
 
 	timer {
 		compatible = "arm,armv8-timer";
+		allwinner,erratum-unknown1;
 		interrupts = <GIC_PPI 13
 			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
 			     <GIC_PPI 14