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

Move Intel P-Unit IPC 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>
Link: https://lore.kernel.org/r/20210820110458.73018-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index b731988a4452ab6d6889b31124ea2e1236ed47ea..21813a0e00eb8db4e8e1bd7cd391c978621eb32a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9475,7 +9475,7 @@ M:        Zha Qipeng <qipeng.zha@intel.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     arch/x86/include/asm/intel_punit_ipc.h
-F:     drivers/platform/x86/intel_punit_ipc.c
+F:     drivers/platform/x86/intel/punit_ipc.c
 
 INTEL PMC CORE DRIVER
 M:     Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 2d6723bb645930af4eb43bda637417f39000f7d3..9cadce7908eaa2f5f41cb7156692430cb40c9d9a 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1180,12 +1180,6 @@ config INTEL_PMC_CORE
                - Low Power Mode registers (Tigerlake and beyond)
                - PMC quirks as needed to enable SLPS0/S0ix
 
-config INTEL_PUNIT_IPC
-       tristate "Intel P-Unit IPC Driver"
-       help
-         This driver provides support for Intel P-Unit Mailbox IPC mechanism,
-         which is used to bridge the communications between kernel and P-Unit.
-
 config INTEL_SCU_IPC
        bool
 

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index f70c0aa30cdd011213011be47850c4a41ad51a12..776370ce8fbbb4b84f54e6636be19b81a6622e31 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -128,7 +128,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_PUNIT_IPC)          += intel_punit_ipc.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 9e719db8450c145c06762fe6da4e9433a805c529..c4ceb5ee83f334532af6e4f6a9939c0be74cbf70 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -53,4 +53,10 @@ config INTEL_MRFLD_PWRBTN
          To compile this driver as a module, choose M here: the module
          will be called intel_mrfld_pwrbtn.
 
+config INTEL_PUNIT_IPC
+       tristate "Intel P-Unit IPC Driver"
+       help
+         This driver provides support for Intel P-Unit Mailbox IPC mechanism,
+         which is used to bridge the communications between kernel and P-Unit.
+
 endif # X86_PLATFORM_DRIVERS_INTEL

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 4ff755a1177042ce3bc8ec60cada13bb227c22d2..58fc8e7a3b629ef323d2543141f21dfd8e0da76d 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -16,3 +16,5 @@ intel_chtdc_ti_pwrbtn-y                       := chtdc_ti_pwrbtn.o
 obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)    += intel_chtdc_ti_pwrbtn.o
 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

diff --git a/drivers/platform/x86/intel_punit_ipc.c b/drivers/platform/x86/intel/punit_ipc.c
similarity index 100%
rename from drivers/platform/x86/intel_punit_ipc.c
rename to drivers/platform/x86/intel/punit_ipc.c