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

Move Intel PMC core driver to intel sub-directory to improve readability.

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-7-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 21813a0e00eb8db4e8e1bd7cd391c978621eb32a..eefe4edb1b3dcea57e91524be082da764031042e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9483,7 +9483,7 @@ M:        David E Box <david.e.box@intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-platform-intel-pmc
-F:     drivers/platform/x86/intel_pmc_core*
+F:     drivers/platform/x86/intel/pmc/
 
 INTEL PMIC GPIO DRIVERS
 M:     Andy Shevchenko <andy@kernel.org>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 9cadce7908eaa2f5f41cb7156692430cb40c9d9a..aed7570388ef1c650e23babd20e070ede7775bc8 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1159,27 +1159,6 @@ config INTEL_UNCORE_FREQ_CONTROL
          To compile this driver as a module, choose M here: the module
          will be called intel-uncore-frequency.
 
-config INTEL_PMC_CORE
-       tristate "Intel PMC Core driver"
-       depends on PCI
-       depends on ACPI
-       help
-         The Intel Platform Controller Hub for Intel Core SoCs provides access
-         to Power Management Controller registers via various interfaces. This
-         driver can utilize debugging capabilities and supported features as
-         exposed by the Power Management Controller. It also may perform some
-         tasks in the PMC in order to enable transition into the SLPS0 state.
-         It should be selected on all Intel platforms supported by the driver.
-
-         Supported features:
-               - SLP_S0_RESIDENCY counter
-               - PCH IP Power Gating status
-               - LTR Ignore / LTR Show
-               - MPHY/PLL gating status (Sunrisepoint PCH only)
-               - SLPS0 Debug registers (Cannonlake/Icelake PCH)
-               - Low Power Mode registers (Tigerlake and beyond)
-               - PMC quirks as needed to enable SLPS0/S0ix
-
 config INTEL_SCU_IPC
        bool
 

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 776370ce8fbbb4b84f54e6636be19b81a6622e31..1668f736083399ef3ae756c191b0ee5b081fbdb5 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -127,7 +127,6 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3)                     += intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)                += intel-uncore-frequency.o
 
 # Intel PMIC / PMC / P-Unit devices
-obj-$(CONFIG_INTEL_PMC_CORE)           += intel_pmc_core.o intel_pmc_core_pltdrv.o
 obj-$(CONFIG_INTEL_SCU_IPC)            += intel_scu_ipc.o
 obj-$(CONFIG_INTEL_SCU_PCI)            += intel_scu_pcidrv.o
 obj-$(CONFIG_INTEL_SCU_PLATFORM)       += intel_scu_pltdrv.o

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index c4ceb5ee83f334532af6e4f6a9939c0be74cbf70..7de11636904d9b009390c85ab75ecc8013dee809 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -19,6 +19,7 @@ if X86_PLATFORM_DRIVERS_INTEL
 source "drivers/platform/x86/intel/int1092/Kconfig"
 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"
 
 config INTEL_BXTWC_PMIC_TMU

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 58fc8e7a3b629ef323d2543141f21dfd8e0da76d..a1555a1e421d8174de19bdd95b57ef60c1069a3f 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -7,6 +7,7 @@
 obj-$(CONFIG_INTEL_SAR_INT1092)                += int1092/
 obj-$(CONFIG_INTEL_CHT_INT33FE)                += int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)                += int3472/
+obj-$(CONFIG_INTEL_PMC_CORE)           += pmc/
 obj-$(CONFIG_INTEL_PMT_CLASS)          += pmt/
 
 # Intel PMIC / PMC / P-Unit drivers

diff --git a/drivers/platform/x86/intel/pmc/Kconfig b/drivers/platform/x86/intel/pmc/Kconfig
new file mode 100644 (file)
index 0000000..b526597
--- /dev/null
+++ b/drivers/platform/x86/intel/pmc/Kconfig
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Intel x86 Platform-Specific Drivers
+#
+
+config INTEL_PMC_CORE
+       tristate "Intel PMC Core driver"
+       depends on PCI
+       depends on ACPI
+       help
+         The Intel Platform Controller Hub for Intel Core SoCs provides access
+         to Power Management Controller registers via various interfaces. This
+         driver can utilize debugging capabilities and supported features as
+         exposed by the Power Management Controller. It also may perform some
+         tasks in the PMC in order to enable transition into the SLPS0 state.
+         It should be selected on all Intel platforms supported by the driver.
+
+         Supported features:
+               - SLP_S0_RESIDENCY counter
+               - PCH IP Power Gating status
+               - LTR Ignore / LTR Show
+               - MPHY/PLL gating status (Sunrisepoint PCH only)
+               - SLPS0 Debug registers (Cannonlake/Icelake PCH)
+               - Low Power Mode registers (Tigerlake and beyond)
+               - PMC quirks as needed to enable SLPS0/S0ix

diff --git a/drivers/platform/x86/intel/pmc/Makefile b/drivers/platform/x86/intel/pmc/Makefile
new file mode 100644 (file)
index 0000000..8966fcd
--- /dev/null
+++ b/drivers/platform/x86/intel/pmc/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Intel x86 Platform-Specific Drivers
+#
+
+intel_pmc_core-y                       := core.o
+obj-$(CONFIG_INTEL_PMC_CORE)           += intel_pmc_core.o
+intel_pmc_core_pltdrv-y                        := pltdrv.o
+obj-$(CONFIG_INTEL_PMC_CORE)           += intel_pmc_core_pltdrv.o

diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel/pmc/core.c
similarity index 99%
rename from drivers/platform/x86/intel_pmc_core.c
rename to drivers/platform/x86/intel/pmc/core.c
index ae410a358ffe0489ea709ec82ee21b8bccac43d8..9963bc3d470c1d70d886eae95af7fe128ad50043 100644 (file)
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -31,7 +31,7 @@
 #include <asm/msr.h>
 #include <asm/tsc.h>
 
-#include "intel_pmc_core.h"
+#include "core.h"
 
 #define ACPI_S0IX_DSM_UUID             "57a6512e-3979-4e9d-9708-ff13b2508972"
 #define ACPI_GET_LOW_MODE_REGISTERS    1

diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel/pmc/core.h
similarity index 100%
rename from drivers/platform/x86/intel_pmc_core.h
rename to drivers/platform/x86/intel/pmc/core.h

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