---
drivers/platform/x86/Kconfig | 9 ---------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 4 ++++
drivers/platform/x86/intel/bxtwc/Kconfig | 15 +++++++++++++++
drivers/platform/x86/intel/bxtwc/Makefile | 6 ++++++
.../x86/{ => intel/bxtwc}/intel_bxtwc_tmu.c | 0
7 files changed, 27 insertions(+), 10 deletions(-)
create mode 100644 drivers/platform/x86/intel/bxtwc/Kconfig
create mode 100644 drivers/platform/x86/intel/bxtwc/Makefile
rename drivers/platform/x86/{ => intel/bxtwc}/intel_bxtwc_tmu.c (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 2e45d5e0d08a..9fe7fca8b572 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1085,15 +1085,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_BXTWC_PMIC_TMU
- tristate "Intel BXT Whiskey Cove TMU Driver"
- depends on REGMAP
- depends on MFD_INTEL_PMC_BXT
- depends on INTEL_SOC_PMIC_BXTWC
- help
- Select this driver to use Intel BXT Whiskey Cove PMIC TMU feature.
- This driver enables the alarm wakeup functionality in the TMU unit
- of Whiskey Cove PMIC.
config INTEL_CHTDC_TI_PWRBTN
tristate "Intel Cherry Trail Dollar Cove TI power button driver"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index c184989563c8..12b7d6338747 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -121,7 +121,7 @@ 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_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
+
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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index d541e63d0d2b..319244c251db 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -21,5 +21,6 @@ source "drivers/platform/x86/intel/int3472/Kconfig"
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"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 653719491fa9..a6945e2dcd1c 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -11,3 +11,7 @@ obj-$(CONFIG_INTEL_ATOMISP2_PM) += atomisp2/
obj-$(CONFIG_INTEL_HID_EVENT) += hid/
obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += wmi/
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
diff --git a/drivers/platform/x86/intel/bxtwc/Kconfig b/drivers/platform/x86/intel/bxtwc/Kconfig
new file mode 100644
index 000000000000..87802bba9665
--- /dev/null
+++ b/drivers/platform/x86/intel/bxtwc/Kconfig
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+
+config INTEL_BXTWC_PMIC_TMU
+ tristate "Intel BXT Whiskey Cove TMU Driver"
+ depends on REGMAP
+ depends on MFD_INTEL_PMC_BXT
+ depends on INTEL_SOC_PMIC_BXTWC
+ help
+ Select this driver to use Intel BXT Whiskey Cove PMIC TMU feature.
+ This driver enables the alarm wakeup functionality in the TMU unit
+ of Whiskey Cove PMIC.
\ No newline at end of file
diff --git a/drivers/platform/x86/intel/bxtwc/Makefile b/drivers/platform/x86/intel/bxtwc/Makefile
new file mode 100644
index 000000000000..62b4ece63d0e
--- /dev/null
+++ b/drivers/platform/x86/intel/bxtwc/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel_bxtwc_tmu.c b/drivers/platform/x86/intel/bxtwc/intel_bxtwc_tmu.c
similarity index 100%
rename from drivers/platform/x86/intel_bxtwc_tmu.c
rename to drivers/platform/x86/intel/bxtwc/intel_bxtwc_tmu.c
--
2.31.1
