From patchwork Tue Mar 28 21:34:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 9650577 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 AA6B1601E9 for ; Tue, 28 Mar 2017 22:05:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F91E28421 for ; Tue, 28 Mar 2017 22:05:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F91728425; Tue, 28 Mar 2017 22:05:46 +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=ham 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 2FA8328421 for ; Tue, 28 Mar 2017 22:05:46 +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=o4eFKcBI5wENYFA3364mo45MPt7+CiKSVNmlzCYTyEY=; b=azpIUAH9QapmMCRx2fAPopiOjg +YTI/IgvBlQZvCAQegEWXKr0esS4ix5Vsvzo7ChIo+xdHB8MXYRVMTJEWE6X52O5ikTiRrhERh0jj pyxKEXZzt2yNlw7SnCyQ+4LdRL5s/WDi2TDnkVjCHUTPg5aSQEk2lKgNj8o/EG1g6QSPq8OFhvR3N mw6VXGSjthakhnDr+83WGgrWwHMF3R5ExVgayJFXGdpVXEduL6qRmSQbbBFDyNQSMg3rIuDAkhEUT 5sT37CpVtHDnR2MmBcFPNhjDUky1wNdW4sifwE/qfR/e4FKoHAgK7kVSTNB5mN0bNlIOYbKTIsaad BO9XErZw==; 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 1cszFA-0001bw-UE; Tue, 28 Mar 2017 22:05:36 +0000 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csym5-0003mk-3Y for linux-arm-kernel@lists.infradead.org; Tue, 28 Mar 2017 21:35:36 +0000 Received: by mail-qt0-x241.google.com with SMTP id r45so13974356qte.0 for ; Tue, 28 Mar 2017 14:35:12 -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=6yLzDaFq8zvIwH9AgMQiSgpVGQn8CvYN45k8aYAyHpQ=; b=lGrgS1KiXR0/w0gIrkk161vnShNDfeRz9p7TvqWF6gucdood16LDOuwK/YDHOMDwRY ep0vjVqRn+YPgdW7a9xREpsIJ9Pb/HGLWBOlq5EwkFzkIJ+GUqOcPenJQCjowxn2EK8S h175TblybPkpYbiq3S9TmijtEE+rBqk5xqWaoViE61/eTO0wL1vg4OxPAAdXZ2UEfOv9 WKO7Z3wc8uyivb79FlB+vMk1KZrrae4mz05Vue2NbNlqSv4df2sf03eYRRMnH8XTQjSx n9WV5HiRsx2bb0PL+1JuyA/MM/uV52zbQY79/8PF6N58EyJd/kOP4teMXzG7b4cmY6zU NlLQ== 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=6yLzDaFq8zvIwH9AgMQiSgpVGQn8CvYN45k8aYAyHpQ=; b=nSarlKNHXxRqJf+Z9u1KrI9TqvYJDb5DVjbqwvjm9cDNQG567ovAncsIokBrgSs+sH yPBwRmVt6r2WzzlhXfblKjn10OIkSCNbpisnCkeWoqFYEj3kGF7vqQGB5fBj9814OuMw oY4yKmBUwn34FRT99GaJJJV8QPQMOT4EydHuI1oDKTjdH7eRSTO0NDWsDwpxOe0Y0pE9 k+u/LLcv3mabZDI6TTBTWI+YNX8x3glPabY1F/wjwOuOo7L7SNTBJjymWPu62V2bEtkk O2wobohkINtMUhwmccfd0fXgTbarG/moZ3JzLrmrNUogNgTIenmPP3fTqXES3TEHIiPD zK2g== X-Gm-Message-State: AFeK/H2k0twOJEPUtCE/S0rN18HfJtuVTVs0Q5ruyLqOzTV3r+VZ6+1XH7eGGZ+/7iSGYQ== X-Received: by 10.200.43.85 with SMTP id 21mr27600390qtv.81.1490736911763; Tue, 28 Mar 2017 14:35:11 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2017 14:35:11 -0700 (PDT) From: Doug Berger To: mark.rutland@arm.com Subject: [PATCH v2 3/8] bus: brcmstb_gisb: Use register offsets with writes too Date: Tue, 28 Mar 2017 14:34:26 -0700 Message-Id: <20170328213431.10904-4-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_143533_670452_FFE839FC X-CRM114-Status: GOOD ( 11.22 ) 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 This commit corrects the bug introduced in commit f80835875d3d ("bus: brcmstb_gisb: Look up register offsets in a table") such that gisb_write() translates the register enumeration into an offset from the base address for writes as well as reads. Fixes: f80835875d3d ("bus: brcmstb_gisb: Look up register offsets in a table") Signed-off-by: Doug Berger Acked-by: Gregory Fong --- drivers/bus/brcmstb_gisb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c index 72fe0a5a8bf3..a94598d0945a 100644 --- a/drivers/bus/brcmstb_gisb.c +++ b/drivers/bus/brcmstb_gisb.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Broadcom Corporation + * Copyright (C) 2014-2017 Broadcom * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -127,9 +127,9 @@ static void gisb_write(struct brcmstb_gisb_arb_device *gdev, u32 val, int reg) return; if (gdev->big_endian) - iowrite32be(val, gdev->base + reg); + iowrite32be(val, gdev->base + offset); else - iowrite32(val, gdev->base + reg); + iowrite32(val, gdev->base + offset); } static ssize_t gisb_arb_get_timeout(struct device *dev,