Commit 06d65a6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 699aee7b 24b333a8

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

+2 −0
Original line number Diff line number Diff line
@@ -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";

arch/mips/ralink/of.c

+3 −1
Original line number Diff line number Diff line
@@ -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,6 +82,7 @@ static int __init plat_of_setup(void) 
	__dt_register_buses(soc_info.compatible, "palmbus");



	/* make sure that the reset controller is setup early */

	if (ralink_soc != MT762X_SOC_MT7621AT)

		ralink_rst_init();



	return 0;