devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Doug Berger <opendmb@gmail.com>
To: mark.rutland@arm.com
Cc: robh+dt@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com,
	computersforpeace@gmail.com, gregory.0xf0@gmail.com,
	f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com,
	opendmb@gmail.com, wangkefeng.wang@huawei.com,
	james.morse@arm.com, mingo@kernel.org,
	sandeepa.s.prabhu@gmail.com, shijie.huang@arm.com,
	linus.walleij@linaro.org, treding@nvidia.com,
	jonathanh@nvidia.com, olof@lixom.net, mirza.krak@gmail.com,
	suzuki.poulose@arm.com, bgolaszewski@baylibre.com,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/8] bus: brcmstb_gisb: Use register offsets with writes too
Date: Tue, 28 Mar 2017 14:34:26 -0700	[thread overview]
Message-ID: <20170328213431.10904-4-opendmb@gmail.com> (raw)
In-Reply-To: <20170328213431.10904-1-opendmb@gmail.com>

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 <opendmb@gmail.com>
Acked-by: Gregory Fong <gregory.0xf0@gmail.com>
---
 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,
-- 
2.12.0

  parent reply	other threads:[~2017-03-28 21:34 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-28 21:34 [PATCH v2 0/8] bus: brcmstb_gisb: add support for GISBv7 arbiter Doug Berger
2017-03-28 21:34 ` [PATCH v2 1/8] arm64: mm: Allow installation of memory abort handlers Doug Berger
2017-03-29 11:32   ` Mark Rutland
2017-03-28 21:34 ` [PATCH v2 2/8] arm64: mm: mark fault_info __ro_after_init Doug Berger
2017-03-29 11:23   ` Mark Rutland
2017-03-28 21:34 ` Doug Berger [this message]
     [not found] ` <20170328213431.10904-1-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-28 21:34   ` [PATCH v2 4/8] bus: brcmstb_gisb: Correct hooking of ARM aborts Doug Berger
2017-03-28 21:34 ` [PATCH v2 5/8] bus: brcmstb_gisb: correct support for 64-bit address output Doug Berger
2017-03-28 21:34 ` [PATCH v2 6/8] bus: brcmstb_gisb: Add ARM64 support Doug Berger
2017-03-29 11:20   ` Mark Rutland
2017-03-28 21:34 ` [PATCH v2 7/8] bus: brcmstb_gisb: add notifier handling Doug Berger
     [not found]   ` <20170328213431.10904-8-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-29 10:13     ` Mark Rutland
2017-03-29 17:39       ` Doug Berger
2017-03-29 18:17         ` Mark Rutland
2017-03-28 21:34 ` [PATCH v2 8/8] bus: brcmstb_gisb: update to support new revision Doug Berger
2017-03-29 11:25   ` Mark Rutland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170328213431.10904-4-opendmb@gmail.com \
    --to=opendmb@gmail.com \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=bgolaszewski@baylibre.com \
    --cc=catalin.marinas@arm.com \
    --cc=computersforpeace@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=f.fainelli@gmail.com \
    --cc=gregory.0xf0@gmail.com \
    --cc=james.morse@arm.com \
    --cc=jonathanh@nvidia.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@kernel.org \
    --cc=mirza.krak@gmail.com \
    --cc=olof@lixom.net \
    --cc=robh+dt@kernel.org \
    --cc=sandeepa.s.prabhu@gmail.com \
    --cc=shijie.huang@arm.com \
    --cc=suzuki.poulose@arm.com \
    --cc=treding@nvidia.com \
    --cc=wangkefeng.wang@huawei.com \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).