summaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorMarc Zyngier2013-05-30 19:31:28 +0200
committerMarc Zyngier2013-06-12 17:40:31 +0200
commitf61701e0a24a09aa4a44baf24e57dcc5e706afa8 (patch)
tree49adf25453d9fd0cac186590bf98311b9b0ede65 /arch/arm/kvm
parentarm64: KVM: Plug the VGIC (diff)
downloadkernel-qcow2-linux-f61701e0a24a09aa4a44baf24e57dcc5e706afa8.tar.gz
kernel-qcow2-linux-f61701e0a24a09aa4a44baf24e57dcc5e706afa8.tar.xz
kernel-qcow2-linux-f61701e0a24a09aa4a44baf24e57dcc5e706afa8.zip
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>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r--arch/arm/kvm/arch_timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kvm/arch_timer.c b/arch/arm/kvm/arch_timer.c
index c55b6089e923..49a7516d81c7 100644
--- a/arch/arm/kvm/arch_timer.c
+++ b/arch/arm/kvm/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", },
{},
};