| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Doug Berger <opendmb@gmail.com> |
| Date: Wed, 29 Mar 2017 17:29:09 -0700 |
| Subject: bus: brcmstb_gisb: Use register offsets with writes too |
| |
| From: Doug Berger <opendmb@gmail.com> |
| |
| |
| [ Upstream commit 856c7ccb9ce7a061f04bdf586f649cb93654e294 ] |
| |
| 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> |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/bus/brcmstb_gisb.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- 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_gi |
| 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, |
