diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-13 09:35:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-13 09:35:17 -0800 |
commit | 61f14c015f5be9151ba25e638d349f4d40cb7cd4 (patch) | |
tree | dd813d35d1f7426e1e568e66151b197a9c576a00 /MAINTAINERS | |
parent | 178e834c47b0d01352c48730235aae69898fbc02 (diff) | |
parent | 791412dafbbfd860e78983d45cf71db603a82f67 (diff) | |
download | linux-61f14c015f5be9151ba25e638d349f4d40cb7cd4.tar.gz linux-61f14c015f5be9151ba25e638d349f4d40cb7cd4.tar.bz2 linux-61f14c015f5be9151ba25e638d349f4d40cb7cd4.zip |
Merge tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips
Pull MIPS fix from James Hogan:
"A single change (and associated DT binding update) to allow the
address of the MIPS Cluster Power Controller (CPC) to be chosen by DT,
which allows SMP to work on generic MIPS kernels where the bootloader
hasn't configured the CPC address (i.e. the new Ranchu platform)"
* tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
MIPS: CPC: Map registers using DT in mips_cpc_default_phys_base()
dt-bindings: Document mti,mips-cpc binding
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3bdc260e36b7..a4dcdd35d9a3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9206,6 +9206,7 @@ MIPS GENERIC PLATFORM M: Paul Burton <paul.burton@mips.com> L: linux-mips@linux-mips.org S: Supported +F: Documentation/devicetree/bindings/power/mti,mips-cpc.txt F: arch/mips/generic/ F: arch/mips/tools/generic-board-config.sh |