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/chtdc_ti/Kconfig | 16 ++++++++++++++++
drivers/platform/x86/intel/chtdc_ti/Makefile | 7 +++++++
.../{ => intel/chtdc_ti}/intel_chtdc_ti_pwrbtn.c | 0
7 files changed, 27 insertions(+), 13 deletions(-)
create mode 100644 drivers/platform/x86/intel/chtdc_ti/Kconfig
create mode 100644 drivers/platform/x86/intel/chtdc_ti/Makefile
rename drivers/platform/x86/{ => intel/chtdc_ti}/intel_chtdc_ti_pwrbtn.c (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 9fe7fca8b572..8b71eca4fc22 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_CHTDC_TI_PWRBTN
- tristate "Intel Cherry Trail Dollar Cove TI power button driver"
- depends on INTEL_SOC_PMIC_CHTDC_TI
- depends on INPUT
- help
- This option adds a power button driver driver for Dollar Cove TI
- PMIC on Intel Cherry Trail devices.
-
- 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
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 12b7d6338747..ee613ece9d8a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -122,7 +122,7 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
# Intel PMIC / PMC / P-Unit devices
-obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o
+
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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 319244c251db..d09795dfccbf 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -22,5 +22,6 @@ source "drivers/platform/x86/intel/atomisp2/Kconfig"
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"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index a6945e2dcd1c..fdfa1cb6a8a7 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -14,4 +14,5 @@ obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += wmi/
# Intel PMIC / PMC / P-Unit devices
-obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += bxtwc/
\ No newline at end of file
+obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += bxtwc/
+obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += chtdc_ti/
\ No newline at end of file
diff --git a/drivers/platform/x86/intel/chtdc_ti/Kconfig b/drivers/platform/x86/intel/chtdc_ti/Kconfig
new file mode 100644
index 000000000000..7023380ee5e5
--- /dev/null
+++ b/drivers/platform/x86/intel/chtdc_ti/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+
+config INTEL_CHTDC_TI_PWRBTN
+ tristate "Intel Cherry Trail Dollar Cove TI power button driver"
+ depends on INTEL_SOC_PMIC_CHTDC_TI
+ depends on INPUT
+ help
+ This option adds a power button driver driver for Dollar Cove TI
+ PMIC on Intel Cherry Trail devices.
+
+ To compile this driver as a module, choose M here: the module
+ will be called intel_chtdc_ti_pwrbtn.
diff --git a/drivers/platform/x86/intel/chtdc_ti/Makefile b/drivers/platform/x86/intel/chtdc_ti/Makefile
new file mode 100644
index 000000000000..16b24796008c
--- /dev/null
+++ b/drivers/platform/x86/intel/chtdc_ti/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+
+obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o
diff --git a/drivers/platform/x86/intel_chtdc_ti_pwrbtn.c b/drivers/platform/x86/intel/chtdc_ti/intel_chtdc_ti_pwrbtn.c
similarity index 100%
rename from drivers/platform/x86/intel_chtdc_ti_pwrbtn.c
rename to drivers/platform/x86/intel/chtdc_ti/intel_chtdc_ti_pwrbtn.c
--
2.31.1
