Merge tag 'regulator-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[tomoyo/tomoyo-test1.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 34bf84d..cbfdf73 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -842,6 +842,13 @@ 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
@@ -892,6 +899,11 @@ F: drivers/gpu/drm/amd/include/v9_structs.h
 F:     drivers/gpu/drm/amd/include/vi_structs.h
 F:     include/uapi/linux/kfd_ioctl.h
 
+AMD SPI DRIVER
+M:     Sanjay R Mehta <sanju.mehta@amd.com>
+S:     Maintained
+F:     drivers/spi/spi-amd.c
+
 AMD MP2 I2C DRIVER
 M:     Elie Morisse <syniurge@gmail.com>
 M:     Nehal Shah <nehal-bakulchandra.shah@amd.com>
@@ -7028,6 +7040,17 @@ F:       kernel/futex.c
 F:     tools/perf/bench/futex*
 F:     tools/testing/selftests/futex/
 
+GATEWORKS SYSTEM CONTROLLER (GSC) DRIVER
+M:     Tim Harvey <tharvey@gateworks.com>
+M:     Robert Jones <rjones@gateworks.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/mfd/gateworks-gsc.yaml
+F:     drivers/mfd/gateworks-gsc.c
+F:     include/linux/mfd/gsc.h
+F:     Documentation/hwmon/gsc-hwmon.rst
+F:     drivers/hwmon/gsc-hwmon.c
+F:     include/linux/platform_data/gsc_hwmon.h
+
 GASKET DRIVER FRAMEWORK
 M:     Rob Springer <rspringer@google.com>
 M:     Todd Poynor <toddpoynor@google.com>