summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-19 05:03:45 +0300
committerOlof Johansson <olof@lixom.net>2017-06-19 05:03:45 +0300
commitf44a12dcd9b8490bf520b6c3bd3982761fc7fdad (patch)
treeaa6ef233b191e50f76e8ac5bfd1158821de9f517 /MAINTAINERS
parent8b4a35876d7fadc6138ee0b12342cab622981dbd (diff)
parent28df169b9afa121153ef2a3ef4ceae72512cde6d (diff)
downloadlinux-f44a12dcd9b8490bf520b6c3bd3982761fc7fdad.tar.xz
Merge tag 'reset-for-4.13-2' of git://git.pengutronix.de/git/pza/linux into next/drivers
Reset controller changes for v4.13, part 2 - Add reset manager offsets for Stratix10 - Use kref for reset contol reference counting - Add new TI SCI reset driver for TI Keystone SoCs * tag 'reset-for-4.13-2' of git://git.pengutronix.de/git/pza/linux: reset: Add the TI SCI reset driver dt-bindings: reset: Add TI SCI reset binding reset: use kref for reference counting dt-bindings: reset: Add reset manager offsets for Stratix10 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 053c3bdd1fe5..378133ba441a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12633,6 +12633,8 @@ F: include/linux/soc/ti/ti_sci_protocol.h
F: Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
F: include/dt-bindings/genpd/k2g.h
F: drivers/soc/ti/ti_sci_pm_domains.c
+F: Documentation/devicetree/bindings/reset/ti,sci-reset.txt
+F: drivers/reset/reset-ti-sci.c
THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
M: Hans Verkuil <hverkuil@xs4all.nl>