diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-02 16:28:44 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-02 16:28:44 +0100 |
| commit | 84cbda2fec8813fc40b33e6d8e0f2476ab43d5ce (patch) | |
| tree | f3d138f7c3eaf18a190326f5e3ef8f69aac78865 /MAINTAINERS | |
| parent | f3e69db2c0346d2f66ea91b6e157f8749cfddaf4 (diff) | |
| parent | faec5ee1c7acb00eec4853321e4da42cd690a220 (diff) | |
| download | linux-stable-84cbda2fec8813fc40b33e6d8e0f2476ab43d5ce.tar.gz linux-stable-84cbda2fec8813fc40b33e6d8e0f2476ab43d5ce.tar.bz2 linux-stable-84cbda2fec8813fc40b33e6d8e0f2476ab43d5ce.zip | |
Merge tag 'at91-ab-4.15-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers
Pull "soc for 4.15" from Alexandre Belloni:
- add SoC ids for the sama5d2 SiPs
- Improve the AT91 maintainers entry
* tag 'at91-ab-4.15-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
MAINTAINERS: Add SoC drivers to AT91 entry
drivers: soc: atmel: Add basic support for new sama5d2 SiPs
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d3c6f54f90d1..fb59572f780e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1226,6 +1226,8 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.linux4sam.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git S: Supported +N: at91 +N: atmel F: arch/arm/mach-at91/ F: include/soc/at91/ F: arch/arm/boot/dts/at91*.dts @@ -1234,6 +1236,9 @@ F: arch/arm/boot/dts/sama*.dts F: arch/arm/boot/dts/sama*.dtsi F: arch/arm/include/debug/at91.S F: drivers/memory/atmel* +F: drivers/watchdog/sama5d4_wdt.c +X: drivers/input/touchscreen/atmel_mxt_ts.c +X: drivers/net/wireless/atmel/ ARM/CALXEDA HIGHBANK ARCHITECTURE M: Rob Herring <robh@kernel.org> |