MIPS: ralink: mt7621: avoid to init common ralink reset controller

[ Upstream commit 2d93360223e18bfe709182a693fc15304dcd0bc1 ]

Commit ca50b00a5f40 ("clk: ralink: make system controller node a reset provider")
make system controller a reset provider for mt7621 ralink SoCs. Ralink init code
also tries to start previous common reset controller which at the end tries to
find device tree node 'ralink,rt2880-reset'. mt7621 device tree file is not
using at all this node anymore. Hence avoid to init this common reset controller
for mt7621 ralink SoCs to avoid 'Failed to find reset controller node' boot
error trace error.

Fixes: 37c753b3061f ("staging: mt7621-dts: align resets with binding documentation")
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index ea8072acf8d94ebc66b121285091342adbeb21b0..01c132bc33d540fd0d7aad9f205db23f50763986 100644 (file)
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -21,6 +21,7 @@
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 #include <asm/prom.h>
+#include <asm/mach-ralink/ralink_regs.h>
 
 #include "common.h"
 
@@ -81,7 +82,8 @@ static int __init plat_of_setup(void)
        __dt_register_buses(soc_info.compatible, "palmbus");
 
        /* make sure that the reset controller is setup early */
-       ralink_rst_init();
+       if (ralink_soc != MT762X_SOC_MT7621AT)
+               ralink_rst_init();
 
        return 0;
 }