Merge tag 'mips_6.2_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fixes from Thomas Bogendoerfer:
 "Fixes due to DT changes"

* tag 'mips_6.2_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: dts: bcm63268: Add missing properties to the TWD node
  MIPS: ralink: mt7621: avoid to init common ralink reset controller

diff --git a/arch/mips/boot/dts/brcm/bcm63268.dtsi b/arch/mips/boot/dts/brcm/bcm63268.dtsi
index c663efc..7b78875 100644 (file)
--- a/arch/mips/boot/dts/brcm/bcm63268.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm63268.dtsi
@@ -109,6 +109,8 @@
                        compatible = "brcm,bcm7038-twd", "simple-mfd", "syscon";
                        reg = <0x10000080 0x30>;
                        ranges = <0x0 0x10000080 0x30>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
                        timer@0 {
                                compatible = "brcm,bcm6345-timer";

diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index ea8072a..01c132b 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;
 }