Pull arm-soc updates for MAINTAINERS file from Olof Johansson: "This is a collection of updates to the MAINTAINERS file, separated out mostly to give an overview of what has changed regarding who does what. In particular, at91, orion and prima2 platforms and drivers are updated in this batch." * tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: MAINTAINER: add some drivers upstreamed in CSR SIRFPRIMA2 maintainership update for the Marvell Orion family of SOCs MAINTAINERS: remove non-responding web link for atmel_usba driver MAINTAINERS: add entry for Atmel timer counter (TC) MAINTAINERS: add entry for Atmel DMA driver MAINTAINERS: add entry for Atmel touch screen ADC controller driver MAINTAINERS: add entry for Atmel isi driver
Unified · Split
| @@ -746,7 +746,10 @@ M: Barry Song <baohua.song@csr.com> · 745 unmodified lines | ||
| 746 | 746 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 747 | 747 | S: Maintained |
| 748 | 748 | F: arch/arm/mach-prima2/ |
| 749 | −F: drivers/dma/sirf-dma* | |
| 749 | +F: drivers/dma/sirf-dma.c | |
| 750 | +F: drivers/i2c/busses/i2c-sirf.c | |
| 751 | +F: drivers/pinctrl/pinctrl-sirf.c | |
| 752 | +F: drivers/spi/spi-sirf.c | |
| 750 | 753 | |
| 751 | 754 | ARM/EBSA110 MACHINE SUPPORT |
| 752 | 755 | M: Russell King <linux@arm.linux.org.uk> |
| @@ -908,11 +911,12 @@ ARM/MAGICIAN MACHINE SUPPORT · 155 unmodified lines | ||
| 908 | 911 | M: Philipp Zabel <philipp.zabel@gmail.com> |
| 909 | 912 | S: Maintained |
| 910 | 913 | |
| 911 | −ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support | |
| 912 | −M: Lennert Buytenhek <kernel@wantstofly.org> | |
| 913 | −M: Nicolas Pitre <nico@fluxnic.net> | |
| 914 | +ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support | |
| 915 | +M: Jason Cooper <jason@lakedaemon.net> | |
| 916 | +M: Andrew Lunn <andrew@lunn.ch> | |
| 914 | 917 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 915 | −S: Odd Fixes | |
| 918 | +S: Maintained | |
| 919 | +F: arch/arm/mach-dove/ | |
| 916 | 920 | F: arch/arm/mach-kirkwood/ |
| 917 | 921 | F: arch/arm/mach-mv78xx0/ |
| 918 | 922 | F: arch/arm/mach-orion5x/ |
| @@ -1331,6 +1335,21 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com> · 412 unmodified lines | ||
| 1331 | 1335 | S: Supported |
| 1332 | 1336 | F: drivers/tty/serial/atmel_serial.c |
| 1333 | 1337 | |
| 1338 | +ATMEL DMA DRIVER | |
| 1339 | +M: Nicolas Ferre <nicolas.ferre@atmel.com> | |
| 1340 | +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | |
| 1341 | +S: Supported | |
| 1342 | +F: drivers/dma/at_hdmac.c | |
| 1343 | +F: drivers/dma/at_hdmac_regs.h | |
| 1344 | +F: arch/arm/mach-at91/include/mach/at_hdmac.h | |
| 1345 | + | |
| 1346 | +ATMEL ISI DRIVER | |
| 1347 | +M: Josh Wu <josh.wu@atmel.com> | |
| 1348 | +L: linux-media@vger.kernel.org | |
| 1349 | +S: Supported | |
| 1350 | +F: drivers/media/video/atmel-isi.c | |
| 1351 | +F: include/media/atmel-isi.h | |
| 1352 | + | |
| 1334 | 1353 | ATMEL LCDFB DRIVER |
| 1335 | 1354 | M: Nicolas Ferre <nicolas.ferre@atmel.com> |
| 1336 | 1355 | L: linux-fbdev@vger.kernel.org |
| @@ -1348,10 +1367,22 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com> · 11 unmodified lines | ||
| 1348 | 1367 | S: Supported |
| 1349 | 1368 | F: drivers/spi/spi-atmel.* |
| 1350 | 1369 | |
| 1370 | +ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS | |
| 1371 | +M: Nicolas Ferre <nicolas.ferre@atmel.com> | |
| 1372 | +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | |
| 1373 | +S: Supported | |
| 1374 | +F: drivers/misc/atmel_tclib.c | |
| 1375 | +F: drivers/clocksource/tcb_clksrc.c | |
| 1376 | + | |
| 1377 | +ATMEL TSADCC DRIVER | |
| 1378 | +M: Josh Wu <josh.wu@atmel.com> | |
| 1379 | +L: linux-input@vger.kernel.org | |
| 1380 | +S: Supported | |
| 1381 | +F: drivers/input/touchscreen/atmel_tsadcc.c | |
| 1382 | + | |
| 1351 | 1383 | ATMEL USBA UDC DRIVER |
| 1352 | 1384 | M: Nicolas Ferre <nicolas.ferre@atmel.com> |
| 1353 | 1385 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 1354 | −W: http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver | |
| 1355 | 1386 | S: Supported |
| 1356 | 1387 | F: drivers/usb/gadget/atmel_usba_udc.* |
| 1357 | 1388 | |