Merge tag 'hwmon-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

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

diff --git a/MAINTAINERS b/MAINTAINERS
index ac0ff5f..5e678f6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -880,13 +880,6 @@ S: Supported
 T:     git git://people.freedesktop.org/~agd5f/linux
 F:     drivers/gpu/drm/amd/display/
 
-AMD ENERGY DRIVER
-M:     Naveen Krishna Chatradhi <nchatrad@amd.com>
-L:     linux-hwmon@vger.kernel.org
-S:     Maintained
-F:     Documentation/hwmon/amd_energy.rst
-F:     drivers/hwmon/amd_energy.c
-
 AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 M:     Huang Rui <ray.huang@amd.com>
 L:     linux-hwmon@vger.kernel.org
@@ -7927,6 +7920,7 @@ F:        Documentation/hwmon/
 F:     drivers/hwmon/
 F:     include/linux/hwmon*.h
 F:     include/trace/events/hwmon*.h
+K:     (devm_)?hwmon_device_(un)?register(|_with_groups|_with_info)
 
 HARDWARE RANDOM NUMBER GENERATOR CORE
 M:     Matt Mackall <mpm@selenic.com>
@@ -10898,6 +10892,13 @@ S:     Orphan
 F:     drivers/video/fbdev/matrox/matroxfb_*
 F:     include/uapi/linux/matroxfb.h
 
+MAX15301 DRIVER
+M:     Daniel Nilsson <daniel.nilsson@flex.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/max15301.rst
+F:     drivers/hwmon/pmbus/max15301.c
+
 MAX16065 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-hwmon@vger.kernel.org
@@ -13027,6 +13028,13 @@ L:     linux-nfc@lists.01.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/nfc/nxp-nci
 
+NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
+M:     Jonas Malaco <jonas@protocubo.io>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/nzxt-kraken2.rst
+F:     drivers/hwmon/nzxt-kraken2.c
+
 OBJAGG
 M:     Jiri Pirko <jiri@nvidia.com>
 L:     netdev@vger.kernel.org
@@ -17068,6 +17076,13 @@ L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-stm32*
 
+ST STPDDC60 DRIVER
+M:     Daniel Nilsson <daniel.nilsson@flex.com>
+L:     linux-hwmon@vger.kernel.org
+S:     Maintained
+F:     Documentation/hwmon/stpddc60.rst
+F:     drivers/hwmon/pmbus/stpddc60.c
+
 ST VL53L0X ToF RANGER(I2C) IIO DRIVER
 M:     Song Qiang <songqiang1304521@gmail.com>
 L:     linux-iio@vger.kernel.org