Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 15:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes due to DT changes

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAmOldZUaHHRzYm9nZW5k
 QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHBcxxAAqNIkoTFjHP7DqmsfNMuI
 61zAH8kkY6z3WB6YVlxDdoX0PDpNIayMVNEpeQ2Z9KXzO2YYdf06Mlh50hyT6ZI9
 AB3f+5A/2Us8sl/D7Ej0NNCWqziP1aCZZArlIKZcY3CSFXHdLuFNj0IN6Zc3+UNH
 GSv+mx1OWAPfbzc8mEMWscuEsm7c54EyewOGQ6ajgYwz4BAxUEPvUZLaQg4E2kDV
 tp6n0eXO8BTz+s5Y7pIfWUgyyzYCbjVcxZd8pSAZou0dtb+WEsGm+KG9bXYRTgqq
 y4+a+lI1UDcBfEGAOHIcq9MP8yvZsmyjx3GLZoMLJzGsqH6GeIUUxATgBFPnP3D+
 O4b5sOOOL1ENTn3m3qwY/XEbkUdeQm82glKUXZYQvg+JMdDN51vmfpPzcKsP+CAq
 vR9jFDFISxg+yxpULV/X9gBRN78b1UpH0m9G0ajkINPfUo0cGYuCMePsiGy2yI4Y
 voHsSkqXExnHn4K55YaZfjGbcyHkBnonWsuTbB9dS/IsIYnu4mKHJkF+I10spTFD
 +g0gf9jmxhNM/KLyDssHYaO52yioROWgTy0+ag0xmvcXhKU6JDNpjqG8U4VgL6lT
 VLN46U7Q1d1cdW4R7PsEfrUz4gyP+9fvrEPIkYQrrpDRbSbZLlFsoeKbrVFrNczl
 bZAxrJTX5AB1Til8m8wP2VU=
 =Nyyl
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2022-12-23 10:49:45 -08:00
commit 06d65a6f64
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/boot/dts/brcm/bcm63268.dtsi
View File

@ -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";

4
arch/mips/ralink/of.c
View File

@ -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;
}