diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-23 10:49:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-23 10:49:45 -0800 |
| commit | 06d65a6f640118430b894273914aa8d62d2cf637 (patch) | |
| tree | 300cf55524a07dfe9de2899e7d687decd51ab507 | |
| parent | 699aee7b47dbb1d3c30bf24f3c905eff366d9571 (diff) | |
| parent | 24b333a866a10d4be47b9968b9c05a3e9f326ff5 (diff) | |
| download | pci-06d65a6f640118430b894273914aa8d62d2cf637.tar.gz | |
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
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm63268.dtsi | 2 | ||||
| -rw-r--r-- | arch/mips/ralink/of.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/boot/dts/brcm/bcm63268.dtsi b/arch/mips/boot/dts/brcm/bcm63268.dtsi index c663efce91cf5d..7b788757cb1ebe 100644 --- 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 ea8072acf8d94e..01c132bc33d540 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; } |