summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-02 18:29:04 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-02 18:29:04 +0200
commit7d3ef43f1f99d4250ff120c8965b3e5cd81b3c71 (patch)
treedd9398cd57f54f966b1b8fd66652a487ee226ecf /MAINTAINERS
parent2b97f10b3896f5c155b28f6c733735fd60f4b3f9 (diff)
parentcddb4800162e543c202cbb05795a324f1093d168 (diff)
downloadop-kernel-dev-7d3ef43f1f99d4250ff120c8965b3e5cd81b3c71.zip
op-kernel-dev-7d3ef43f1f99d4250ff120c8965b3e5cd81b3c71.tar.gz
Merge tag 'reset-for-4.9' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge "Reset controller changes for v4.9" from Philipp Zabel: - add reset controller driver Kconfig options, allow building drivers with COMPILE_TEST - add reset controller driver for UniPhier SoCs - add reset controller driver for STM32 MCUs - simplify SoCFPGA reset controller driver a bit * tag 'reset-for-4.9' of git://git.pengutronix.de/git/pza/linux: reset: hi6220: allow to compile test driver on other architectures reset: zynq: add driver Kconfig option reset: sunxi: add driver Kconfig option reset: stm32: add driver Kconfig option reset: socfpga: add driver Kconfig option reset: pistachio: add driver Kconfig option reset: meson: add driver Kconfig option reset: lpc18xx: add driver Kconfig option reset: berlin: add driver Kconfig option reset: ath79: add driver Kconfig option reset: ath79: add missing include reset: warn on invalid input to reset_control_reset/assert/deassert/status reset: uniphier: add reset controller driver for UniPhier SoCs ARM: dts: stm32f429: add missing #reset-cells of rcc drivers: reset: Add STM32 reset driver dt-bindings: Document the STM32 reset bindings dt-bindings: mfd: Add STM32F4 RCC numeric constants into DT include file reset: socfpga: no need to store modrst_offset
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 71aa5da..1cb3ce2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1840,6 +1840,7 @@ F: arch/arm64/boot/dts/socionext/
F: drivers/bus/uniphier-system-bus.c
F: drivers/i2c/busses/i2c-uniphier*
F: drivers/pinctrl/uniphier/
+F: drivers/reset/reset-uniphier.c
F: drivers/tty/serial/8250/8250_uniphier.c
N: uniphier
OpenPOWER on IntegriCloud