Commit c1d6f4ad authored by Olof Johansson's avatar Olof Johansson

Merge tag 'arm-soc/for-5.2/drivers-fixes' of https://github.com/Broadcom/stblinux into fixes

This pull request contains Broadcom ARM/ARM64/MIPS SoCs device drivers
fixes for 5.2-rc1, please pull the following:

- Florian fixes the biuctrl driver not to create an error condition/path
  upon unsupported CPU and also fixes the biuctrl driver writes to used
  a data barrier which is necessary given the HW block design

* tag 'arm-soc/for-5.2/drivers-fixes' of https://github.com/Broadcom/stblinux:
  soc: bcm: brcmstb: biuctrl: Register writes require a barrier
  soc: brcmstb: Fix error path for unsupported CPUs
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9e0babf2 6b23af07
...@@ -48,7 +48,7 @@ static inline void cbc_writel(u32 val, int reg) ...@@ -48,7 +48,7 @@ static inline void cbc_writel(u32 val, int reg)
if (offset == -1) if (offset == -1)
return; return;
writel_relaxed(val, cpubiuctrl_base + offset); writel(val, cpubiuctrl_base + offset);
} }
enum cpubiuctrl_regs { enum cpubiuctrl_regs {
...@@ -238,7 +238,9 @@ static int __init brcmstb_biuctrl_init(void) ...@@ -238,7 +238,9 @@ static int __init brcmstb_biuctrl_init(void)
if (!np) if (!np)
return 0; return 0;
setup_hifcpubiuctrl_regs(np); ret = setup_hifcpubiuctrl_regs(np);
if (ret)
return ret;
ret = mcp_write_pairing_set(); ret = mcp_write_pairing_set();
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment