summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-10-04 03:10:12 +0200
committerOlof Johansson <olof@lixom.net>2017-10-04 03:10:12 +0200
commit180eb4f17eab106982ef100787a485974bef4749 (patch)
tree90931a381f883b79d1c363efb5697903d602bf62 /MAINTAINERS
parentMerge tag 'davinci-fixes-for-v4.14' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentreset: Restrict RESET_HSDK to ARC_SOC_HSDK or COMPILE_TEST (diff)
downloadlinux-180eb4f17eab106982ef100787a485974bef4749.tar.xz
linux-180eb4f17eab106982ef100787a485974bef4749.zip
Merge tag 'reset-fixes-for-4.14' of git://git.pengutronix.de/git/pza/linux into fixes
Reset controller fixes for v4.14 - Remove misleading HSDK v1 suffix, as there is no v2 planned - Add missing DT binding documentation for HSDK reset driver - Fix HSDK reset driver dependencies * tag 'reset-fixes-for-4.14' of git://git.pengutronix.de/git/pza/linux: reset: Restrict RESET_HSDK to ARC_SOC_HSDK or COMPILE_TEST ARC: reset: remove the misleading v1 suffix all over ARC: reset: add missing DT binding documentation for HSDKv1 reset driver ARC: reset: Only build on archs that have IOMEM Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 65b0c88d5ee0..60be46dc3fa8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12931,9 +12931,9 @@ F: drivers/mmc/host/dw_mmc*
SYNOPSYS HSDK RESET CONTROLLER DRIVER
M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
S: Supported
-F: drivers/reset/reset-hsdk-v1.c
-F: include/dt-bindings/reset/snps,hsdk-v1-reset.h
-F: Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt
+F: drivers/reset/reset-hsdk.c
+F: include/dt-bindings/reset/snps,hsdk-reset.h
+F: Documentation/devicetree/bindings/reset/snps,hsdk-reset.txt
SYSTEM CONFIGURATION (SYSCON)
M: Lee Jones <lee.jones@linaro.org>