From patchwork Mon Oct 21 01:27:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Hildebrand X-Patchwork-Id: 11201187 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 162EF112B for ; Mon, 21 Oct 2019 01:29:54 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EF77F21928 for ; Mon, 21 Oct 2019 01:29:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF77F21928 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=dornerworks.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iMMUR-0000OU-Jq; Mon, 21 Oct 2019 01:28:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iMMUQ-0000OP-FR for xen-devel@lists.xenproject.org; Mon, 21 Oct 2019 01:28:06 +0000 X-Inumbo-ID: 06ba41c3-f3a2-11e9-943a-12813bfff9fa Received: from webmail.dornerworks.com (unknown [12.207.209.150]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 06ba41c3-f3a2-11e9-943a-12813bfff9fa; Mon, 21 Oct 2019 01:28:04 +0000 (UTC) From: Stewart Hildebrand To: Date: Sun, 20 Oct 2019 21:27:55 -0400 Message-ID: <20191021012755.2671-1-stewart.hildebrand@dornerworks.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Originating-IP: [172.27.14.1] X-ClientProxiedBy: Mcbain.dw.local (172.27.1.45) To Mcbain.dw.local (172.27.1.45) X-spam-status: No, score=-2.9 required=3.5 tests=ALL_TRUSTED, BAYES_00, MAILSHELL_SCORE_0_4 X-Spam-Flag: NO Subject: [Xen-devel] [XEN PATCH for-4.13 v3] xen/arm: platform: fix Raspberry Pi compatible string X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Volodymyr Babchuk , Julien Grall , Stefano Stabellini , Julien Grall Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Both upstream [1] and downstream [2] Linux kernels use "brcm,bcm2711" as the compatible string for Raspberry Pi 4. Add this string to our platform compatible list. The brcm,bcm2838 convention is abandoned. Remove it. Rename the variables within the file to a rpi4_* prefix since the file is meant to cover the Raspberry Pi 4 platform. If you are using a device tree with the old compatible string brcm,bcm2838, you will need to upgrade your device tree to one that has the new brcm,bcm2711 compatible string. [1] https://patchwork.kernel.org/patch/11165407/ [2] https://github.com/raspberrypi/linux/commit/53fdd7b8c8cb9c87190caab4fd459f89e1b4a7f8 Signed-off-by: Stewart Hildebrand Acked-by: Julien Grall --- v2: * Remove abandoned bcm2838 convention * Rename variables within file with rpi4_* prefix v3: * Add note to commit message * CC Juergen --- xen/arch/arm/platforms/brcm-raspberry-pi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/platforms/brcm-raspberry-pi.c b/xen/arch/arm/platforms/brcm-raspberry-pi.c index e22d2b3184..b697fa2c6c 100644 --- a/xen/arch/arm/platforms/brcm-raspberry-pi.c +++ b/xen/arch/arm/platforms/brcm-raspberry-pi.c @@ -19,13 +19,13 @@ #include -static const char *const brcm_bcm2838_dt_compat[] __initconst = +static const char *const rpi4_dt_compat[] __initconst = { - "brcm,bcm2838", + "brcm,bcm2711", NULL }; -static const struct dt_device_match brcm_bcm2838_blacklist_dev[] __initconst = +static const struct dt_device_match rpi4_blacklist_dev[] __initconst = { /* * The aux SPIs share an IRQ and a page with the aux UART. @@ -40,9 +40,9 @@ static const struct dt_device_match brcm_bcm2838_blacklist_dev[] __initconst = { /* sentinel */ }, }; -PLATFORM_START(brcm_bcm2838, "Raspberry Pi 4") - .compatible = brcm_bcm2838_dt_compat, - .blacklist_dev = brcm_bcm2838_blacklist_dev, +PLATFORM_START(rpi4, "Raspberry Pi 4") + .compatible = rpi4_dt_compat, + .blacklist_dev = rpi4_blacklist_dev, PLATFORM_END /*