diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 10:28:37 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-06 10:28:37 -0400 |
commit | b8faca6af8586f364503bb52cf39e831e24b31ac (patch) | |
tree | 4b59e593fa8c7a6b64d60260d321ba2cf94b19c0 /MAINTAINERS | |
parent | d1176d175eaa528c28d2680ce63c60cbb1befb10 (diff) | |
parent | 1d8d53b62d80dc3a6ae1483891e7d840cd7a51bd (diff) |
Merge tag 'xgene-dts-for-v4.4-1' of https://github.com/AppliedMicro/xgene-next into next/dt
Merge "X-Gene DTS changes queued for v4.4" from Duc Dang:
* tag 'xgene-dts-for-v4.4-1' of https://github.com/AppliedMicro/xgene-next:
arm64: dts: Add poweroff device nodes for APM X-Gene 2 platform
arm64: dts: Add APM X-Gene 2 standby GPIO controller DTS entries
arm64: dts: Add PMU node for APM X-Gene Storm SOC
Documentation: arm: pmu: Add Potenza PMU binding
arm64: dts: Add X-Gene v2 reboot driver dts node
arm64: dts: add APM Merlin Board device tree
power: reset: Add syscon poweroff device node for APM X-Gene platform
arm64: dts: Add X-Gene reboot driver dts node
Documentation: arm64: add SCU dts binding documentation to linux kernel
MAINTAINERS: Add Applied Micro (APM) X-Gene Device Tree maintainer
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 797236befd27..1c3bf5a14837 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -788,6 +788,11 @@ S: Maintained | |||
788 | F: drivers/net/appletalk/ | 788 | F: drivers/net/appletalk/ |
789 | F: net/appletalk/ | 789 | F: net/appletalk/ |
790 | 790 | ||
791 | APPLIED MICRO (APM) X-GENE DEVICE TREE SUPPORT | ||
792 | M: Duc Dang <dhdang@apm.com> | ||
793 | S: Supported | ||
794 | F: arch/arm64/boot/dts/apm/ | ||
795 | |||
791 | APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER | 796 | APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER |
792 | M: Iyappan Subramanian <isubramanian@apm.com> | 797 | M: Iyappan Subramanian <isubramanian@apm.com> |
793 | M: Keyur Chudgar <kchudgar@apm.com> | 798 | M: Keyur Chudgar <kchudgar@apm.com> |