Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+4 -2
+4 -2
drivers/soc/bcm/brcmstb/biuctrl.c
··· 48 48 if (offset == -1) 49 49 return; 50 50 51 - writel_relaxed(val, cpubiuctrl_base + offset); 51 + writel(val, cpubiuctrl_base + offset); 52 52 } 53 53 54 54 enum cpubiuctrl_regs { ··· 238 238 if (!np) 239 239 return 0; 240 240 241 - setup_hifcpubiuctrl_regs(np); 241 + ret = setup_hifcpubiuctrl_regs(np); 242 + if (ret) 243 + return ret; 242 244 243 245 ret = mcp_write_pairing_set(); 244 246 if (ret) {