Merge branches 'clk-baikal', 'clk-broadcom', 'clk-vc5' and 'clk-versaclock' into...

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8a5012b..403c5f0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2178,7 +2178,7 @@ M:        Jean-Marie Verdun <verdun@hpe.com>
 M:     Nick Hawkins <nick.hawkins@hpe.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/hpe,gxp.yaml
-F:     Documentation/devicetree/bindings/spi/hpe,gxp-spi.yaml
+F:     Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
 F:     Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
 F:     arch/arm/boot/dts/hpe-bmc*
 F:     arch/arm/boot/dts/hpe-gxp*
@@ -4957,7 +4957,7 @@ F:        drivers/hwmon/lochnagar-hwmon.c
 F:     drivers/mfd/lochnagar-i2c.c
 F:     drivers/pinctrl/cirrus/pinctrl-lochnagar.c
 F:     drivers/regulator/lochnagar-regulator.c
-F:     include/dt-bindings/clk/lochnagar.h
+F:     include/dt-bindings/clock/lochnagar.h
 F:     include/dt-bindings/pinctrl/lochnagar.h
 F:     include/linux/mfd/lochnagar*
 F:     sound/soc/codecs/lochnagar-sc.c
@@ -5145,6 +5145,7 @@ T:        git git://git.samba.org/sfrench/cifs-2.6.git
 F:     Documentation/admin-guide/cifs/
 F:     fs/cifs/
 F:     fs/smbfs_common/
+F:     include/uapi/linux/cifs
 
 COMPACTPCI HOTPLUG CORE
 M:     Scott Murray <scott@spiteful.org>
@@ -17441,6 +17442,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/mtd/renesas-nandc.yaml
 F:     drivers/mtd/nand/raw/renesas-nand-controller.c
 
+RENESAS VERSACLOCK 7 CLOCK DRIVER
+M:     Alex Helms <alexander.helms.jy@renesas.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/clock/renesas,versaclock7.yaml
+F:     drivers/clk/clk-versaclock7.c
+
 RESET CONTROLLER FRAMEWORK
 M:     Philipp Zabel <p.zabel@pengutronix.de>
 S:     Maintained
@@ -17532,6 +17539,7 @@ F:      drivers/char/hw_random/mpfs-rng.c
 F:     drivers/clk/microchip/clk-mpfs.c
 F:     drivers/mailbox/mailbox-mpfs.c
 F:     drivers/pci/controller/pcie-microchip-host.c
+F:     drivers/reset/reset-mpfs.c
 F:     drivers/rtc/rtc-mpfs.c
 F:     drivers/soc/microchip/
 F:     drivers/spi/spi-microchip-core.c
@@ -18022,12 +18030,14 @@ Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 F:     drivers/media/platform/samsung/exynos4-is/
 
 SAMSUNG SOC CLOCK DRIVERS
+M:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 M:     Tomasz Figa <tomasz.figa@gmail.com>
 M:     Chanwoo Choi <cw00.choi@samsung.com>
 R:     Alim Akhtar <alim.akhtar@samsung.com>
 L:     linux-samsung-soc@vger.kernel.org
 S:     Supported
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
 F:     Documentation/devicetree/bindings/clock/samsung,*.yaml
 F:     Documentation/devicetree/bindings/clock/samsung,s3c*
@@ -20304,6 +20314,7 @@ R:      Sekhar Nori <nsekhar@ti.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/clock/ti/davinci/
 F:     drivers/clk/davinci/
+F:     include/linux/clk/davinci.h
 
 TI DAVINCI SERIES GPIO DRIVER
 M:     Keerthy <j-keerthy@ti.com>