platform/x86/intel: Move Intel PMT drivers to new subfolder

Move all Intel Platform Monitoring Technology drivers to
drivers/platform/x86/intel/pmt.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210727164928.3171521-1-david.e.box@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index a61f4f3b78a91f13e25826d1b407e9ccbbb48cf8..14dd0045bc78e5f1a56af690736cabdaf7926be6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9494,7 +9494,7 @@ INTEL PMT DRIVER
 M:     "David E. Box" <david.e.box@linux.intel.com>
 S:     Maintained
 F:     drivers/mfd/intel_pmt.c
-F:     drivers/platform/x86/intel_pmt_*
+F:     drivers/platform/x86/intel/pmt/
 
 INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 M:     Stanislav Yakovlev <stas.yakovlev@gmail.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index d12db6c316ea2b9a8528a7012949d4b0a8cc906f..6ad35158ae4ef0fc35c7671ff66a2376da9bb6c5 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1208,42 +1208,6 @@ config INTEL_PMC_CORE
                - Low Power Mode registers (Tigerlake and beyond)
                - PMC quirks as needed to enable SLPS0/S0ix
 
-config INTEL_PMT_CLASS
-       tristate
-       help
-         The Intel Platform Monitoring Technology (PMT) class driver provides
-         the basic sysfs interface and file hierarchy used by PMT devices.
-
-         For more information, see:
-         <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
-
-         To compile this driver as a module, choose M here: the module
-         will be called intel_pmt_class.
-
-config INTEL_PMT_TELEMETRY
-       tristate "Intel Platform Monitoring Technology (PMT) Telemetry driver"
-       depends on MFD_INTEL_PMT
-       select INTEL_PMT_CLASS
-       help
-         The Intel Platform Monitory Technology (PMT) Telemetry driver provides
-         access to hardware telemetry metrics on devices that support the
-         feature.
-
-         To compile this driver as a module, choose M here: the module
-         will be called intel_pmt_telemetry.
-
-config INTEL_PMT_CRASHLOG
-       tristate "Intel Platform Monitoring Technology (PMT) Crashlog driver"
-       depends on MFD_INTEL_PMT
-       select INTEL_PMT_CLASS
-       help
-         The Intel Platform Monitoring Technology (PMT) crashlog driver provides
-         access to hardware crashlog capabilities on devices that support the
-         feature.
-
-         To compile this driver as a module, choose M here: the module
-         will be called intel_pmt_crashlog.
-
 config INTEL_PUNIT_IPC
        tristate "Intel P-Unit IPC Driver"
        help

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 7ee369aab10d0150218f4580c8669967b63fd166..5edfdc2ea7f29d1fdf67606686d5c6dde167d4c9 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -129,9 +129,6 @@ obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)  += intel_bxtwc_tmu.o
 obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)    += intel_chtdc_ti_pwrbtn.o
 obj-$(CONFIG_INTEL_MRFLD_PWRBTN)       += intel_mrfld_pwrbtn.o
 obj-$(CONFIG_INTEL_PMC_CORE)           += intel_pmc_core.o intel_pmc_core_pltdrv.o
-obj-$(CONFIG_INTEL_PMT_CLASS)          += intel_pmt_class.o
-obj-$(CONFIG_INTEL_PMT_TELEMETRY)      += intel_pmt_telemetry.o
-obj-$(CONFIG_INTEL_PMT_CRASHLOG)       += intel_pmt_crashlog.o
 obj-$(CONFIG_INTEL_PUNIT_IPC)          += intel_punit_ipc.o
 obj-$(CONFIG_INTEL_SCU_IPC)            += intel_scu_ipc.o
 obj-$(CONFIG_INTEL_SCU_PCI)            += intel_scu_pcidrv.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index f2eef337eb98569c7840a0ecda69a8d0188c64bc..6eec084d9bf963865588a6e6fd7cad99b50d3568 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -18,5 +18,6 @@ if X86_PLATFORM_DRIVERS_INTEL
 
 source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
+source "drivers/platform/x86/intel/pmt/Kconfig"
 
 endif # X86_PLATFORM_DRIVERS_INTEL

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 0653055942d5b753e3f08f83cf0d04f647eaca6a..ca0ec2c85b0523554b3eaaadecd4b91e2af24cac 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -6,3 +6,4 @@
 
 obj-$(CONFIG_INTEL_CHT_INT33FE)                += int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)                += int3472/
+obj-$(CONFIG_INTEL_PMT_CLASS)          += pmt/

diff --git a/drivers/platform/x86/intel/pmt/Kconfig b/drivers/platform/x86/intel/pmt/Kconfig
new file mode 100644 (file)
index 0000000..d630f88
--- /dev/null
+++ b/drivers/platform/x86/intel/pmt/Kconfig
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel Platform Monitoring Technology drivers
+#
+
+config INTEL_PMT_CLASS
+       tristate
+       help
+         The Intel Platform Monitoring Technology (PMT) class driver provides
+         the basic sysfs interface and file hierarchy used by PMT devices.
+
+         For more information, see:
+         <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
+
+         To compile this driver as a module, choose M here: the module
+         will be called intel_pmt_class.
+
+config INTEL_PMT_TELEMETRY
+       tristate "Intel Platform Monitoring Technology (PMT) Telemetry driver"
+       depends on MFD_INTEL_PMT
+       select INTEL_PMT_CLASS
+       help
+         The Intel Platform Monitory Technology (PMT) Telemetry driver provides
+         access to hardware telemetry metrics on devices that support the
+         feature.
+
+         To compile this driver as a module, choose M here: the module
+         will be called intel_pmt_telemetry.
+
+config INTEL_PMT_CRASHLOG
+       tristate "Intel Platform Monitoring Technology (PMT) Crashlog driver"
+       depends on MFD_INTEL_PMT
+       select INTEL_PMT_CLASS
+       help
+         The Intel Platform Monitoring Technology (PMT) crashlog driver provides
+         access to hardware crashlog capabilities on devices that support the
+         feature.
+
+         To compile this driver as a module, choose M here: the module
+         will be called intel_pmt_crashlog.

diff --git a/drivers/platform/x86/intel/pmt/Makefile b/drivers/platform/x86/intel/pmt/Makefile
new file mode 100644 (file)
index 0000000..019103e
--- /dev/null
+++ b/drivers/platform/x86/intel/pmt/Makefile
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86/intel/pmt
+# Intel Platform Monitoring Technology Drivers
+#
+
+pmt_class-objs                         += class.o
+obj-$(CONFIG_INTEL_PMT_CLASS)          += pmt_class.o
+pmt_telemetry-objs                     += telemetry.o
+obj-$(CONFIG_INTEL_PMT_TELEMETRY)      += pmt_telemetry.o
+pmt_crashlog-objs                      += crashlog.o
+obj-$(CONFIG_INTEL_PMT_CRASHLOG)       += pmt_crashlog.o

diff --git a/drivers/platform/x86/intel_pmt_class.c b/drivers/platform/x86/intel/pmt/class.c
similarity index 99%
rename from drivers/platform/x86/intel_pmt_class.c
rename to drivers/platform/x86/intel/pmt/class.c
index c86ff15b1ed522be06f2c670a2f62c3bef70aa7d..659b1073033c2e300e7b9e78ebfa9c153d9fbb90 100644 (file)
--- a/drivers/platform/x86/intel_pmt_class.c
+++ b/drivers/platform/x86/intel/pmt/class.c
@@ -13,7 +13,7 @@
 #include <linux/mm.h>
 #include <linux/pci.h>
 
-#include "intel_pmt_class.h"
+#include "class.h"
 
 #define PMT_XA_START           0
 #define PMT_XA_MAX             INT_MAX

diff --git a/drivers/platform/x86/intel_pmt_class.h b/drivers/platform/x86/intel/pmt/class.h
similarity index 100%
rename from drivers/platform/x86/intel_pmt_class.h
rename to drivers/platform/x86/intel/pmt/class.h

diff --git a/drivers/platform/x86/intel_pmt_crashlog.c b/drivers/platform/x86/intel/pmt/crashlog.c
similarity index 99%
rename from drivers/platform/x86/intel_pmt_crashlog.c
rename to drivers/platform/x86/intel/pmt/crashlog.c
index 56963ceb6345f88408be9d686ac7f1c3fa057251..1c1021f04d3ca4661c08426fc82ea9df5377a122 100644 (file)
--- a/drivers/platform/x86/intel_pmt_crashlog.c
+++ b/drivers/platform/x86/intel/pmt/crashlog.c
@@ -15,7 +15,7 @@
 #include <linux/uaccess.h>
 #include <linux/overflow.h>
 
-#include "intel_pmt_class.h"
+#include "class.h"
 
 #define DRV_NAME               "pmt_crashlog"
 

diff --git a/drivers/platform/x86/intel_pmt_telemetry.c b/drivers/platform/x86/intel/pmt/telemetry.c
similarity index 99%
rename from drivers/platform/x86/intel_pmt_telemetry.c
rename to drivers/platform/x86/intel/pmt/telemetry.c
index 9b95ef0504576fcd998b2c567d819961daf37f07..a58843360fbf6494293c7ed425ba8f9ff8624787 100644 (file)
--- a/drivers/platform/x86/intel_pmt_telemetry.c
+++ b/drivers/platform/x86/intel/pmt/telemetry.c
@@ -15,7 +15,7 @@
 #include <linux/uaccess.h>
 #include <linux/overflow.h>
 
-#include "intel_pmt_class.h"
+#include "class.h"
 
 #define TELEM_DEV_NAME         "pmt_telemetry"