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

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

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ba0454450335a66974c32192927ebf365512e9e5..2d6723bb645930af4eb43bda637417f39000f7d3 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1159,17 +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_MRFLD_PWRBTN
-       tristate "Intel Merrifield Basin Cove power button driver"
-       depends on INTEL_SOC_PMIC_MRFLD
-       depends on INPUT
-       help
-         This option adds a power button driver for Basin Cove PMIC
-         on Intel Merrifield devices.
-
-         To compile this driver as a module, choose M here: the module
-         will be called intel_mrfld_pwrbtn.
-
 config INTEL_PMC_CORE
        tristate "Intel PMC Core driver"
        depends on PCI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index bf94af0749f5d4db7cfe483ae8d73044411aeff5..f70c0aa30cdd011213011be47850c4a41ad51a12 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_MRFLD_PWRBTN)       += intel_mrfld_pwrbtn.o
 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

diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 3792a5492a8a18d59bdd435c6abf2338f5a2cd1f..9e719db8450c145c06762fe6da4e9433a805c529 100644 (file)
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -42,4 +42,15 @@ config INTEL_CHTDC_TI_PWRBTN
          To compile this driver as a module, choose M here: the module
          will be called intel_chtdc_ti_pwrbtn.
 
+config INTEL_MRFLD_PWRBTN
+       tristate "Intel Merrifield Basin Cove power button driver"
+       depends on INTEL_SOC_PMIC_MRFLD
+       depends on INPUT
+       help
+         This option adds a power button driver for Basin Cove PMIC
+         on Intel Merrifield devices.
+
+         To compile this driver as a module, choose M here: the module
+         will be called intel_mrfld_pwrbtn.
+
 endif # X86_PLATFORM_DRIVERS_INTEL

diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 52d7bc0948f3e5d7058b1846884c519d9f417b60..4ff755a1177042ce3bc8ec60cada13bb227c22d2 100644 (file)
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -14,3 +14,5 @@ intel_bxtwc_tmu-y                     := bxtwc_tmu.o
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)     += intel_bxtwc_tmu.o
 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

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