platform/x86: intel_telemetry: Move to intel sub-directory

Move Intel telemetry driver to intel sub-directory to improve readability.

While at it, spell APL fully in the Kconfig.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
Link: https://lore.kernel.org/r/20210820110458.73018-9-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index eefe4ed..bb0fcf3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9559,7 +9559,7 @@ M:        "David E. Box" <david.e.box@linux.intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     arch/x86/include/asm/intel_telemetry.h
-F:     drivers/platform/x86/intel_telemetry*
+F:     drivers/platform/x86/intel/telemetry/
 
 INTEL UNCORE FREQUENCY CONTROL
 M:     Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index aed7570..4e42eba 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1206,18 +1206,6 @@ config INTEL_SCU_IPC_UTIL
          low level access for debug work and updating the firmware. Say
          N unless you will be doing this on an Intel MID platform.
 
-config INTEL_TELEMETRY
-       tristate "Intel SoC Telemetry Driver"
-       depends on X86_64
-       depends on MFD_INTEL_PMC_BXT
-       depends on INTEL_PUNIT_IPC
-       help
-         This driver provides interfaces to configure and use
-         telemetry for INTEL SoC from APL onwards. It is also
-         used to get various SoC events and parameters
-         directly via debugfs files. Various tools may use
-         this interface for SoC state monitoring.
-
 endif # X86_PLATFORM_DEVICES
 
 config PMC_ATOM

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 1668f73..bde20c1 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -132,7 +132,4 @@ obj-$(CONFIG_INTEL_SCU_PCI)         += intel_scu_pcidrv.o
 obj-$(CONFIG_INTEL_SCU_PLATFORM)       += intel_scu_pltdrv.o
 obj-$(CONFIG_INTEL_SCU_WDT)            += intel_scu_wdt.o
 obj-$(CONFIG_INTEL_SCU_IPC_UTIL)       += intel_scu_ipcutil.o
-obj-$(CONFIG_INTEL_TELEMETRY)          += intel_telemetry_core.o \
-                                          intel_telemetry_pltdrv.o \
-                                          intel_telemetry_debugfs.o
 obj-$(CONFIG_PMC_ATOM)                 += pmc_atom.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 7de1163..379d9e4 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -21,6 +21,7 @@ source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
 source "drivers/platform/x86/intel/pmc/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
+source "drivers/platform/x86/intel/telemetry/Kconfig"
 
 config INTEL_BXTWC_PMIC_TMU
        tristate "Intel Broxton Whiskey Cove TMU Driver"

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index a1555a1..e8c2b12 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_INTEL_CHT_INT33FE)         += int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)                += int3472/
 obj-$(CONFIG_INTEL_PMC_CORE)           += pmc/
 obj-$(CONFIG_INTEL_PMT_CLASS)          += pmt/
+obj-$(CONFIG_INTEL_TELEMETRY)          += telemetry/
 
 # Intel PMIC / PMC / P-Unit drivers
 intel_bxtwc_tmu-y                      := bxtwc_tmu.o

diff --git a/drivers/platform/x86/intel/telemetry/Kconfig b/drivers/platform/x86/intel/telemetry/Kconfig
new file mode 100644 (file)
index 0000000..da887bd
--- /dev/null
+++ b/drivers/platform/x86/intel/telemetry/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_TELEMETRY
+       tristate "Intel SoC Telemetry driver"
+       depends on X86_64
+       depends on MFD_INTEL_PMC_BXT
+       depends on INTEL_PUNIT_IPC
+       help
+         This driver provides interfaces to configure and use
+         telemetry for Intel SoC from Apollo Lake onwards.
+         It is also used to get various SoC events and parameters
+         directly via debugfs files. Various tools may use
+         this interface for SoC state monitoring.

diff --git a/drivers/platform/x86/intel/telemetry/Makefile b/drivers/platform/x86/intel/telemetry/Makefile
new file mode 100644 (file)
index 0000000..bfdba5b
--- /dev/null
+++ b/drivers/platform/x86/intel/telemetry/Makefile
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+intel_telemetry_core-y                 := core.o
+obj-$(CONFIG_INTEL_TELEMETRY)          += intel_telemetry_core.o
+intel_telemetry_pltdrv-y               := pltdrv.o
+obj-$(CONFIG_INTEL_TELEMETRY)          += intel_telemetry_pltdrv.o
+intel_telemetry_debugfs-y              := debugfs.o
+obj-$(CONFIG_INTEL_TELEMETRY)          += intel_telemetry_debugfs.o

diff --git a/drivers/platform/x86/intel_telemetry_core.c b/drivers/platform/x86/intel/telemetry/core.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_core.c
rename to drivers/platform/x86/intel/telemetry/core.c

diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel/telemetry/debugfs.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_debugfs.c
rename to drivers/platform/x86/intel/telemetry/debugfs.c

diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel/telemetry/pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_pltdrv.c
rename to drivers/platform/x86/intel/telemetry/pltdrv.c