tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 06d65a6f 699aee7b

+5 -1
+2
arch/mips/boot/dts/brcm/bcm63268.dtsi
··· 109 109 compatible = "brcm,bcm7038-twd", "simple-mfd", "syscon"; 110 110 reg = <0x10000080 0x30>; 111 111 ranges = <0x0 0x10000080 0x30>; 112 + #address-cells = <1>; 113 + #size-cells = <1>; 112 114 113 115 timer@0 { 114 116 compatible = "brcm,bcm6345-timer";
+3 -1
arch/mips/ralink/of.c
··· 21 21 #include <asm/bootinfo.h> 22 22 #include <asm/addrspace.h> 23 23 #include <asm/prom.h> 24 + #include <asm/mach-ralink/ralink_regs.h> 24 25 25 26 #include "common.h" 26 27 ··· 82 81 __dt_register_buses(soc_info.compatible, "palmbus"); 83 82 84 83 /* make sure that the reset controller is setup early */ 85 - ralink_rst_init(); 84 + if (ralink_soc != MT762X_SOC_MT7621AT) 85 + ralink_rst_init(); 86 86 87 87 return 0; 88 88 }