From patchwork Fri Mar 24 14:46:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 9643019 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 37EFF60327 for ; Fri, 24 Mar 2017 14:49:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B278205FD for ; Fri, 24 Mar 2017 14:49:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FDDC22376; Fri, 24 Mar 2017 14:49:57 +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 AA1F3205FD for ; Fri, 24 Mar 2017 14:49:56 +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=nyO0KwI7sklnZUtcxLyUoBE+I2S4hbOuyfy6+XvyQ0I=; b=JTDf+El8GPvEvtLLOtBckypGfT gyeHVMlntUzGAjmjB+4Rxcj0i3yruxP8qK+wvGJDKw5OmzFmd9uqvHEln5fRh0aw3ceXh1PQHDkLA mSaePs8VGr6tkKlVZZMW1r+qUyItMlU9HoZsoLGi25ABPY6ZVpBzXOaSqSU9hNxmDMwpoH+Ag8GAe WNefx/TMulgVF+Fuyc1L4FMyLQEbitOu+WIekJAe6UShXx+pBHWcKUvqYYTWRbD7PCYIw5nlNTlK1 Tvfe6d2xZIgEQ3uHi+t/W8G8ox5Ud7ThP65UGYwg3gHRsY8mLYVfcJ0yPhk/6zqV/JH70HF8NmWa8 +Q7kOMUQ==; 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 1crQXD-0003rO-Ej; Fri, 24 Mar 2017 14:49:47 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1crQWE-0002Xy-Ah for linux-arm-kernel@lists.infradead.org; Fri, 24 Mar 2017 14:48:48 +0000 Received: by mail-wm0-x242.google.com with SMTP id n11so1068682wma.0 for ; Fri, 24 Mar 2017 07:48:26 -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=Iwib2laRp1e7KXpiXYwsE1cwlYlORAyN/lYfspxFgq4=; b=P6QwEklywZb6szEchCfhfcO3B42pG5msPHBH7F/WR/LvCLvjBJpjKVDlfzp7agC0iE 20Y2Hrb4TRo/jMyMHcUrAyF4CRJtmwqXERlUNbiZo9i+0qie6ZLwKWmljY5iFnocwsjo T8zpzmjTV2fq+bM1rR0nkSt2LeJIBWVGpy8T/f5Ia5Tsi5/H68fuEe7n1Mm1ghNdngxo iyVv1MZ8nrH2tDtofOpO6G0puSPNrkYDmYPq0ZsPfndfAKD0Tee9zcT4NCzxwS3pmLRu I8JIxQrXtxEqKJqh5HR84qF7/tkGckeJKMKi66dG0C72OXsCfZKBNNzszoCzdTUwOSLJ Op0Q== 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=Iwib2laRp1e7KXpiXYwsE1cwlYlORAyN/lYfspxFgq4=; b=hz7prT9hD6g6np+d8RWh0GNmz19IB2cdAavv5lYBgfK50JT2BKnytYAfQUNVnMxxdl 6kftoEm5390WrGV2Bw7Fv+p0UfczhdOw/jvdm5SwXWtAhXfoWBej24ypiek6DPBkUr+M hkA3xVRd3TNlT4FNZeGuJ1AhMVfO9MuHdlhYw6AboAflOpU2HV9zSad9yrw4/MvTSKNX lS/xuI06PFypBmxT/bfa5+XFWVOXN0u/I75U+WNrvjhCihxmLUkUHtGMNt8EZu6sY0v3 5wS65x45Dd+Pol0Ed1j9uasyamJYqulOKc4aGala/8Q1A8dDPyJ5WXiu0Jq5v6jsZsl4 5znA== X-Gm-Message-State: AFeK/H33cqSD0tHWp+BrboaLRXCCxuSh4nyRxnX6l/xMR1JcGsqROURZ6P3hZK3RiQXpug== X-Received: by 10.28.87.6 with SMTP id l6mr3336010wmb.109.1490366904796; Fri, 24 Mar 2017 07:48:24 -0700 (PDT) Received: from stb-bld-02.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id k32sm3154947wre.18.2017.03.24.07.48.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Mar 2017 07:48:24 -0700 (PDT) From: Doug Berger To: catalin.marinas@arm.com Subject: [PATCH 9/9] bus: brcmstb_gisb: update to support new revision Date: Fri, 24 Mar 2017 07:46:32 -0700 Message-Id: <20170324144632.5896-10-opendmb@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170324144632.5896-1-opendmb@gmail.com> References: <20170324144632.5896-1-opendmb@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170324_074846_589695_109FB1FC X-CRM114-Status: GOOD ( 11.53 ) 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: mark.rutland@arm.com, wangkefeng.wang@huawei.com, linus.walleij@linaro.org, will.deacon@arm.com, mingo@kernel.org, panand@redhat.com, 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, vladimir.murzin@arm.com, cmetcalf@mellanox.com, suzuki.poulose@arm.com, andre.przywara@arm.com, robh+dt@kernel.org, gregory.0xf0@gmail.com, sandeepa.s.prabhu@gmail.com, horms+renesas@verge.net.au, 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 --- 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 52b5d96081eb..a91c4ae63e74 100644 --- a/drivers/bus/brcmstb_gisb.c +++ b/drivers/bus/brcmstb_gisb.c @@ -63,6 +63,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, @@ -329,6 +338,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 }, { }, };