| Message ID | 1515681564-24007-1-git-send-email-sudeep.holla@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [-next] soc: brcmstb: biuctrl: exit without warning on non brcmstb platforms | expand |
On 01/11/2018 06:39 AM, Sudeep Holla wrote: > Currently if this driver is included, we get the following warning > on any platforms irrespective of whether it's brcmstb platform or not. > " > brcmstb: biuctrl: missing BIU control node > brcmstb: biuctrl: MCP: Unable to disable write pairing! > " > > This patch allows to exit early without any warning messages on non > brcmstb platforms as it's meaningless for them. Thierry already submitted a patch for this: https://patchwork.kernel.org/patch/10152509/ which I am going to pick up (order of arrival) and submit shortly to the ARM SoC maintainers, thanks! -- Florian
diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c index 2b23ae7b5e9b..0d0c6131ac0e 100644 --- a/drivers/soc/bcm/brcmstb/biuctrl.c +++ b/drivers/soc/bcm/brcmstb/biuctrl.c @@ -162,17 +162,11 @@ static void __init mcp_b53_set(void) cbc_writel(reg, CPU_WRITEBACK_CTRL_REG); } -static int __init setup_hifcpubiuctrl_regs(void) +static int __init setup_hifcpubiuctrl_regs(struct device_node *np) { - struct device_node *np, *cpu_dn; + struct device_node *cpu_dn; int ret = 0; - np = of_find_compatible_node(NULL, NULL, "brcm,brcmstb-cpu-biu-ctrl"); - if (!np) { - pr_err("missing BIU control node\n"); - return -ENODEV; - } - cpubiuctrl_base = of_iomap(np, 0); if (!cpubiuctrl_base) { pr_err("failed to remap BIU control base\n"); @@ -243,8 +237,13 @@ static struct syscore_ops brcmstb_cpu_credit_syscore_ops = { static int __init brcmstb_biuctrl_init(void) { int ret; + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, "brcm,brcmstb-cpu-biu-ctrl"); + if (!np) + return -ENODEV; - setup_hifcpubiuctrl_regs(); + setup_hifcpubiuctrl_regs(np); ret = mcp_write_pairing_set(); if (ret) {
Currently if this driver is included, we get the following warning on any platforms irrespective of whether it's brcmstb platform or not. " brcmstb: biuctrl: missing BIU control node brcmstb: biuctrl: MCP: Unable to disable write pairing! " This patch allows to exit early without any warning messages on non brcmstb platforms as it's meaningless for them. Cc: Brian Norris <computersforpeace@gmail.com> Cc: Gregory Fong <gregory.0xf0@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: bcm-kernel-feedback-list@broadcom.com Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- drivers/soc/bcm/brcmstb/biuctrl.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) Hi, I am seeing these messages on my Juno platform when running -next Regards, Sudeep -- 2.7.4