2022-12-17 09:25:10

by Sergio Paracuellos

Subject: [PATCH] MIPS: ralink: mt7621: avoid to init common ralink reset controller

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 <[email protected]>
---
arch/mips/ralink/of.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index ea8072acf8d9..01c132bc33d5 100644
--- 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;
}
--
2.25.1

2022-12-21 13:44:39

by Thomas Bogendoerfer

Subject: Re: [PATCH] MIPS: ralink: mt7621: avoid to init common ralink reset controller

On Sat, Dec 17, 2022 at 08:48:06AM +0100, Sergio Paracuellos wrote:
> 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 <[email protected]>
> ---
> arch/mips/ralink/of.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
> index ea8072acf8d9..01c132bc33d5 100644
> --- 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;
> }
> --
> 2.25.1

applied.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]