diff options
author | NeilBrown <neil@brown.name> | 2018-03-21 14:02:10 +1100 |
---|---|---|
committer | James Hogan <jhogan@kernel.org> | 2018-03-22 00:06:30 +0000 |
commit | a63d706ea719190a79a6c769e898f70680044d3e (patch) | |
tree | 8a45b4e92f371322614cac40d06308b8c22ff8e2 /sound/soc | |
parent | 891731f6a5dbe508d12443175a7e166a2fba616a (diff) |
MIPS: ralink: Fix booting on MT7621
Since commit 3af5a67c86a3 ("MIPS: Fix early CM probing") the MT7621 has
not been able to boot.
This commit caused mips_cm_probe() to be called before
mt7621.c::proc_soc_init().
prom_soc_init() has a comment explaining that mips_cm_probe() "wipes out
the bootloader config" and means that configuration registers are no
longer available. It has some code to re-enable this config.
Before this re-enable code is run, the sysc register cannot be read, so
when SYSC_REG_CHIP_NAME0 is read, a garbage value is returned and
panic() is called.
If we move the config-repair code to the top of prom_soc_init(), the
registers can be read and boot can proceed.
Very occasionally, the first register read after the reconfiguration
returns garbage, so add a call to __sync().
Fixes: 3af5a67c86a3 ("MIPS: Fix early CM probing")
Signed-off-by: NeilBrown <neil@brown.name>
Reviewed-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: John Crispin <john@phrozen.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 4.5+
Patchwork: https://patchwork.linux-mips.org/patch/18859/
Signed-off-by: James Hogan <jhogan@kernel.org>
Diffstat (limited to 'sound/soc')
0 files changed, 0 insertions, 0 deletions