diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2019-12-10 14:57:58 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2020-01-05 13:44:04 -0800 |
| commit | 3098f5eb906b9e66b0a0b79b75d612261a6a7108 (patch) | |
| tree | bbd446c8b999580d64fa0be168cd999c37610b2e | |
| parent | e42617b825f8073569da76dc4510bfa019b1c35a (diff) | |
| download | linux-stable-3098f5eb906b9e66b0a0b79b75d612261a6a7108.tar.gz linux-stable-3098f5eb906b9e66b0a0b79b75d612261a6a7108.tar.bz2 linux-stable-3098f5eb906b9e66b0a0b79b75d612261a6a7108.zip | |
soc: bcm: brcmstb: biuctrl: Tune 7260 BIU interface
7260A0 and B0 are both supported, and 7260A0 has a small difference in
that it does not support the write-back control register, which is why
we have a different array of registers. Update the comment above
b53_cpubiuctrl_no_wb_regs to denote that difference.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
| -rw-r--r-- | drivers/soc/bcm/brcmstb/biuctrl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c index d326915e0f40..6be975392590 100644 --- a/drivers/soc/bcm/brcmstb/biuctrl.c +++ b/drivers/soc/bcm/brcmstb/biuctrl.c @@ -63,7 +63,7 @@ static const int b15_cpubiuctrl_regs[] = { [CPU_WRITEBACK_CTRL_REG] = -1, }; -/* Odd cases, e.g: 7260 */ +/* Odd cases, e.g: 7260A0 */ static const int b53_cpubiuctrl_no_wb_regs[] = { [CPU_CREDIT_REG] = 0x0b0, [CPU_MCP_FLOW_REG] = 0x0b4, @@ -102,6 +102,7 @@ static int __init mcp_write_pairing_set(void) } static const u32 b53_mach_compat[] = { + 0x7260, 0x7268, 0x7271, 0x7278, @@ -157,6 +158,7 @@ static void __init mcp_b53_set(void) static int __init setup_hifcpubiuctrl_regs(struct device_node *np) { struct device_node *cpu_dn; + u32 family_id; int ret = 0; cpubiuctrl_base = of_iomap(np, 0); @@ -185,7 +187,8 @@ static int __init setup_hifcpubiuctrl_regs(struct device_node *np) } of_node_put(cpu_dn); - if (BRCM_ID(brcmstb_get_family_id()) == 0x7260) + family_id = brcmstb_get_family_id(); + if (BRCM_ID(family_id) == 0x7260 && BRCM_REV(family_id) == 0) cpubiuctrl_regs = b53_cpubiuctrl_no_wb_regs; out: of_node_put(np); |