From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Hans de Goede <hdegoede@redhat.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Kate Hsuan <hpa@redhat.com>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
linux-kernel@vger.kernel.org,
platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com
Cc: Mark Gross <mgross@linux.intel.com>,
Alex Hung <alex.hung@canonical.com>,
Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>,
David E Box <david.e.box@intel.com>,
Zha Qipeng <qipeng.zha@intel.com>,
"David E. Box" <david.e.box@linux.intel.com>,
AceLan Kao <acelan.kao@canonical.com>,
Jithu Joseph <jithu.joseph@intel.com>,
Maurice Ma <maurice.ma@intel.com>
Subject: [PATCH v5 06/20] platform/x86: intel_pmc_core: Move to intel sub-directory
Date: Fri, 20 Aug 2021 14:04:44 +0300 [thread overview]
Message-ID: <20210820110458.73018-7-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210820110458.73018-1-andriy.shevchenko@linux.intel.com>
From: Kate Hsuan <hpa@redhat.com>
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>
---
MAINTAINERS | 2 +-
drivers/platform/x86/Kconfig | 21 ----------------
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/intel/pmc/Kconfig | 25 +++++++++++++++++++
drivers/platform/x86/intel/pmc/Makefile | 9 +++++++
.../{intel_pmc_core.c => intel/pmc/core.c} | 2 +-
.../{intel_pmc_core.h => intel/pmc/core.h} | 0
.../pmc/pltdrv.c} | 0
10 files changed, 38 insertions(+), 24 deletions(-)
create mode 100644 drivers/platform/x86/intel/pmc/Kconfig
create mode 100644 drivers/platform/x86/intel/pmc/Makefile
rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/core.c} (99%)
rename drivers/platform/x86/{intel_pmc_core.h => intel/pmc/core.h} (100%)
rename drivers/platform/x86/{intel_pmc_core_pltdrv.c => intel/pmc/pltdrv.c} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 21813a0e00eb..eefe4edb1b3d 100644
--- 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 9cadce7908ea..aed7570388ef 100644
--- 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 776370ce8fbb..1668f7360833 100644
--- 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 c4ceb5ee83f3..7de11636904d 100644
--- 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 58fc8e7a3b62..a1555a1e421d 100644
--- 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
index 000000000000..b526597e4deb
--- /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
index 000000000000..8966fcdc0e1d
--- /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 ae410a358ffe..9963bc3d470c 100644
--- 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
--
2.32.0
next prev parent reply other threads:[~2021-08-20 11:06 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 01/20] platform/x86: intel_scu_ipc: Fix doc of intel_scu_ipc_dev_command_with_size() Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 02/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 03/20] platform/x86: intel_chtdc_ti_pwrbtn: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 04/20] platform/x86: intel_mrfld_pwrbtn: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 05/20] platform/x86: intel_punit_ipc: " Andy Shevchenko
2021-08-20 11:04 ` Andy Shevchenko [this message]
2021-08-20 11:04 ` [PATCH v5 07/20] platform/x86: pmc_atom: " Andy Shevchenko
2021-08-20 18:18 ` Hans de Goede
2021-08-23 7:32 ` Andy Shevchenko
2021-08-23 7:35 ` Hans de Goede
2021-08-20 11:04 ` [PATCH v5 08/20] platform/x86: intel_telemetry: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 09/20] platform/x86: intel-rst: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 10/20] platform/x86: intel-smartconnect: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 11/20] platform/x86: intel_turbo_max_3: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 12/20] platform/x86: intel-uncore-frequency: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 13/20] platform/x86: intel_speed_select_if: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 14/20] platform/x86: intel_atomisp2: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 15/20] platform/x86: intel-hid: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 16/20] platform/x86: intel_int0002_vgpio: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 17/20] platform/x86: intel_oaktrail: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 18/20] platform/x86: intel-vbtn: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 19/20] platform/x86: intel-wmi-sbl-fw-update: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 20/20] platform/x86: intel-wmi-thunderbolt: " Andy Shevchenko
2021-08-20 18:38 ` [PATCH v5 00/20] platform/x86: Intel platform driver code movement Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210820110458.73018-7-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=Dell.Client.Kernel@dell.com \
--cc=acelan.kao@canonical.com \
--cc=alex.hung@canonical.com \
--cc=david.e.box@intel.com \
--cc=david.e.box@linux.intel.com \
--cc=hdegoede@redhat.com \
--cc=hpa@redhat.com \
--cc=irenic.rajneesh@gmail.com \
--cc=jithu.joseph@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maurice.ma@intel.com \
--cc=mgross@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=qipeng.zha@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.