diff options
| author | Olof Johansson <olof@lixom.net> | 2017-03-22 01:33:38 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-03-22 01:33:38 +0100 |
| commit | a618a7349f1947c775200c83ccfaeae681c5dbcb (patch) | |
| tree | aea183a3ab8831dc65bfd4900b4d408b7e1bf2dd /MAINTAINERS | |
| parent | Linux 4.11-rc2 (diff) | |
| parent | reset: sunxi: fix for 64-bit compilation (diff) | |
| download | linux-a618a7349f1947c775200c83ccfaeae681c5dbcb.tar.xz linux-a618a7349f1947c775200c83ccfaeae681c5dbcb.zip | |
Merge tag 'reset-for-4.12-1' of git://git.pengutronix.de/git/pza/linux into next/drivers
Reset controller changes for v4.12
- make reset drivers with bool Kconfig options explicitly non-modular
- fix uniphier non-static symbol warnings
- fix socfpga nr_resets property
- new drivers for the Arria10 and i.MX7 system reset controllers
- fix sunxi 64-bit compilation
* tag 'reset-for-4.12-1' of git://git.pengutronix.de/git/pza/linux:
reset: sunxi: fix for 64-bit compilation
reset: Add Altera Arria10 SR Reset Controller
dt-bindings: reset: a10sr: Add Arria10 SR Reset Controller offsets
reset: Add i.MX7 SRC reset driver
reset-socfpga: Fix nr_resets property
reset: uniphier: fix non static symbol warnings
reset: pistachio: make it explicitly non-modular
reset: ath79: make it explicitly non-modular
reset: oxnas: make it explicitly non-modular
reset: meson: make it explicitly non-modular
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c776906f67a9..c6b5d5a585d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -653,7 +653,9 @@ M: Thor Thayer <thor.thayer@linux.intel.com> S: Maintained F: drivers/gpio/gpio-altera-a10sr.c F: drivers/mfd/altera-a10sr.c +F: drivers/reset/reset-a10sr.c F: include/linux/mfd/altera-a10sr.h +F: include/dt-bindings/reset/altr,rst-mgr-a10sr.h ALTERA TRIPLE SPEED ETHERNET DRIVER M: Vince Bridgers <vbridger@opensource.altera.com> |