From patchwork Thu Mar 30 00:29:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 9652799 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 689626034B for ; Thu, 30 Mar 2017 00:36:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 584D327165 for ; Thu, 30 Mar 2017 00:36:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BDEB28569; Thu, 30 Mar 2017 00:36:06 +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 E182D27165 for ; Thu, 30 Mar 2017 00:36:05 +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=HqU11+Csm4P0Juc33yxvFBjAifKfKGmjFA2Ok1qVM14=; b=OS73gxW0GS0qkO3FY2C7Uy+5HF PPXpyNg+S5Et5+3uYAI4VckfFW2TmyglZ4dbLiG49KBx2B6FDQRavRXZceSEp20o943+1zSnCuFzW 5GwKloYVLqpP6uDUiWA30J8KOkrW6P5olJq0gKQRfGoF0xLGZiK4M5w1BpXyYBoQJ1y70kaf3eA5v nX2AfmKk3Eogkz9ivqr/nsq+MI75jdnWhfTl1lANFkJ6hNqZRbo5t7Wsq40eBseujAa8HxceEg5Yv 5kxc7XSgdzBabMtV8ss8cFg/LX4ArUklwRx2G4OIm01BsVdfia+duKLY+FOq9BagZROQ28NoV4CVa 2D1mV9iQ==; 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 1ctO4H-0006za-Pv; Thu, 30 Mar 2017 00:36:01 +0000 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ctNyi-0001vE-U9 for linux-arm-kernel@lists.infradead.org; Thu, 30 Mar 2017 00:30:20 +0000 Received: by mail-qt0-x242.google.com with SMTP id n37so4254670qtb.3 for ; Wed, 29 Mar 2017 17:29:56 -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=4C1M8TFIpCtgW8Iv+VdjV7u4tbnVf//Ed2b11tcUzJY=; b=p299IpBnCV0qqNZ/CSbAwI0iIMRZlkA18gzlkgEYoJeYafzKLxsAQ4BwcWkgAwVIjg NOgwBmDLdxdVlYfBuOvfoFH/8y+NAcVKrSZXME7HjRCferXkHE+Ys2doNBKQJTy3/Oyt kznTDI/+Dv8coaKsP3HRhmiDAnNkRItSnn9ItQLZOBar/mHAuxRRW1etyK3JwJhipbEk GeXeTZDW1PY0zJ7HvvqLZ5YNFf27I0i733TdPHptaXjWbnGus+p5uhE2WVFASLoOGuAQ D+ic9T+k7jDlyqkpH7/qW+/pdlkYSBrkyHZqS++vixV8h0CFgomp+9GZIoGNUcJGr+Da kTzA== 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=4C1M8TFIpCtgW8Iv+VdjV7u4tbnVf//Ed2b11tcUzJY=; b=hRDDHN5Bw8/X6Ixq7nUCuXNK5L3ETi5rEcMmqK/NuuiVXacfEHFqaZXNMrKKpS7r8K B8g8pxvJCgBw3TWFHlnRLuZ5gLJDJdaMmPcGSWxBk1xutgrUy0CRgPHSGgHld9b77QMv I2KS/B7SYYI/DnCxfuplkWu2KuJUFdNUQsVyB7HRi9CVkQkMaQ6bgfiavLjfW60SWyMA 91oqIfqe3+Xihxav7JBReLihT4ZZCGxRfZnusYt8W02V/+/WGkTtZAN74IumvzkqcMiV W8z4QBEmK+ssE2pMhrcZX7xAmkhpFFn8xHk1q/Lyp+jGnuhpkllE7bUthf6fYTvqALLQ qK/A== X-Gm-Message-State: AFeK/H1fslweYVVLOnpNLqDLp2qtD4i/F4AtT+Kv4asWWstk7/8+zUR0//fFyTjnuIoVeg== X-Received: by 10.200.3.46 with SMTP id q46mr3756259qtg.243.1490833795331; Wed, 29 Mar 2017 17:29:55 -0700 (PDT) Received: from stb-bld-02.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id t47sm368450qte.45.2017.03.29.17.29.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Mar 2017 17:29:54 -0700 (PDT) From: Doug Berger To: mark.rutland@arm.com Subject: [PATCH v3 6/6] bus: brcmstb_gisb: update to support new revision Date: Wed, 29 Mar 2017 17:29:14 -0700 Message-Id: <20170330002914.7371-7-opendmb@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170330002914.7371-1-opendmb@gmail.com> References: <20170330002914.7371-1-opendmb@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170329_173017_261112_09051D5B X-CRM114-Status: GOOD ( 12.04 ) 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: treding@nvidia.com, f.fainelli@gmail.com, mirza.krak@gmail.com, catalin.marinas@arm.com, linus.walleij@linaro.org, suzuki.poulose@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, jonathanh@nvidia.com, bgolaszewski@baylibre.com, devicetree@vger.kernel.org, robh+dt@kernel.org, bcm-kernel-feedback-list@broadcom.com, gregory.0xf0@gmail.com, olof@lixom.net, Doug Berger , computersforpeace@gmail.com, linux-arm-kernel@lists.infradead.org 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 3fbc116e6b95..68ac3e93b600 100644 --- a/drivers/bus/brcmstb_gisb.c +++ b/drivers/bus/brcmstb_gisb.c @@ -56,6 +56,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, @@ -307,6 +316,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 }, { }, };