mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-22 20:23:57 +08:00
soc: brcmstb: biuctrl: exit without warning on non brcmstb platforms
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
Fixes: f780429adf
("soc: brcmstb: biuctrl: Move to early_initcall")
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
[florian: Add fixes tag, make initcall non fatal]
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
c90801664e
commit
a78182980a
@ -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");
|
||||
@ -242,9 +236,17 @@ static struct syscore_ops brcmstb_cpu_credit_syscore_ops = {
|
||||
|
||||
static int __init brcmstb_biuctrl_init(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
int ret;
|
||||
|
||||
setup_hifcpubiuctrl_regs();
|
||||
/* We might be running on a multi-platform kernel, don't make this a
|
||||
* fatal error, just bail out early
|
||||
*/
|
||||
np = of_find_compatible_node(NULL, NULL, "brcm,brcmstb-cpu-biu-ctrl");
|
||||
if (!np)
|
||||
return 0;
|
||||
|
||||
setup_hifcpubiuctrl_regs(np);
|
||||
|
||||
ret = mcp_write_pairing_set();
|
||||
if (ret) {
|
||||
|
Loading…
Reference in New Issue
Block a user