Skip to content

Commit 06d65a6

Browse files
committed
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
2 parents 699aee7 + 24b333a commit 06d65a6

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

arch/mips/boot/dts/brcm/bcm63268.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@
109109
compatible = "brcm,bcm7038-twd", "simple-mfd", "syscon";
110110
reg = <0x10000080 0x30>;
111111
ranges = <0x0 0x10000080 0x30>;
112+
#address-cells = <1>;
113+
#size-cells = <1>;
112114

113115
timer@0 {
114116
compatible = "brcm,bcm6345-timer";

arch/mips/ralink/of.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <asm/bootinfo.h>
2222
#include <asm/addrspace.h>
2323
#include <asm/prom.h>
24+
#include <asm/mach-ralink/ralink_regs.h>
2425

2526
#include "common.h"
2627

@@ -81,7 +82,8 @@ static int __init plat_of_setup(void)
8182
__dt_register_buses(soc_info.compatible, "palmbus");
8283

8384
/* make sure that the reset controller is setup early */
84-
ralink_rst_init();
85+
if (ralink_soc != MT762X_SOC_MT7621AT)
86+
ralink_rst_init();
8587

8688
return 0;
8789
}

0 commit comments

Comments
 (0)