[PATCH v5 07/20] platform/x86: pmc_atom: Move to intel sub-directory

From: Andy Shevchenko
Date: Fri Aug 20 2021 - 07:05:47 EST


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

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
drivers/platform/x86/Kconfig | 5 -----
drivers/platform/x86/Makefile | 1 -
drivers/platform/x86/intel/Kconfig | 5 +++++
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/{ => intel}/pmc_atom.c | 0
5 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/platform/x86/{ => intel}/pmc_atom.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index aed7570388ef..e6fb3eb70ee7 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1219,8 +1219,3 @@ config INTEL_TELEMETRY
this interface for SoC state monitoring.

endif # X86_PLATFORM_DEVICES
-
-config PMC_ATOM
- def_bool y
- depends on PCI
- select COMMON_CLK
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 1668f7360833..de7f45b8e4f6 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -135,4 +135,3 @@ 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 7de11636904d..c4d74dff3a14 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -60,4 +60,9 @@ 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.

+config PMC_ATOM
+ def_bool y
+ depends on PCI
+ select COMMON_CLK
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index a1555a1e421d..8595f8b92f40 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -19,3 +19,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_PMC_ATOM) += pmc_atom.o
diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/intel/pmc_atom.c
similarity index 100%
rename from drivers/platform/x86/pmc_atom.c
rename to drivers/platform/x86/intel/pmc_atom.c
--
2.32.0