tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2022-12-23 10:49:45 -08:00
parent 699aee7b47 24b333a866
commit 06d65a6f64
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/mips/boot/dts/brcm/bcm63268.dtsi
+2
View File
@@ -109,6 +109,8 @@
compatible = "brcm,bcm7038-twd", "simple-mfd", "syscon"; compatible = "brcm,bcm7038-twd", "simple-mfd", "syscon";
reg = <0x10000080 0x30>; reg = <0x10000080 0x30>;
ranges = <0x0 0x10000080 0x30>; ranges = <0x0 0x10000080 0x30>;
#address-cells = <1>;
#size-cells = <1>;
timer@0 { timer@0 {
compatible = "brcm,bcm6345-timer"; compatible = "brcm,bcm6345-timer";
arch/mips/ralink/of.c
+3 -1
View File
@@ -21,6 +21,7 @@
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/mach-ralink/ralink_regs.h>
#include "common.h" #include "common.h"
@@ -81,7 +82,8 @@ static int __init plat_of_setup(void)
__dt_register_buses(soc_info.compatible, "palmbus"); __dt_register_buses(soc_info.compatible, "palmbus");
/* make sure that the reset controller is setup early */ /* make sure that the reset controller is setup early */
ralink_rst_init(); if (ralink_soc != MT762X_SOC_MT7621AT)
ralink_rst_init();
return 0; return 0;
} }