From: Michal Orzel <michal.orzel@arm.com>
Date: Thu, 14 Apr 2022 09:58:43 +0000 (+0200)
Subject: xen/arm: Make use of DT_MATCH_TIMER in make_timer_node
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~732
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7e2a2defeb4f82efaf316396165de353130f6a4b;p=xen.git

xen/arm: Make use of DT_MATCH_TIMER in make_timer_node

DT_MATCH_TIMER stores the compatible timer ids and as such should be
used in all the places where we need to refer to them. make_timer_node
explicitly lists the same ids as the ones defined in DT_MATCH_TIMER so
make use of this macro instead.

Signed-off-by: Michal Orzel <michal.orzel@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 8be01678de..1472ca4972 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1672,8 +1672,7 @@ static int __init make_timer_node(const struct kernel_info *kinfo)
     void *fdt = kinfo->fdt;
     static const struct dt_device_match timer_ids[] __initconst =
     {
-        DT_MATCH_COMPATIBLE("arm,armv7-timer"),
-        DT_MATCH_COMPATIBLE("arm,armv8-timer"),
+        DT_MATCH_TIMER,
         { /* sentinel */ },
     };
     struct dt_device_node *dev;