From patchwork Fri Sep 14 13:22:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Elwell X-Patchwork-Id: 10600787 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 65195112B for ; Fri, 14 Sep 2018 13:26:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49EB32B698 for ; Fri, 14 Sep 2018 13:26:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C1062B6A4; Fri, 14 Sep 2018 13:26:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A940D2B698 for ; Fri, 14 Sep 2018 13:26:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ClnVQv56kLAu2Lp8so8UijxXXsjnqoMm/FMMwZAmUcY=; b=dGGHHErsrlWNsa dgGY1WtFDlaFNzrRKB5ZGv0aTgDH0EoPkZBz72xV2VX+eqBVDyd3Jte+jzaz11KgUhtKR5I13S/E/ 63usFOXxRXkZy1vq8JKmYhnyMKTwG4ay7MwpdiYkIV2l04QavLC/iFOJAupn50GBKssw/lQxTTK59 vPOdliyIGOvAR3gYjkhOJwHy4qIhLWkxT+Z1LT/XRG7832OeH/IvZudtfiA7CYMfRS5YabQwFwapz mzl8zWV5H73UWvb2BGAnSieVhcJICvwreWvv9t9VLCbIvJiELHVIqOMTb4HHYeFmAWAaRCHeZ5kGk EXlHFtrFo0Wt/i8QhjTQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0o6y-0003UP-Is; Fri, 14 Sep 2018 13:26:16 +0000 Received: from mx07-00252a01.pphosted.com ([62.209.51.214]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0o4c-0001HW-K0 for linux-arm-kernel@lists.infradead.org; Fri, 14 Sep 2018 13:23:57 +0000 Received: from pps.filterd (m0102628.ppops.net [127.0.0.1]) by mx07-00252a01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8ED82ZL027724 for ; Fri, 14 Sep 2018 14:23:41 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : to : subject : date : message-id : in-reply-to : references; s=pp; bh=pKi84y+keahwARTFwSxVyQpsxR4R0x2Sufg1qgudeCU=; b=hsmYu+pT4VDMI+k2nQjKl5QtuZDQQc6WLKlMiP6/cpC1TOKiIKh2Wr2ZjG7+vWesErTS 1VrPpEvHBq1C5MpaBHXZpxTDA7SS4V7iup4nApNF5Guy4YdkFi07LZ72+wdYFhJylclz lm+IyCfKsKXKq1FEXRJQKeek+Sy9LXRJCJenzmNeCypgclTCNXEMt2ZzzyNW7fjHT+WY mWk/+L9RDtzC8QxiAO2iGEl98AIK7WoLNGozCXqRY9BX8LXxcQHZV/PmmuFWwSKzD9B5 OmHE6huaB8rgz8Vi6DM7oW13e8X5XH1W2pu9B479DwQ/Fk6hEmZDjcOIJHua2rm2IuOt hQ== Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mx07-00252a01.pphosted.com with ESMTP id 2mc3u0k3r8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Fri, 14 Sep 2018 14:23:41 +0100 Received: by mail-wr1-f69.google.com with SMTP id t10-v6so9843998wrs.17 for ; Fri, 14 Sep 2018 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=pKi84y+keahwARTFwSxVyQpsxR4R0x2Sufg1qgudeCU=; b=A9W/6v/3uZ1VyK1rF2Sg6ZD3zlHhcvdaIyA610v4m5wE2IGX5C/5L3zWmxVLSjLCpF tQbLm7F0fE9g/uc1vBZsrgbDJW9O6d5C3OSEJD1aPVmoGsWHDCtU7zrEHJuRpmjSWxYt YoPmsV/s7+DBw+FHcV6rCx05jQv1+ST5++B5Cin7fc6U6TQgVeM2UUJzA822FQ//Qqz/ ZWiBlrBRsrsJL3rwrDq1jNNBC1VQh3bCGMYM3c6aO7fZurt8326r6ONOzobdPx59N2N6 B93s6lE7Vws3mmQJtQYqteqmVoyplx55yGZI6K+3sU+wrVBR+qSdvWB1yjkNKNgaZTXr QZPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pKi84y+keahwARTFwSxVyQpsxR4R0x2Sufg1qgudeCU=; b=akBafiX1BcuXQYVpIQftC3Bq/37TWi3+Q30Zlbjow/T8OBLEUbqOxBGWJmJnA3nKWq +zreIUx0jB4OPACPCC0uL9YiIYcNUbz6i9sBk7EhZcQWTdTo8MVG9mFHtYBpgK1vK8Gs aLeLbnJNQMzJ9l+Fq9NzEZB2vtck7iU3mAFJCyNIUaVbH2BH/gk4RtbdUttcv2CNWlvG y3fiLPR0FzWee9bEzRW/EROy52PEqYQjVCxBtmc5+rwh78fuMP1shEzjCs5wvq+LSWkM R/nu+2UwRemZwphsV/BfcDinxhm5kMw9p6oQrqBfeShyJ90s42FEMD9dveN4d2A0msbL LHfg== X-Gm-Message-State: APzg51A0jVMqFLxYjJzKQ+M01QXhms5stx/0EoQG5Unh1jBtsZt93O1+ YqrKk/267D3JHqdgxVcmYE40VdLt/srvAFj4nm47uQzt7yoFkaUHKwiFODl2HogKQ2VuPmX0vc9 pcHw1qjOcpjs2SucBsCfFXhpCr/MjkV8Uj0c= X-Received: by 2002:a1c:8c0b:: with SMTP id o11-v6mr2442927wmd.11.1536931420835; Fri, 14 Sep 2018 06:23:40 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda3NMXw6jH3VtS+c8hJUQU3EzY5aICGGrWImJlSBOPwl7Xq0TD/IqkxTy7N7TRYt1b3CUrmDw== X-Received: by 2002:a1c:8c0b:: with SMTP id o11-v6mr2442904wmd.11.1536931420493; Fri, 14 Sep 2018 06:23:40 -0700 (PDT) Received: from buildbot.pitowers.org ([2a00:2381:fdf7:14:910f:6f88:c896:5552]) by smtp.gmail.com with ESMTPSA id i125-v6sm2505703wmd.23.2018.09.14.06.23.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Sep 2018 06:23:39 -0700 (PDT) From: Phil Elwell To: Rob Herring , Stefan Wahren , Greg Kroah-Hartman , Phil Elwell , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Russell King , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, devel@driverdev.osuosl.org Subject: [PATCH v2 3/4] ARM: dts: bcm283x: Correct vchiq compatible string Date: Fri, 14 Sep 2018 14:22:54 +0100 Message-Id: <1536931375-48769-4-git-send-email-phil@raspberrypi.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> References: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-09-14_06:, , signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180914_062351_055501_8FE92B7B X-CRM114-Status: GOOD ( 19.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP To allow VCHIQ to determine the correct cache line size, use the new "brcm,bcm2836-vchiq" compatible string on BCM2836 and BCM2837. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +- arch/arm/boot/dts/bcm2836-rpi.dtsi | 6 ++++++ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +- arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +- arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2836-rpi.dtsi diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index cb2d6d7..215d8cc 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -30,7 +30,7 @@ #power-domain-cells = <1>; }; - mailbox@7e00b840 { + vchiq: mailbox@7e00b840 { compatible = "brcm,bcm2835-vchiq"; reg = <0x7e00b840 0xf>; interrupts = <0 2>; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index 2fef70a..ac4408b 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; #include "bcm2836.dtsi" -#include "bcm2835-rpi.dtsi" +#include "bcm2836-rpi.dtsi" #include "bcm283x-rpi-smsc9514.dtsi" #include "bcm283x-rpi-usb-host.dtsi" diff --git a/arch/arm/boot/dts/bcm2836-rpi.dtsi b/arch/arm/boot/dts/bcm2836-rpi.dtsi new file mode 100644 index 0000000..c4c858b --- /dev/null +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "bcm2835-rpi.dtsi" + +&vchiq { + compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq"; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts index 4adb85e..eca36e3 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; #include "bcm2837.dtsi" -#include "bcm2835-rpi.dtsi" +#include "bcm2836-rpi.dtsi" #include "bcm283x-rpi-lan7515.dtsi" #include "bcm283x-rpi-usb-host.dtsi" diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts index c318bcb..a0ba0f6 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; #include "bcm2837.dtsi" -#include "bcm2835-rpi.dtsi" +#include "bcm2836-rpi.dtsi" #include "bcm283x-rpi-smsc9514.dtsi" #include "bcm283x-rpi-usb-host.dtsi" diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi index 7b7ab6a..4a89a18 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; #include "bcm2837.dtsi" -#include "bcm2835-rpi.dtsi" +#include "bcm2836-rpi.dtsi" / { memory {