diff --git a/arch/mips/boot/dts/brcm/bcm63268.dtsi b/arch/mips/boot/dts/brcm/bcm63268.dtsi index c663efce91cf5dd08e96e0eb6d5bf695ec03dc11..7b788757cb1ebeb51fbcacb4c33df18c910d23b5 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 ea8072acf8d94ebc66b121285091342adbeb21b0..01c132bc33d540fd0d7aad9f205db23f50763986 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; }