From: Kate Hsuan <hpa@redhat.com>
To: Alex Hung <alex.hung@canonical.com>,
Hans de Goede <hdegoede@redhat.com>,
Mark Gross <mgross@linux.intel.com>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
AceLan Kao <acelan.kao@canonical.com>,
Jithu Joseph <jithu.joseph@intel.com>,
Maurice Ma <maurice.ma@intel.com>,
Sujith Thomas <sujith.thomas@intel.com>,
Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>,
Zha Qipeng <qipeng.zha@intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"David E . Box" <david.e.box@linux.intel.com>,
linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com
Cc: platform-driver-x86@vger.kernel.org, Kate Hsuan <hpa@redhat.com>
Subject: [PATCH v2 05/20] platform/x86: intel_pmc_core: Move to intel sub-directory
Date: Mon, 16 Aug 2021 18:51:04 +0800 [thread overview]
Message-ID: <20210816105119.704302-6-hpa@redhat.com> (raw)
In-Reply-To: <20210816105119.704302-1-hpa@redhat.com>
Move intel_pmc_core to intel sub-directory
to improve readability.
Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
drivers/platform/x86/Kconfig | 21 ---------------
drivers/platform/x86/Makefile | 2 --
drivers/platform/x86/intel/Kconfig | 2 ++
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/intel/pmc/Kconfig | 26 +++++++++++++++++++
drivers/platform/x86/intel/pmc/Makefile | 9 +++++++
.../x86/{ => intel/pmc}/intel_pmc_core.h | 0
.../pmc/pmc_core.c} | 0
.../pmc/pmc_core_pltdrv.c} | 0
9 files changed, 38 insertions(+), 23 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}/intel_pmc_core.h (100%)
rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/pmc_core.c} (100%)
rename drivers/platform/x86/{intel_pmc_core_pltdrv.c => intel/pmc/pmc_core_pltdrv.c} (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index fbadb19e5a6c..7d929970fb38 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1168,27 +1168,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 6d03005e6e36..152ef10d2a2b 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -129,8 +129,6 @@ 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 2555bed25d27..4d689d0be585 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -58,4 +58,6 @@ config INTEL_PUNIT_IPC
This driver provides support for Intel P-Unit Mailbox IPC mechanism,
which is used to bridge the communications between kernel and P-Unit.
+source "drivers/platform/x86/intel/pmc/Kconfig"
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index af78691a7b34..0986da945239 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -17,3 +17,4 @@ intel_mrfld_pwrbtn-y := mrfld_pwrbtn.o
obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o
intel_punit_ipc-y := punit_ipc.o
obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o
+obj-$(CONFIG_INTEL_PMC_CORE) += pmc/
diff --git a/drivers/platform/x86/intel/pmc/Kconfig b/drivers/platform/x86/intel/pmc/Kconfig
new file mode 100644
index 000000000000..d44a3e34210f
--- /dev/null
+++ b/drivers/platform/x86/intel/pmc/Kconfig
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86
+# 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..56021752fceb
--- /dev/null
+++ b/drivers/platform/x86/intel/pmc/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86
+# x86 Platform-Specific Drivers
+#
+
+intel_pmc_core-y := pmc_core.o
+intel_pmc_core_pltdrv-y := pmc_core_pltdrv.o
+obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core_pltdrv.o intel_pmc_core.o
diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel/pmc/intel_pmc_core.h
similarity index 100%
rename from drivers/platform/x86/intel_pmc_core.h
rename to drivers/platform/x86/intel/pmc/intel_pmc_core.h
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel/pmc/pmc_core.c
similarity index 100%
rename from drivers/platform/x86/intel_pmc_core.c
rename to drivers/platform/x86/intel/pmc/pmc_core.c
diff --git a/drivers/platform/x86/intel_pmc_core_pltdrv.c b/drivers/platform/x86/intel/pmc/pmc_core_pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_pmc_core_pltdrv.c
rename to drivers/platform/x86/intel/pmc/pmc_core_pltdrv.c
--
2.31.1
next prev parent reply other threads:[~2021-08-16 10:53 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-16 10:50 [PATCH v2 00/20] Intel platform driver code movement Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 01/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 02/20] platform/x86: intel_chtdc_ti_pwrbtn: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 03/20] platform/x86: intel_mrfld_pwrbtn: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 04/20] platform/x86: intel_punit_ipc: " Kate Hsuan
2021-08-16 10:51 ` Kate Hsuan [this message]
2021-08-16 10:51 ` [PATCH v2 06/20] platform/x86: intel_scu: " Kate Hsuan
2021-08-17 9:15 ` Mika Westerberg
2021-08-17 12:30 ` Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 07/20] platform/x86: intel_telemetry: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 08/20] platform/x86: intel_ips: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 09/20] platform/x86: intel-rst: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 10/20] platform/x86: intel-smartconnect: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 11/20] platform/x86: intel_turbo_max_3: " Kate Hsuan
2021-08-16 14:51 ` Pandruvada, Srinivas
2021-08-17 1:44 ` Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 12/20] platform/x86: intel-uncore-frequency: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 13/20] platform/x86: intel_speed_select_if: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 14/20] platform/x86: intel_atomisp2_led: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 15/20] platform/x86: intel-hid: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 16/20] platform/x86: intel_int0002_vgpio: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 17/20] platform/x86: intel_oaktrail.c: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 18/20] platform/x86: intel-vbtn: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 19/20] platform/x86: intel-wmi-sbl-fw-updat: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 20/20] platform/x86: intel-wmi-thunderbolt: " Kate Hsuan
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=20210816105119.704302-6-hpa@redhat.com \
--to=hpa@redhat.com \
--cc=Dell.Client.Kernel@dell.com \
--cc=acelan.kao@canonical.com \
--cc=alex.hung@canonical.com \
--cc=david.e.box@linux.intel.com \
--cc=hdegoede@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=mika.westerberg@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=qipeng.zha@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=sujith.thomas@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).