aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2019-04-12 10:15:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-14 08:11:03 +0200
commit2883fc1ece6965b83def25e610646a2011d1c84b (patch)
tree030add90a90f40edba8c2de4a418609cf8635348
parent2f1c962a74164959f7c4bb9158e5993d0b8436e5 (diff)
downloadlinux-stable-2883fc1ece6965b83def25e610646a2011d1c84b.tar.gz
soc: bcm: brcmstb: biuctrl: Register writes require a barrier
[ Upstream commit 6b23af0783a54efb348f0bd781b7850636023dbb ] The BIUCTRL register writes require that a data barrier be inserted after comitting the write to the register for the block to latch in the recently written values. Reads have no such requirement and are not changed. Fixes: 34642650e5bc ("soc: Move brcmstb to bcm/brcmstb") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/soc/bcm/brcmstb/biuctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c
index c16273b31b94f..20b63bee5b09f 100644
--- a/drivers/soc/bcm/brcmstb/biuctrl.c
+++ b/drivers/soc/bcm/brcmstb/biuctrl.c
@@ -56,7 +56,7 @@ static inline void cbc_writel(u32 val, int reg)
if (offset == -1)
return;
- writel_relaxed(val, cpubiuctrl_base + offset);
+ writel(val, cpubiuctrl_base + offset);
}
enum cpubiuctrl_regs {