From: Marc Zyngier <marc.zyngier@arm.com>
Date: Thu, 30 May 2013 17:31:28 +0000 (+0100)
Subject: ARM: KVM: timer: allow DT matching for ARMv8 cores
X-Git-Tag: firefly_0821_release~3680^2~36^2~16^2^2~265
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=615fd459aa42eb0450667fb191c1931a1da749b3;p=firefly-linux-kernel-4.4.55.git

ARM: KVM: timer: allow DT matching for ARMv8 cores

ARMv8 cores have the exact same timer as ARMv7 cores. Make sure the
KVM timer code can match it in the device tree.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
(cherry picked from commit f61701e0a24a09aa4a44baf24e57dcc5e706afa8)
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---

diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 2d00b2925780..6f485eaf643b 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -195,6 +195,7 @@ static struct notifier_block kvm_timer_cpu_nb = {
 
 static const struct of_device_id arch_timer_of_match[] = {
 	{ .compatible	= "arm,armv7-timer",	},
+	{ .compatible	= "arm,armv8-timer",	},
 	{},
 };