Merge tag 'thermal-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c0cde28c62c623e878c23ad3869d61a40dd54f16..4accfb9f0865490c62bedf9262ac68ad73fb2600 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3039,7 +3039,7 @@ F:        drivers/video/fbdev/wm8505fb*
 F:     drivers/video/fbdev/wmt_ge_rops.*
 
 ARM/ZYNQ ARCHITECTURE
-M:     Michal Simek <michal.simek@xilinx.com>
+M:     Michal Simek <michal.simek@amd.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 W:     http://wiki.xilinx.com
@@ -10556,12 +10556,6 @@ F:     drivers/hwmon/intel-m10-bmc-hwmon.c
 F:     drivers/mfd/intel-m10-bmc*
 F:     include/linux/mfd/intel-m10-bmc.h
 
-INTEL MENLOW THERMAL DRIVER
-M:     Sujith Thomas <sujith.thomas@intel.com>
-L:     linux-pm@vger.kernel.org
-S:     Supported
-F:     drivers/thermal/intel/intel_menlow.c
-
 INTEL P-Unit IPC DRIVER
 M:     Zha Qipeng <qipeng.zha@intel.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -20136,6 +20130,13 @@ S:     Supported
 F:     Documentation/devicetree/bindings/rng/starfive*
 F:     drivers/char/hw_random/jh7110-trng.c
 
+STARFIVE WATCHDOG DRIVER
+M:     Xingyu Wu <xingyu.wu@starfivetech.com>
+M:     Samin Guo <samin.guo@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/watchdog/starfive*
+F:     drivers/watchdog/starfive-wdt.c
+
 STATIC BRANCH/CALL
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Josh Poimboeuf <jpoimboe@kernel.org>
@@ -22706,9 +22707,8 @@ S:      Maintained
 F:     drivers/media/rc/winbond-cir.c
 
 WINSYSTEMS EBC-C384 WATCHDOG DRIVER
-M:     William Breathitt Gray <william.gray@linaro.org>
 L:     linux-watchdog@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/watchdog/ebc-c384_wdt.c
 
 WINSYSTEMS WS16C48 GPIO DRIVER
@@ -23129,7 +23129,7 @@ F:      drivers/net/can/xilinx_can.c
 XILINX GPIO DRIVER
 M:     Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
 R:     Srinivas Neeli <srinivas.neeli@xilinx.com>
-R:     Michal Simek <michal.simek@xilinx.com>
+R:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
 F:     Documentation/devicetree/bindings/gpio/gpio-zynq.yaml
@@ -23169,6 +23169,14 @@ F:     Documentation/devicetree/bindings/media/xilinx/
 F:     drivers/media/platform/xilinx/
 F:     include/uapi/linux/xilinx-v4l2-controls.h
 
+XILINX WATCHDOG DRIVER
+M:     Srinivas Neeli <srinivas.neeli@amd.com>
+R:     Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
+R:     Michal Simek <michal.simek@amd.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/watchdog/xlnx,xps-timebase-wdt.yaml
+F:     drivers/watchdog/of_xilinx_wdt.c
+
 XILINX XDMA DRIVER
 M:     Lizhi Hou <lizhi.hou@amd.com>
 M:     Brian Xu <brian.xu@amd.com>