Commit c1d6f4ad authored Jun 16, 2019 by Olof Johansson

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: Olof Johansson <olof@lixom.net>

parents 9e0babf2 6b23af07

drivers/soc/bcm/brcmstb/biuctrl.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -48,7 +48,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 {
		@@ -238,7 +238,9 @@ static int __init brcmstb_biuctrl_init(void)
		if (!np)
		return 0;

		setup_hifcpubiuctrl_regs(np);
		ret = setup_hifcpubiuctrl_regs(np);
		if (ret)
		return ret;

		ret = mcp_write_pairing_set();
		if (ret) {

Admin message