mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
From bb3ababe7f986900672e0048153c31aa4a21f96b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sergio Paracuellos <sergio.paracuellos@gmail.com>
|
||
|
|
Date: Sat, 17 Dec 2022 08:48:06 +0100
|
||
|
|
Subject: [PATCH] MIPS: ralink: mt7621: avoid to init common ralink reset controller
|
||
|
|
|
||
|
|
[ Upstream commit 76ce51798cb16738a4a28a6662e7344aaf7ef769 ]
|
||
|
|
|
||
|
|
Commit 38a8553b0a22 ("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: 64b2d6ffff86 ("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>
|
||
|
|
---
|
||
|
|
arch/mips/ralink/of.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- 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"
|
||
|
|
|
||
|
|
@@ -95,7 +96,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;
|
||
|
|
}
|