Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
drivers/platform/x86/Kconfig | 11 -----------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 3 ++-
drivers/platform/x86/intel/mrfld/Kconfig | 17 +++++++++++++++++
drivers/platform/x86/intel/mrfld/Makefile | 6 ++++++
.../x86/{ => intel/mrfld}/intel_mrfld_pwrbtn.c | 0
7 files changed, 27 insertions(+), 13 deletions(-)
create mode 100644 drivers/platform/x86/intel/mrfld/Kconfig
create mode 100644 drivers/platform/x86/intel/mrfld/Makefile
rename drivers/platform/x86/{ => intel/mrfld}/intel_mrfld_pwrbtn.c (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 8b71eca4fc22..ecd8daf6c240 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1086,17 +1086,6 @@ config INTEL_UNCORE_FREQ_CONTROL
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 ee613ece9d8a..a659fdcfd2d3 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -123,7 +123,7 @@ 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_PMT_CLASS) += intel_pmt_class.o
obj-$(CONFIG_INTEL_PMT_TELEMETRY) += intel_pmt_telemetry.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index d09795dfccbf..afbf34a12811 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -23,5 +23,6 @@ source "drivers/platform/x86/intel/hid/Kconfig"
source "drivers/platform/x86/intel/wmi/Kconfig"
source "drivers/platform/x86/intel/bxtwc/Kconfig"
source "drivers/platform/x86/intel/chtdc_ti/Kconfig"
+source "drivers/platform/x86/intel/mrfld/Kconfig"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index fdfa1cb6a8a7..f5fe2ff0417b 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -15,4 +15,5 @@ obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += wmi/
# Intel PMIC / PMC / P-Unit devices
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += bxtwc/
-obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += chtdc_ti/
\ No newline at end of file
+obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += chtdc_ti/
+obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += mrfld/
\ No newline at end of file
diff --git a/drivers/platform/x86/intel/mrfld/Kconfig b/drivers/platform/x86/intel/mrfld/Kconfig
new file mode 100644
index 000000000000..657281203062
--- /dev/null
+++ b/drivers/platform/x86/intel/mrfld/Kconfig
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+
+
+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.
diff --git a/drivers/platform/x86/intel/mrfld/Makefile b/drivers/platform/x86/intel/mrfld/Makefile
new file mode 100644
index 000000000000..9a31c21b0bec
--- /dev/null
+++ b/drivers/platform/x86/intel/mrfld/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+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/intel_mrfld_pwrbtn.c
similarity index 100%
rename from drivers/platform/x86/intel_mrfld_pwrbtn.c
rename to drivers/platform/x86/intel/mrfld/intel_mrfld_pwrbtn.c
--
2.31.1
