From patchwork Thu Nov 6 10:12:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 40270 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6430A24237 for ; Thu, 6 Nov 2014 10:15:06 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf457043lbg.1 for ; Thu, 06 Nov 2014 02:15:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=GTel3WuqyNw8Mh2UoqIUxNqJo+PAApag/zI+HF89/a8=; b=TiqWKlweQpBVKrvZIl0L0YS0L/2K4rY63P5RuNMebADb1qGnK6VomLfSWQzFywnjTO uZyrpGwLiZRJTJ4sbY4Twvj0mVCozhyGUB2AtSwdGNd5h6bDY7Z2PkiLnzSw1CvCdL9n P7q0SRA2ItQ+hdfaomR8HOOi/rNxfgleOkqycep2tRSce5H25u55LiD0NJLAdnzGkDF4 B0MbzQbxqqddcfo/U5FQebEg7BPJbjoI+h4vAKXliXCj0yulNKhe34Z+tMx/ldY+cUCS 1YGp8ft5VJ0W04lXW2p4YmaZRI2SXWxKCXg+/Au5bjMeEy9Jxe7dOBnztiwmEcZN8yak EDBw== X-Gm-Message-State: ALoCoQln9qVpHEWZx4QEci8C96Yg91mZo3WRSO4L/yTXorFO4Nb4ULxqT0dVIaD2wtEkBo/BK/qe X-Received: by 10.180.182.164 with SMTP id ef4mr1814218wic.0.1415268905289; Thu, 06 Nov 2014 02:15:05 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.38 with SMTP id n6ls58202laj.86.gmail; Thu, 06 Nov 2014 02:15:05 -0800 (PST) X-Received: by 10.152.234.136 with SMTP id ue8mr3996957lac.21.1415268905040; Thu, 06 Nov 2014 02:15:05 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id rf8si10693186lbb.139.2014.11.06.02.15.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Nov 2014 02:15:04 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id l4so635662lbv.10 for ; Thu, 06 Nov 2014 02:15:04 -0800 (PST) X-Received: by 10.152.29.8 with SMTP id f8mr4090252lah.56.1415268904768; Thu, 06 Nov 2014 02:15:04 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp21725lbc; Thu, 6 Nov 2014 02:15:02 -0800 (PST) X-Received: by 10.224.88.134 with SMTP id a6mr5176764qam.28.1415268901498; Thu, 06 Nov 2014 02:15:01 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id d7si11098358qga.43.2014.11.06.02.15.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 06 Nov 2014 02:15:01 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XmK4D-0008Ne-86; Thu, 06 Nov 2014 10:13:25 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XmK4C-0008Mg-8i for xen-devel@lists.xen.org; Thu, 06 Nov 2014 10:13:24 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 15/6F-09842-3C94B545; Thu, 06 Nov 2014 10:13:23 +0000 X-Env-Sender: frediano.ziglio@huawei.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1415268799!11877987!1 X-Originating-IP: [119.145.14.65] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTE5LjE0NS4xNC42NSA9PiA3NzQ2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10239 invoked from network); 6 Nov 2014 10:13:22 -0000 Received: from szxga02-in.huawei.com (HELO szxga02-in.huawei.com) (119.145.14.65) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2014 10:13:22 -0000 Received: from 172.24.2.119 (EHLO szxeml460-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CBY66982; Thu, 06 Nov 2014 18:13:17 +0800 (CST) Received: from localhost.localdomain (10.47.67.20) by szxeml460-hub.china.huawei.com (10.82.67.203) with Microsoft SMTP Server id 14.3.158.1; Thu, 6 Nov 2014 18:13:09 +0800 From: Frediano Ziglio To: Ian Campbell , Stefano Stabellini , Tim Deegan , Julien Grall , Date: Thu, 6 Nov 2014 10:12:08 +0000 Message-ID: <1415268731-6519-5-git-send-email-frediano.ziglio@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415268731-6519-1-git-send-email-frediano.ziglio@huawei.com> References: <1415268731-6519-1-git-send-email-frediano.ziglio@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.67.20] X-CFilter-Loop: Reflected Cc: zoltan.kiss@huawei.com, xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH v3 4/7] xen/arm: Add support for DTBs with strange names of Hip04 GICv2 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: frediano.ziglio@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This name can appear in some Linux kernel repos. Not very fortunate, but to avoid others spending an hour to spot that few characters difference it worth to work around it. Signed-off-by: Zoltan Kiss --- xen/arch/arm/gic-v2.c | 1 + xen/include/asm-arm/gic.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 3cb59dd..9ab30ce 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -823,6 +823,7 @@ DT_DEVICE_END static const char * const hip04_gicv2_dt_compat[] __initconst = { DT_COMPAT_GIC_HIP04, + DT_COMPAT_GIC_HIP04_2, NULL }; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index c880867..f8ba227 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -156,11 +156,13 @@ #define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" #define DT_COMPAT_GIC_CORTEX_A7 "arm,cortex-a7-gic" #define DT_COMPAT_GIC_HIP04 "hisilicon,hip04-intc" +#define DT_COMPAT_GIC_HIP04_2 "hisilicon,hip04-gic" #define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7), \ DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_400), \ - DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_HIP04) + DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_HIP04), \ + DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_HIP04_2) #define DT_COMPAT_GIC_V3 "arm,gic-v3"