From patchwork Tue Mar 28 21:34:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 9650535 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C3D63601D7 for ; Tue, 28 Mar 2017 21:36:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAABA2839B for ; Tue, 28 Mar 2017 21:36:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF16D28405; Tue, 28 Mar 2017 21:36:40 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 6B1792839B for ; Tue, 28 Mar 2017 21:36:40 +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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=FO3QKfQujHWjzpicVBdhPBOCNLHNiFfmj/hpfDqMXBI=; b=ZM1F5D7XGnDXtwpZP6w/bbtRGV Jc+C9U+pP3JZUY2QS41+aWyzlMKtDlK3IWlLZ3iTTP+/4r5FcYndqYUoVecBs3DcdwScs53nibgIW /ri3A0z0ra6uNUpovOwtGHENguYXlvUbhks8YkB5qP6hr5Zuml3sRY7b3CSxjYmsqypKshsW+9F6e yLA6gjW1mi5gz/pHn4nS4Ova0qqJW/dAg/mZbklUXTM9YaxlUeu3mKZx6vnBJ8tGb70x8Sn20QVur 0RVvNKFkcprt1HtV97LeUEuoxvHA/ipcz3xdBaFQPosDrJK5rhKC3rQzXx8wUX2xkRRT1wm5SXgRj dFpte14g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1csyn9-00055A-Gz; Tue, 28 Mar 2017 21:36:39 +0000 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csymJ-0003p6-Kf for linux-arm-kernel@lists.infradead.org; Tue, 28 Mar 2017 21:35:49 +0000 Received: by mail-qk0-x244.google.com with SMTP id f11so11354027qkb.2 for ; Tue, 28 Mar 2017 14:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tIHX3QtfTzXru1sO7KdG66RMKLbAFTNUMf5UGXcBbs0=; b=oq9qg6IJ5CgOpXAuV3owukXvQfW6bcEBA1rn1xK6O+plvdr03JaYKJaQuZYZWvclIl Mr5eetihmtFGJ6Y3hqOjJpparWCFsv3dAKljnhyA5Wc5KOiUwRdusMyXy1zXEDXIZcG6 x7Hs3Cp3qfMaT7tFi/AVP+x5J7z0hJ39ZuknUfeaaYIhxdJ0u6dsvEie5S94UMS1YpG1 NICc8udJcHH+7T/8PNOIp15E7TFe7DaziP+u4bilF1/iMsTw6/HglLIvyXTlf2rYWoU3 Dztbcj/j1coRN2aXQd8QTSftVY3qA9B2uCkGFBbipLqEwl++zGJJVhDQekD/WFBuZRrv xjAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tIHX3QtfTzXru1sO7KdG66RMKLbAFTNUMf5UGXcBbs0=; b=UpOFOTdoEBDjMNawFIODZKkDK2OuKOTw/01f+TACpxSFU3hua+vplflaqyLhqG0k+m gT0hyR9qlzn49XDhp3gk37WCOn7OzKJVT/kmjlMvEKXQTA46zFjKYQQwLJGDI8Brq3Y5 jOypdrh1eYDLtojvQ8UkJrd+fveJ/PtLYsRmlEnIs2Y/v59yqG6fu+CSoNIAq9UfXaMV BVNRdMRm17c8o+5T2Vv915iTFmGwZoRlWx14jC+TNBV3gxrH0uC4zo6VNc0qgOqG8teZ uMrOdVZgnwnGMYZIVDhFfNTjcLYERdaOFSE+6hSDGxFGGL5ycjvnqkJgLlzA/c3LcVpe efrw== X-Gm-Message-State: AFeK/H26g7Z2wb0ZOVoCj67etnB8jOwepW3xIWn6wp1nhJ9WmUITrMosYDRfFvnOjEo4VA== X-Received: by 10.233.222.69 with SMTP id s66mr30228269qkf.126.1490736926316; Tue, 28 Mar 2017 14:35:26 -0700 (PDT) Received: from stb-bld-02.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id a26sm3540762qtb.28.2017.03.28.14.35.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2017 14:35:25 -0700 (PDT) From: Doug Berger To: mark.rutland@arm.com Subject: [PATCH v2 8/8] bus: brcmstb_gisb: update to support new revision Date: Tue, 28 Mar 2017 14:34:31 -0700 Message-Id: <20170328213431.10904-9-opendmb@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170328213431.10904-1-opendmb@gmail.com> References: <20170328213431.10904-1-opendmb@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170328_143547_771320_AC39D015 X-CRM114-Status: GOOD ( 12.65 ) 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: , Cc: wangkefeng.wang@huawei.com, catalin.marinas@arm.com, linus.walleij@linaro.org, will.deacon@arm.com, mingo@kernel.org, f.fainelli@gmail.com, jonathanh@nvidia.com, bgolaszewski@baylibre.com, bcm-kernel-feedback-list@broadcom.com, shijie.huang@arm.com, opendmb@gmail.com, treding@nvidia.com, devicetree@vger.kernel.org, suzuki.poulose@arm.com, robh+dt@kernel.org, gregory.0xf0@gmail.com, sandeepa.s.prabhu@gmail.com, linux-arm-kernel@lists.infradead.org, mirza.krak@gmail.com, linux-kernel@vger.kernel.org, james.morse@arm.com, olof@lixom.net, computersforpeace@gmail.com 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 The 7278 introduces a new version of this core. This commit adds support for that revision. Signed-off-by: Doug Berger Acked-by: Mark Rutland --- Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt | 3 ++- drivers/bus/brcmstb_gisb.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt b/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt index 1eceefb20f01..8a6c3c2e58fe 100644 --- a/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt +++ b/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt @@ -3,7 +3,8 @@ Broadcom GISB bus Arbiter controller Required properties: - compatible: - "brcm,gisb-arb" or "brcm,bcm7445-gisb-arb" for 28nm chips + "brcm,bcm7278-gisb-arb" for V7 28nm chips + "brcm,gisb-arb" or "brcm,bcm7445-gisb-arb" for other 28nm chips "brcm,bcm7435-gisb-arb" for newer 40nm chips "brcm,bcm7400-gisb-arb" for older 40nm chips and all 65nm chips "brcm,bcm7038-gisb-arb" for 130nm chips diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c index 774729002b8c..6c3b0dda75f2 100644 --- a/drivers/bus/brcmstb_gisb.c +++ b/drivers/bus/brcmstb_gisb.c @@ -65,6 +65,15 @@ static const int gisb_offsets_bcm7038[] = { [ARB_ERR_CAP_MASTER] = -1, }; +static const int gisb_offsets_bcm7278[] = { + [ARB_TIMER] = 0x008, + [ARB_ERR_CAP_CLR] = 0x7f8, + [ARB_ERR_CAP_HI_ADDR] = -1, + [ARB_ERR_CAP_ADDR] = 0x7e0, + [ARB_ERR_CAP_STATUS] = 0x7f0, + [ARB_ERR_CAP_MASTER] = 0x7f4, +}; + static const int gisb_offsets_bcm7400[] = { [ARB_TIMER] = 0x00c, [ARB_ERR_CAP_CLR] = 0x0c8, @@ -328,6 +337,7 @@ static const struct of_device_id brcmstb_gisb_arb_of_match[] = { { .compatible = "brcm,bcm7445-gisb-arb", .data = gisb_offsets_bcm7445 }, { .compatible = "brcm,bcm7435-gisb-arb", .data = gisb_offsets_bcm7435 }, { .compatible = "brcm,bcm7400-gisb-arb", .data = gisb_offsets_bcm7400 }, + { .compatible = "brcm,bcm7278-gisb-arb", .data = gisb_offsets_bcm7278 }, { .compatible = "brcm,bcm7038-gisb-arb", .data = gisb_offsets_bcm7038 }, { }, };