[PATCH 00/20] Move Intel platform drivers to intel directory to improve readability.

[PATCH 00/20] Move Intel platform drivers to intel directory to improve readability.

[Kate Hsuan]

All the intel platform specific drivers are moved to intel/.
It makes more clear file structure to improve the readability.

Kate Hsuan (20):
  Move Intel hid of pdx86 to intel directory to improve readability.
  Move Intel WMI driver of pdx86 to intel/ directory to improve
    readability.
  Move Intel bxtwc driver of pdx86 to intel/ directory to improve
    readability.
  Move Intel chtdc_ti driver of pdx86 to improve readability.
  Move MRFLD power button driver of pdx86 to intel directory to improve
    readability.
  Move Intel PMC core of pdx86 to intel/ directory to improve
    readability.
  Move Intel PMT driver of pdx86 to intel/ to improve readability.
  Move Intel P-Unit of pdx86 to intel/ directory to improve readability.
  Move Intel SCU IPC of pdx86 to intel directory to increase
    readability.
  Move Intel SoC telemetry driver to intel directory to improve
    readability.
  Move Intel IPS driver of pdx86 to improve readability.
  Move Intel RST driver of pdx86 to intel directory to improve
    readability.
  Move Intel smartconnect driver of pdx86 to intel/ directory to improve
    readability.
  Move Intel SST driver to intel/ directory to improve readability.
  Move Intel turbo max 3 driver to intel/ directory to improve
    readability.
  Move Intel uncore freq driver to intel/ directory to improve
    readability.
  Move Intel int0002 vgpio driver to intel/ directory to inprove
    readability.
  Move Intel thermal driver for menlow platform driver to intel/
    directory to improve readability.
  Move OakTrail driver to the intel/ directory to improve readability.
  Move Intel virtual botton driver to intel/ directory to improve
    readability.

 drivers/platform/x86/Kconfig                  | 297 ------------------
 drivers/platform/x86/Makefile                 |  34 +-
 drivers/platform/x86/intel/Kconfig            |  21 ++
 drivers/platform/x86/intel/Makefile           |  31 ++
 drivers/platform/x86/intel/bxtwc/Kconfig      |  15 +
 drivers/platform/x86/intel/bxtwc/Makefile     |   6 +
 .../x86/{ => intel/bxtwc}/intel_bxtwc_tmu.c   |   0
 drivers/platform/x86/intel/chtdc_ti/Kconfig   |  16 +
 drivers/platform/x86/intel/chtdc_ti/Makefile  |   7 +
 .../chtdc_ti}/intel_chtdc_ti_pwrbtn.c         |   0
 drivers/platform/x86/intel/hid/Kconfig        |  17 +
 drivers/platform/x86/intel/hid/Makefile       |   7 +
 .../platform/x86/{ => intel/hid}/intel-hid.c  |   0
 drivers/platform/x86/intel/int0002/Kconfig    |  23 ++
 drivers/platform/x86/intel/int0002/Makefile   |   6 +
 .../{ => intel/int0002}/intel_int0002_vgpio.c |   0
 .../{ => intel}/intel_speed_select_if/Kconfig |   0
 .../intel_speed_select_if/Makefile            |   0
 .../intel_speed_select_if/isst_if_common.c    |   0
 .../intel_speed_select_if/isst_if_common.h    |   0
 .../intel_speed_select_if/isst_if_mbox_msr.c  |   0
 .../intel_speed_select_if/isst_if_mbox_pci.c  |   0
 .../intel_speed_select_if/isst_if_mmio.c      |   0
 drivers/platform/x86/intel/ips/Kconfig        |  14 +
 drivers/platform/x86/intel/ips/Makefile       |   6 +
 .../platform/x86/{ => intel/ips}/intel_ips.c  |   0
 .../platform/x86/{ => intel/ips}/intel_ips.h  |   0
 drivers/platform/x86/intel/menlow/Kconfig     |  14 +
 drivers/platform/x86/intel/menlow/Makefile    |   6 +
 .../x86/{ => intel/menlow}/intel_menlow.c     |   0
 drivers/platform/x86/intel/mrfld/Kconfig      |  17 +
 drivers/platform/x86/intel/mrfld/Makefile     |   6 +
 .../{ => intel/mrfld}/intel_mrfld_pwrbtn.c    |   0
 drivers/platform/x86/intel/oaktrail/Kconfig   |  15 +
 drivers/platform/x86/intel/oaktrail/Makefile  |   6 +
 .../x86/{ => intel/oaktrail}/intel_oaktrail.c |   0
 drivers/platform/x86/intel/pmc_core/Kconfig   |  26 ++
 drivers/platform/x86/intel/pmc_core/Makefile  |   6 +
 .../x86/{ => intel/pmc_core}/intel_pmc_core.c |   0
 .../x86/{ => intel/pmc_core}/intel_pmc_core.h |   0
 .../pmc_core}/intel_pmc_core_pltdrv.c         |   0
 drivers/platform/x86/intel/pmt/Kconfig        |  41 +++
 drivers/platform/x86/intel/pmt/Makefile       |   9 +
 .../x86/{ => intel/pmt}/intel_pmt_class.c     |   0
 .../x86/{ => intel/pmt}/intel_pmt_class.h     |   0
 .../x86/{ => intel/pmt}/intel_pmt_crashlog.c  |   0
 .../x86/{ => intel/pmt}/intel_pmt_telemetry.c |   0
 drivers/platform/x86/intel/punit/Kconfig      |  10 +
 drivers/platform/x86/intel/punit/Makefile     |   6 +
 .../x86/{ => intel/punit}/intel_punit_ipc.c   |   0
 drivers/platform/x86/intel/rst/Kconfig        |  16 +
 drivers/platform/x86/intel/rst/Makefile       |   6 +
 .../platform/x86/{ => intel/rst}/intel-rst.c  |   0
 drivers/platform/x86/intel/scu/Kconfig        |  52 +++
 drivers/platform/x86/intel/scu/Makefile       |  11 +
 .../x86/{ => intel/scu}/intel_scu_ipc.c       |   0
 .../x86/{ => intel/scu}/intel_scu_ipcutil.c   |   0
 .../x86/{ => intel/scu}/intel_scu_pcidrv.c    |   0
 .../x86/{ => intel/scu}/intel_scu_pltdrv.c    |   0
 .../x86/{ => intel/scu}/intel_scu_wdt.c       |   0
 .../platform/x86/intel/smartconnect/Kconfig   |  18 ++
 .../platform/x86/intel/smartconnect/Makefile  |   6 +
 .../smartconnect}/intel-smartconnect.c        |   0
 drivers/platform/x86/intel/telemetry/Kconfig  |  16 +
 drivers/platform/x86/intel/telemetry/Makefile |   9 +
 .../telemetry}/intel_telemetry_core.c         |   0
 .../telemetry}/intel_telemetry_debugfs.c      |   0
 .../telemetry}/intel_telemetry_pltdrv.c       |   0
 .../platform/x86/intel/turbo_max_3/Kconfig    |  14 +
 .../platform/x86/intel/turbo_max_3/Makefile   |   6 +
 .../turbo_max_3}/intel_turbo_max_3.c          |   0
 .../platform/x86/intel/uncore_freq/Kconfig    |  15 +
 .../platform/x86/intel/uncore_freq/Makefile   |   6 +
 .../uncore_freq}/intel-uncore-frequency.c     |   0
 drivers/platform/x86/intel/vbtn/Kconfig       |  16 +
 drivers/platform/x86/intel/vbtn/Makefile      |   6 +
 .../x86/{ => intel/vbtn}/intel-vbtn.c         |   0
 drivers/platform/x86/intel/wmi/Kconfig        |  26 ++
 drivers/platform/x86/intel/wmi/Makefile       |   7 +
 .../{ => intel/wmi}/intel-wmi-sbl-fw-update.c |   0
 .../{ => intel/wmi}/intel-wmi-thunderbolt.c   |   0
 81 files changed, 562 insertions(+), 330 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%)
 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%)
 create mode 100644 drivers/platform/x86/intel/hid/Kconfig
 create mode 100644 drivers/platform/x86/intel/hid/Makefile
 rename drivers/platform/x86/{ => intel/hid}/intel-hid.c (100%)
 create mode 100644 drivers/platform/x86/intel/int0002/Kconfig
 create mode 100644 drivers/platform/x86/intel/int0002/Makefile
 rename drivers/platform/x86/{ => intel/int0002}/intel_int0002_vgpio.c (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/Kconfig (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/Makefile (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_common.c (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_common.h (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_mbox_msr.c (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_mbox_pci.c (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_mmio.c (100%)
 create mode 100644 drivers/platform/x86/intel/ips/Kconfig
 create mode 100644 drivers/platform/x86/intel/ips/Makefile
 rename drivers/platform/x86/{ => intel/ips}/intel_ips.c (100%)
 rename drivers/platform/x86/{ => intel/ips}/intel_ips.h (100%)
 create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
 create mode 100644 drivers/platform/x86/intel/menlow/Makefile
 rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c (100%)
 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%)
 create mode 100644 drivers/platform/x86/intel/oaktrail/Kconfig
 create mode 100644 drivers/platform/x86/intel/oaktrail/Makefile
 rename drivers/platform/x86/{ => intel/oaktrail}/intel_oaktrail.c (100%)
 create mode 100644 drivers/platform/x86/intel/pmc_core/Kconfig
 create mode 100644 drivers/platform/x86/intel/pmc_core/Makefile
 rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core.c (100%)
 rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core.h (100%)
 rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core_pltdrv.c (100%)
 create mode 100644 drivers/platform/x86/intel/pmt/Kconfig
 create mode 100644 drivers/platform/x86/intel/pmt/Makefile
 rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.c (100%)
 rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.h (100%)
 rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_crashlog.c (100%)
 rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_telemetry.c (100%)
 create mode 100644 drivers/platform/x86/intel/punit/Kconfig
 create mode 100644 drivers/platform/x86/intel/punit/Makefile
 rename drivers/platform/x86/{ => intel/punit}/intel_punit_ipc.c (100%)
 create mode 100644 drivers/platform/x86/intel/rst/Kconfig
 create mode 100644 drivers/platform/x86/intel/rst/Makefile
 rename drivers/platform/x86/{ => intel/rst}/intel-rst.c (100%)
 create mode 100644 drivers/platform/x86/intel/scu/Kconfig
 create mode 100644 drivers/platform/x86/intel/scu/Makefile
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipc.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipcutil.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_pcidrv.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_pltdrv.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_wdt.c (100%)
 create mode 100644 drivers/platform/x86/intel/smartconnect/Kconfig
 create mode 100644 drivers/platform/x86/intel/smartconnect/Makefile
 rename drivers/platform/x86/{ => intel/smartconnect}/intel-smartconnect.c (100%)
 create mode 100644 drivers/platform/x86/intel/telemetry/Kconfig
 create mode 100644 drivers/platform/x86/intel/telemetry/Makefile
 rename drivers/platform/x86/{ => intel/telemetry}/intel_telemetry_core.c (100%)
 rename drivers/platform/x86/{ => intel/telemetry}/intel_telemetry_debugfs.c (100%)
 rename drivers/platform/x86/{ => intel/telemetry}/intel_telemetry_pltdrv.c (100%)
 create mode 100644 drivers/platform/x86/intel/turbo_max_3/Kconfig
 create mode 100644 drivers/platform/x86/intel/turbo_max_3/Makefile
 rename drivers/platform/x86/{ => intel/turbo_max_3}/intel_turbo_max_3.c (100%)
 create mode 100644 drivers/platform/x86/intel/uncore_freq/Kconfig
 create mode 100644 drivers/platform/x86/intel/uncore_freq/Makefile
 rename drivers/platform/x86/{ => intel/uncore_freq}/intel-uncore-frequency.c (100%)
 create mode 100644 drivers/platform/x86/intel/vbtn/Kconfig
 create mode 100644 drivers/platform/x86/intel/vbtn/Makefile
 rename drivers/platform/x86/{ => intel/vbtn}/intel-vbtn.c (100%)
 create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
 create mode 100644 drivers/platform/x86/intel/wmi/Makefile
 rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-sbl-fw-update.c (100%)
 rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-thunderbolt.c (100%)

-- 
2.31.1

[PATCH 01/20] Move Intel hid of pdx86 to intel directory to improve readability.

[Kate Hsuan]

---
 drivers/platform/x86/Kconfig                    | 12 ------------
 drivers/platform/x86/Makefile                   |  2 +-
 drivers/platform/x86/intel/Kconfig              |  1 +
 drivers/platform/x86/intel/Makefile             |  2 ++
 drivers/platform/x86/intel/hid/Kconfig          | 17 +++++++++++++++++
 drivers/platform/x86/intel/hid/Makefile         |  7 +++++++
 .../platform/x86/{ => intel/hid}/intel-hid.c    |  0
 7 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 drivers/platform/x86/intel/hid/Kconfig
 create mode 100644 drivers/platform/x86/intel/hid/Makefile
 rename drivers/platform/x86/{ => intel/hid}/intel-hid.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 38f3e774d5f3..6765f613ce0e 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -653,18 +653,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_HID_EVENT
-	tristate "INTEL HID Event"
-	depends on ACPI
-	depends on INPUT
-	select INPUT_SPARSEKMAP
-	help
-	  This driver provides support for the Intel HID Event hotkey interface.
-	  Some laptops require this driver for hotkey support.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called intel_hid.
-
 config INTEL_INT0002_VGPIO
 	tristate "Intel ACPI INT0002 Virtual GPIO driver"
 	depends on GPIOLIB && ACPI && PM_SLEEP
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index f8b475b7a962..328f4bcf99d0 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -68,7 +68,7 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 # Intel
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
 
-obj-$(CONFIG_INTEL_HID_EVENT)		+= intel-hid.o
+
 obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.o
 obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
 obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 161aa19ee863..d2254ab6aad8 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -19,5 +19,6 @@ if X86_PLATFORM_DRIVERS_INTEL
 source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
 source "drivers/platform/x86/intel/atomisp2/Kconfig"
+source "drivers/platform/x86/intel/hid/Kconfig"
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index af9442e3d2a9..6f04221456fb 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -8,3 +8,5 @@ obj-$(CONFIG_INTEL_CHT_INT33FE)		+= int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
 obj-$(CONFIG_INTEL_ATOMISP2_LED)	+= atomisp2/
 obj-$(CONFIG_INTEL_ATOMISP2_PM)		+= atomisp2/
+obj-$(CONFIG_INTEL_HID_EVENT)		+= hid/
+
diff --git a/drivers/platform/x86/intel/hid/Kconfig b/drivers/platform/x86/intel/hid/Kconfig
new file mode 100644
index 000000000000..daacd698aec4
--- /dev/null
+++ b/drivers/platform/x86/intel/hid/Kconfig
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for drivers/platform/x86/intel
+# Intel x86 Platform-Specific Drivers
+#
+
+config INTEL_HID_EVENT
+	tristate "INTEL HID Event"
+	depends on ACPI
+	depends on INPUT
+	select INPUT_SPARSEKMAP
+	help
+	  This driver provides support for the Intel HID Event hotkey interface.
+	  Some laptops require this driver for hotkey support.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called intel_hid.
\ No newline at end of file
diff --git a/drivers/platform/x86/intel/hid/Makefile b/drivers/platform/x86/intel/hid/Makefile
new file mode 100644
index 000000000000..9e2e753834d5
--- /dev/null
+++ b/drivers/platform/x86/intel/hid/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for drivers/platform/x86/intel
+# Intel x86 Platform-Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_HID_EVENT)		+= intel-hid.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel/hid/intel-hid.c
similarity index 100%
rename from drivers/platform/x86/intel-hid.c
rename to drivers/platform/x86/intel/hid/intel-hid.c
-- 
2.31.1

[PATCH 02/20] Move Intel WMI driver of pdx86 to intel/ directory to improve readability.

[Kate Hsuan]

---
 drivers/platform/x86/Kconfig                  | 21 ---------------
 drivers/platform/x86/Makefile                 |  2 --
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  3 ++-
 drivers/platform/x86/intel/wmi/Kconfig        | 26 +++++++++++++++++++
 drivers/platform/x86/intel/wmi/Makefile       |  7 +++++
 .../{ => intel/wmi}/intel-wmi-sbl-fw-update.c |  0
 .../{ => intel/wmi}/intel-wmi-thunderbolt.c   |  0
 8 files changed, 36 insertions(+), 24 deletions(-)
 create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
 create mode 100644 drivers/platform/x86/intel/wmi/Makefile
 rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-sbl-fw-update.c (100%)
 rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-thunderbolt.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6765f613ce0e..2e45d5e0d08a 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -77,27 +77,6 @@ config UV_SYSFS
 	  To compile this driver as a module, choose M here: the module will
 	  be called uv_sysfs.
 
-config INTEL_WMI_SBL_FW_UPDATE
-	tristate "Intel WMI Slim Bootloader firmware update signaling driver"
-	depends on ACPI_WMI
-	help
-	  Say Y here if you want to be able to use the WMI interface to signal
-	  Slim Bootloader to trigger update on next reboot.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called intel-wmi-sbl-fw-update.
-
-config INTEL_WMI_THUNDERBOLT
-	tristate "Intel WMI thunderbolt force power driver"
-	depends on ACPI_WMI
-	help
-	  Say Y here if you want to be able to use the WMI interface on select
-	  systems to force the power control of Intel Thunderbolt controllers.
-	  This is useful for updating the firmware when devices are not plugged
-	  into the controller.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called intel-wmi-thunderbolt.
 
 config MXM_WMI
        tristate "WMI support for MXM Laptop Graphics"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 328f4bcf99d0..c184989563c8 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -10,8 +10,6 @@ obj-$(CONFIG_WMI_BMOF)		+= wmi-bmof.o
 
 # WMI drivers
 obj-$(CONFIG_HUAWEI_WMI)		+= huawei-wmi.o
-obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= intel-wmi-sbl-fw-update.o
-obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= intel-wmi-thunderbolt.o
 obj-$(CONFIG_MXM_WMI)			+= mxm-wmi.o
 obj-$(CONFIG_PEAQ_WMI)			+= peaq-wmi.o
 obj-$(CONFIG_XIAOMI_WMI)		+= xiaomi-wmi.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index d2254ab6aad8..d541e63d0d2b 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -20,5 +20,6 @@ source "drivers/platform/x86/intel/int33fe/Kconfig"
 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"
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 6f04221456fb..653719491fa9 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -9,4 +9,5 @@ obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
 obj-$(CONFIG_INTEL_ATOMISP2_LED)	+= atomisp2/
 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/
diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
new file mode 100644
index 000000000000..5c3e2885e196
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_WMI_THUNDERBOLT
+	tristate "Intel WMI thunderbolt force power driver"
+	depends on ACPI_WMI
+	help
+	  Say Y here if you want to be able to use the WMI interface on select
+	  systems to force the power control of Intel Thunderbolt controllers.
+	  This is useful for updating the firmware when devices are not plugged
+	  into the controller.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called intel-wmi-thunderbolt.
+
+config INTEL_WMI_SBL_FW_UPDATE
+	tristate "Intel WMI Slim Bootloader firmware update signaling driver"
+	depends on ACPI_WMI
+	help
+	  Say Y here if you want to be able to use the WMI interface to signal
+	  Slim Bootloader to trigger update on next reboot.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called intel-wmi-sbl-fw-update.
diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile
new file mode 100644
index 000000000000..7aa3789b0f5c
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= intel-wmi-sbl-fw-update.o
+obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= intel-wmi-thunderbolt.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel-wmi-sbl-fw-update.c b/drivers/platform/x86/intel/wmi/intel-wmi-sbl-fw-update.c
similarity index 100%
rename from drivers/platform/x86/intel-wmi-sbl-fw-update.c
rename to drivers/platform/x86/intel/wmi/intel-wmi-sbl-fw-update.c
diff --git a/drivers/platform/x86/intel-wmi-thunderbolt.c b/drivers/platform/x86/intel/wmi/intel-wmi-thunderbolt.c
similarity index 100%
rename from drivers/platform/x86/intel-wmi-thunderbolt.c
rename to drivers/platform/x86/intel/wmi/intel-wmi-thunderbolt.c
-- 
2.31.1

[PATCH 03/20] Move Intel bxtwc driver of pdx86 to intel/ directory to improve readability.

[Kate Hsuan]

---
 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

[PATCH 04/20] Move Intel chtdc_ti driver of pdx86 to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 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

[PATCH 05/20] Move MRFLD power button driver of pdx86 to intel directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 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

[PATCH 06/20] Move Intel PMC core of pdx86 to intel/ directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                  | 20 --------------
 drivers/platform/x86/Makefile                 |  2 --
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  3 ++-
 drivers/platform/x86/intel/pmc_core/Kconfig   | 26 +++++++++++++++++++
 drivers/platform/x86/intel/pmc_core/Makefile  |  6 +++++
 .../x86/{ => intel/pmc_core}/intel_pmc_core.c |  0
 .../x86/{ => intel/pmc_core}/intel_pmc_core.h |  0
 .../pmc_core}/intel_pmc_core_pltdrv.c         |  0
 9 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 drivers/platform/x86/intel/pmc_core/Kconfig
 create mode 100644 drivers/platform/x86/intel/pmc_core/Makefile
 rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core.c (100%)
 rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core.h (100%)
 rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core_pltdrv.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ecd8daf6c240..b9a324ba17e3 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1086,26 +1086,6 @@ config INTEL_UNCORE_FREQ_CONTROL
 	  will be called intel-uncore-frequency.
 
 
-config INTEL_PMC_CORE
-	tristate "Intel PMC Core driver"
-	depends on PCI
-	depends on ACPI
-	help
-	  The Intel Platform Controller Hub for Intel Core SoCs provides access
-	  to Power Management Controller registers via various interfaces. This
-	  driver can utilize debugging capabilities and supported features as
-	  exposed by the Power Management Controller. It also may perform some
-	  tasks in the PMC in order to enable transition into the SLPS0 state.
-	  It should be selected on all Intel platforms supported by the driver.
-
-	  Supported features:
-		- SLP_S0_RESIDENCY counter
-		- PCH IP Power Gating status
-		- LTR Ignore / LTR Show
-		- MPHY/PLL gating status (Sunrisepoint PCH only)
-		- SLPS0 Debug registers (Cannonlake/Icelake PCH)
-		- Low Power Mode registers (Tigerlake and beyond)
-		- PMC quirks as needed to enable SLPS0/S0ix
 
 config INTEL_PMT_CLASS
 	tristate
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index a659fdcfd2d3..30771dd51a84 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -123,8 +123,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_PMT_CLASS)		+= intel_pmt_class.o
 obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= intel_pmt_telemetry.o
 obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= intel_pmt_crashlog.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index afbf34a12811..2565b676b911 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -24,5 +24,6 @@ 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"
+source "drivers/platform/x86/intel/pmc_core/Kconfig"
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index f5fe2ff0417b..7a9faf15bfb9 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -16,4 +16,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/
-obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= mrfld/
\ No newline at end of file
+obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= mrfld/
+obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc_core/
diff --git a/drivers/platform/x86/intel/pmc_core/Kconfig b/drivers/platform/x86/intel/pmc_core/Kconfig
new file mode 100644
index 000000000000..fcabdaf40bf3
--- /dev/null
+++ b/drivers/platform/x86/intel/pmc_core/Kconfig
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+
+config INTEL_PMC_CORE
+	tristate "Intel PMC Core driver"
+	depends on PCI
+	depends on ACPI
+	help
+	  The Intel Platform Controller Hub for Intel Core SoCs provides access
+	  to Power Management Controller registers via various interfaces. This
+	  driver can utilize debugging capabilities and supported features as
+	  exposed by the Power Management Controller. It also may perform some
+	  tasks in the PMC in order to enable transition into the SLPS0 state.
+	  It should be selected on all Intel platforms supported by the driver.
+
+	  Supported features:
+		- SLP_S0_RESIDENCY counter
+		- PCH IP Power Gating status
+		- LTR Ignore / LTR Show
+		- MPHY/PLL gating status (Sunrisepoint PCH only)
+		- SLPS0 Debug registers (Cannonlake/Icelake PCH)
+		- Low Power Mode registers (Tigerlake and beyond)
+		- PMC quirks as needed to enable SLPS0/S0ix
diff --git a/drivers/platform/x86/intel/pmc_core/Makefile b/drivers/platform/x86/intel/pmc_core/Makefile
new file mode 100644
index 000000000000..805400a593e9
--- /dev/null
+++ b/drivers/platform/x86/intel/pmc_core/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_PMC_CORE)		+= intel_pmc_core.o intel_pmc_core_pltdrv.o
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel/pmc_core/intel_pmc_core.c
similarity index 100%
rename from drivers/platform/x86/intel_pmc_core.c
rename to drivers/platform/x86/intel/pmc_core/intel_pmc_core.c
diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel/pmc_core/intel_pmc_core.h
similarity index 100%
rename from drivers/platform/x86/intel_pmc_core.h
rename to drivers/platform/x86/intel/pmc_core/intel_pmc_core.h
diff --git a/drivers/platform/x86/intel_pmc_core_pltdrv.c b/drivers/platform/x86/intel/pmc_core/intel_pmc_core_pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_pmc_core_pltdrv.c
rename to drivers/platform/x86/intel/pmc_core/intel_pmc_core_pltdrv.c
-- 
2.31.1

[PATCH 07/20] Move Intel PMT driver of pdx86 to intel/ to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Makefile                 |  4 +-
 drivers/platform/x86/intel/Kconfig            |  2 +
 drivers/platform/x86/intel/Makefile           |  3 ++
 drivers/platform/x86/intel/pmt/Kconfig        | 41 +++++++++++++++++++
 drivers/platform/x86/intel/pmt/Makefile       |  9 ++++
 .../x86/{ => intel/pmt}/intel_pmt_class.c     |  0
 .../x86/{ => intel/pmt}/intel_pmt_class.h     |  0
 .../x86/{ => intel/pmt}/intel_pmt_crashlog.c  |  0
 .../x86/{ => intel/pmt}/intel_pmt_telemetry.c |  0
 9 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 drivers/platform/x86/intel/pmt/Kconfig
 create mode 100644 drivers/platform/x86/intel/pmt/Makefile
 rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.c (100%)
 rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.h (100%)
 rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_crashlog.c (100%)
 rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_telemetry.c (100%)

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 30771dd51a84..1310b1ebc3f0 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -123,9 +123,7 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 # Intel PMIC / PMC / P-Unit devices
 
 
-obj-$(CONFIG_INTEL_PMT_CLASS)		+= intel_pmt_class.o
-obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= intel_pmt_telemetry.o
-obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= intel_pmt_crashlog.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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 2565b676b911..38bfca25940d 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -25,5 +25,7 @@ source "drivers/platform/x86/intel/bxtwc/Kconfig"
 source "drivers/platform/x86/intel/chtdc_ti/Kconfig"
 source "drivers/platform/x86/intel/mrfld/Kconfig"
 source "drivers/platform/x86/intel/pmc_core/Kconfig"
+source "drivers/platform/x86/intel/pmt/Kconfig"
+
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 7a9faf15bfb9..746bee1db055 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -18,3 +18,6 @@ obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= bxtwc/
 obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)	+= chtdc_ti/
 obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= mrfld/
 obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc_core/
+obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
+obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= pmt/
+obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= pmt/
diff --git a/drivers/platform/x86/intel/pmt/Kconfig b/drivers/platform/x86/intel/pmt/Kconfig
new file mode 100644
index 000000000000..1a5f0fa789e0
--- /dev/null
+++ b/drivers/platform/x86/intel/pmt/Kconfig
@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_PMT_CLASS
+	tristate
+	help
+	  The Intel Platform Monitoring Technology (PMT) class driver provides
+	  the basic sysfs interface and file hierarchy used by PMT devices.
+
+	  For more information, see:
+	  <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_pmt_class.
+
+config INTEL_PMT_TELEMETRY
+	tristate "Intel Platform Monitoring Technology (PMT) Telemetry driver"
+	depends on MFD_INTEL_PMT
+	select INTEL_PMT_CLASS
+	help
+	  The Intel Platform Monitory Technology (PMT) Telemetry driver provides
+	  access to hardware telemetry metrics on devices that support the
+	  feature.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_pmt_telemetry.
+
+config INTEL_PMT_CRASHLOG
+	tristate "Intel Platform Monitoring Technology (PMT) Crashlog driver"
+	depends on MFD_INTEL_PMT
+	select INTEL_PMT_CLASS
+	help
+	  The Intel Platform Monitoring Technology (PMT) crashlog driver provides
+	  access to hardware crashlog capabilities on devices that support the
+	  feature.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_pmt_crashlog.
+
diff --git a/drivers/platform/x86/intel/pmt/Makefile b/drivers/platform/x86/intel/pmt/Makefile
new file mode 100644
index 000000000000..b41f52e09f27
--- /dev/null
+++ b/drivers/platform/x86/intel/pmt/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+
+obj-$(CONFIG_INTEL_PMT_CLASS)		+= intel_pmt_class.o
+obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= intel_pmt_telemetry.o
+obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= intel_pmt_crashlog.o
diff --git a/drivers/platform/x86/intel_pmt_class.c b/drivers/platform/x86/intel/pmt/intel_pmt_class.c
similarity index 100%
rename from drivers/platform/x86/intel_pmt_class.c
rename to drivers/platform/x86/intel/pmt/intel_pmt_class.c
diff --git a/drivers/platform/x86/intel_pmt_class.h b/drivers/platform/x86/intel/pmt/intel_pmt_class.h
similarity index 100%
rename from drivers/platform/x86/intel_pmt_class.h
rename to drivers/platform/x86/intel/pmt/intel_pmt_class.h
diff --git a/drivers/platform/x86/intel_pmt_crashlog.c b/drivers/platform/x86/intel/pmt/intel_pmt_crashlog.c
similarity index 100%
rename from drivers/platform/x86/intel_pmt_crashlog.c
rename to drivers/platform/x86/intel/pmt/intel_pmt_crashlog.c
diff --git a/drivers/platform/x86/intel_pmt_telemetry.c b/drivers/platform/x86/intel/pmt/intel_pmt_telemetry.c
similarity index 100%
rename from drivers/platform/x86/intel_pmt_telemetry.c
rename to drivers/platform/x86/intel/pmt/intel_pmt_telemetry.c
-- 
2.31.1

[PATCH 08/20] Move Intel P-Unit of pdx86 to intel/ directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                  | 43 -------------------
 drivers/platform/x86/Makefile                 |  2 +-
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  1 +
 drivers/platform/x86/intel/punit/Kconfig      | 10 +++++
 drivers/platform/x86/intel/punit/Makefile     |  6 +++
 .../x86/{ => intel/punit}/intel_punit_ipc.c   |  0
 7 files changed, 19 insertions(+), 44 deletions(-)
 create mode 100644 drivers/platform/x86/intel/punit/Kconfig
 create mode 100644 drivers/platform/x86/intel/punit/Makefile
 rename drivers/platform/x86/{ => intel/punit}/intel_punit_ipc.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b9a324ba17e3..00fa213e9adb 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1086,49 +1086,6 @@ config INTEL_UNCORE_FREQ_CONTROL
 	  will be called intel-uncore-frequency.
 
 
-
-config INTEL_PMT_CLASS
-	tristate
-	help
-	  The Intel Platform Monitoring Technology (PMT) class driver provides
-	  the basic sysfs interface and file hierarchy used by PMT devices.
-
-	  For more information, see:
-	  <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_pmt_class.
-
-config INTEL_PMT_TELEMETRY
-	tristate "Intel Platform Monitoring Technology (PMT) Telemetry driver"
-	depends on MFD_INTEL_PMT
-	select INTEL_PMT_CLASS
-	help
-	  The Intel Platform Monitory Technology (PMT) Telemetry driver provides
-	  access to hardware telemetry metrics on devices that support the
-	  feature.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_pmt_telemetry.
-
-config INTEL_PMT_CRASHLOG
-	tristate "Intel Platform Monitoring Technology (PMT) Crashlog driver"
-	depends on MFD_INTEL_PMT
-	select INTEL_PMT_CLASS
-	help
-	  The Intel Platform Monitoring Technology (PMT) crashlog driver provides
-	  access to hardware crashlog capabilities on devices that support the
-	  feature.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_pmt_crashlog.
-
-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 1310b1ebc3f0..dbb62085e7f9 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -124,7 +124,7 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.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 38bfca25940d..189a34226fe0 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -26,6 +26,7 @@ source "drivers/platform/x86/intel/chtdc_ti/Kconfig"
 source "drivers/platform/x86/intel/mrfld/Kconfig"
 source "drivers/platform/x86/intel/pmc_core/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
+source "drivers/platform/x86/intel/punit/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 746bee1db055..9bd49a920900 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc_core/
 obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= pmt/
 obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= pmt/
+obj-$(CONFIG_INTEL_PUNIT_IPC)		+= punit/
diff --git a/drivers/platform/x86/intel/punit/Kconfig b/drivers/platform/x86/intel/punit/Kconfig
new file mode 100644
index 000000000000..db56ef3bb086
--- /dev/null
+++ b/drivers/platform/x86/intel/punit/Kconfig
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# X86 Platform Specific Drivers
+#
+
+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.
diff --git a/drivers/platform/x86/intel/punit/Makefile b/drivers/platform/x86/intel/punit/Makefile
new file mode 100644
index 000000000000..f25284806f63
--- /dev/null
+++ b/drivers/platform/x86/intel/punit/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# X86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_PUNIT_IPC)		+= intel_punit_ipc.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel_punit_ipc.c b/drivers/platform/x86/intel/punit/intel_punit_ipc.c
similarity index 100%
rename from drivers/platform/x86/intel_punit_ipc.c
rename to drivers/platform/x86/intel/punit/intel_punit_ipc.c
-- 
2.31.1

[PATCH 09/20] Move Intel SCU IPC of pdx86 to intel directory to increase readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                  | 47 -----------------
 drivers/platform/x86/Makefile                 |  6 +--
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  5 ++
 drivers/platform/x86/intel/scu/Kconfig        | 52 +++++++++++++++++++
 drivers/platform/x86/intel/scu/Makefile       | 11 ++++
 .../x86/{ => intel/scu}/intel_scu_ipc.c       |  0
 .../x86/{ => intel/scu}/intel_scu_ipcutil.c   |  0
 .../x86/{ => intel/scu}/intel_scu_pcidrv.c    |  0
 .../x86/{ => intel/scu}/intel_scu_pltdrv.c    |  0
 .../x86/{ => intel/scu}/intel_scu_wdt.c       |  0
 11 files changed, 70 insertions(+), 52 deletions(-)
 create mode 100644 drivers/platform/x86/intel/scu/Kconfig
 create mode 100644 drivers/platform/x86/intel/scu/Makefile
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipc.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipcutil.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_pcidrv.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_pltdrv.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_wdt.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 00fa213e9adb..c8c58a8f0ef9 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1086,53 +1086,6 @@ config INTEL_UNCORE_FREQ_CONTROL
 	  will be called intel-uncore-frequency.
 
 
-config INTEL_SCU_IPC
-	bool
-
-config INTEL_SCU
-	bool
-	select INTEL_SCU_IPC
-
-config INTEL_SCU_PCI
-	bool "Intel SCU PCI driver"
-	depends on PCI
-	select INTEL_SCU
-	help
-	  This driver is used to bridge the communications between kernel
-	  and SCU on some embedded Intel x86 platforms. It also creates
-	  devices that are connected to the SoC through the SCU.
-	  Platforms supported:
-	    Medfield
-	    Clovertrail
-	    Merrifield
-	    Broxton
-	    Apollo Lake
-
-config INTEL_SCU_PLATFORM
-	tristate "Intel SCU platform driver"
-	depends on ACPI
-	select INTEL_SCU
-	help
-	  This driver is used to bridge the communications between kernel
-	  and SCU (sometimes called PMC as well). The driver currently
-	  supports Intel Elkhart Lake and compatible platforms.
-
-config INTEL_SCU_WDT
-	bool
-	default INTEL_SCU_PCI
-	depends on INTEL_MID_WATCHDOG
-	help
-	  This is a specific platform code to instantiate watchdog device
-	  on ACPI-based Intel MID platforms.
-
-config INTEL_SCU_IPC_UTIL
-	tristate "Intel SCU IPC utility driver"
-	depends on INTEL_SCU
-	help
-	  The IPC Util driver provides an interface with the SCU enabling
-	  low level access for debug work and updating the firmware. Say
-	  N unless you will be doing this on an Intel MID platform.
-
 config INTEL_TELEMETRY
 	tristate "Intel SoC Telemetry Driver"
 	depends on X86_64
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index dbb62085e7f9..72b1a4782d48 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -125,11 +125,7 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.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
-obj-$(CONFIG_INTEL_SCU_WDT)		+= intel_scu_wdt.o
-obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= intel_scu_ipcutil.o
+
 obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_core.o \
 					   intel_telemetry_pltdrv.o \
 					   intel_telemetry_debugfs.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 189a34226fe0..0f1543dc5299 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -27,6 +27,7 @@ source "drivers/platform/x86/intel/mrfld/Kconfig"
 source "drivers/platform/x86/intel/pmc_core/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
 source "drivers/platform/x86/intel/punit/Kconfig"
+source "drivers/platform/x86/intel/scu/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 9bd49a920900..6fff503ba998 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -22,3 +22,8 @@ obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= pmt/
 obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= pmt/
 obj-$(CONFIG_INTEL_PUNIT_IPC)		+= punit/
+obj-$(CONFIG_INTEL_SCU_IPC)		+= scu/
+obj-$(CONFIG_INTEL_SCU_PCI)		+= scu/
+obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= scu/
+obj-$(CONFIG_INTEL_SCU_WDT)		+= scu/
+obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= scu/
diff --git a/drivers/platform/x86/intel/scu/Kconfig b/drivers/platform/x86/intel/scu/Kconfig
new file mode 100644
index 000000000000..ac3b2ab039b4
--- /dev/null
+++ b/drivers/platform/x86/intel/scu/Kconfig
@@ -0,0 +1,52 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_SCU_IPC
+	bool
+
+config INTEL_SCU
+	bool
+	select INTEL_SCU_IPC
+
+config INTEL_SCU_PCI
+	bool "Intel SCU PCI driver"
+	depends on PCI
+	select INTEL_SCU
+	help
+	  This driver is used to bridge the communications between kernel
+	  and SCU on some embedded Intel x86 platforms. It also creates
+	  devices that are connected to the SoC through the SCU.
+	  Platforms supported:
+	    Medfield
+	    Clovertrail
+	    Merrifield
+	    Broxton
+	    Apollo Lake
+
+config INTEL_SCU_PLATFORM
+	tristate "Intel SCU platform driver"
+	depends on ACPI
+	select INTEL_SCU
+	help
+	  This driver is used to bridge the communications between kernel
+	  and SCU (sometimes called PMC as well). The driver currently
+	  supports Intel Elkhart Lake and compatible platforms.
+
+config INTEL_SCU_WDT
+	bool
+	default INTEL_SCU_PCI
+	depends on INTEL_MID_WATCHDOG
+	help
+	  This is a specific platform code to instantiate watchdog device
+	  on ACPI-based Intel MID platforms.
+
+config INTEL_SCU_IPC_UTIL
+	tristate "Intel SCU IPC utility driver"
+	depends on INTEL_SCU
+	help
+	  The IPC Util driver provides an interface with the SCU enabling
+	  low level access for debug work and updating the firmware. Say
+	  N unless you will be doing this on an Intel MID platform.
+
diff --git a/drivers/platform/x86/intel/scu/Makefile b/drivers/platform/x86/intel/scu/Makefile
new file mode 100644
index 000000000000..39cab5f19029
--- /dev/null
+++ b/drivers/platform/x86/intel/scu/Makefile
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+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
+obj-$(CONFIG_INTEL_SCU_WDT)		+= intel_scu_wdt.o
+obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= intel_scu_ipcutil.o
+
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel/scu/intel_scu_ipc.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_ipc.c
rename to drivers/platform/x86/intel/scu/intel_scu_ipc.c
diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel/scu/intel_scu_ipcutil.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_ipcutil.c
rename to drivers/platform/x86/intel/scu/intel_scu_ipcutil.c
diff --git a/drivers/platform/x86/intel_scu_pcidrv.c b/drivers/platform/x86/intel/scu/intel_scu_pcidrv.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_pcidrv.c
rename to drivers/platform/x86/intel/scu/intel_scu_pcidrv.c
diff --git a/drivers/platform/x86/intel_scu_pltdrv.c b/drivers/platform/x86/intel/scu/intel_scu_pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_pltdrv.c
rename to drivers/platform/x86/intel/scu/intel_scu_pltdrv.c
diff --git a/drivers/platform/x86/intel_scu_wdt.c b/drivers/platform/x86/intel/scu/intel_scu_wdt.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_wdt.c
rename to drivers/platform/x86/intel/scu/intel_scu_wdt.c
-- 
2.31.1

[PATCH 10/20] Move Intel SoC telemetry driver to intel directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                     | 13 -------------
 drivers/platform/x86/Makefile                    |  3 ---
 drivers/platform/x86/intel/Kconfig               |  1 +
 drivers/platform/x86/intel/Makefile              |  1 +
 drivers/platform/x86/intel/telemetry/Kconfig     | 16 ++++++++++++++++
 drivers/platform/x86/intel/telemetry/Makefile    |  9 +++++++++
 .../{ => intel/telemetry}/intel_telemetry_core.c |  0
 .../telemetry}/intel_telemetry_debugfs.c         |  0
 .../telemetry}/intel_telemetry_pltdrv.c          |  0
 9 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 drivers/platform/x86/intel/telemetry/Kconfig
 create mode 100644 drivers/platform/x86/intel/telemetry/Makefile
 rename drivers/platform/x86/{ => intel/telemetry}/intel_telemetry_core.c (100%)
 rename drivers/platform/x86/{ => intel/telemetry}/intel_telemetry_debugfs.c (100%)
 rename drivers/platform/x86/{ => intel/telemetry}/intel_telemetry_pltdrv.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index c8c58a8f0ef9..b14c3a2953db 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1085,19 +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_TELEMETRY
-	tristate "Intel SoC Telemetry Driver"
-	depends on X86_64
-	depends on MFD_INTEL_PMC_BXT
-	depends on INTEL_PUNIT_IPC
-	help
-	  This driver provides interfaces to configure and use
-	  telemetry for INTEL SoC from APL onwards. It is also
-	  used to get various SoC events and parameters
-	  directly via debugfs files. Various tools may use
-	  this interface for SoC state monitoring.
-
 endif # X86_PLATFORM_DEVICES
 
 config PMC_ATOM
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 72b1a4782d48..1d7acccf5e3a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -126,7 +126,4 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
 
 
-obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_core.o \
-					   intel_telemetry_pltdrv.o \
-					   intel_telemetry_debugfs.o
 obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 0f1543dc5299..02e7792d34b0 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -28,6 +28,7 @@ source "drivers/platform/x86/intel/pmc_core/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
 source "drivers/platform/x86/intel/punit/Kconfig"
 source "drivers/platform/x86/intel/scu/Kconfig"
+source "drivers/platform/x86/intel/telemetry/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 6fff503ba998..3edbd5209072 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -27,3 +27,4 @@ obj-$(CONFIG_INTEL_SCU_PCI)		+= scu/
 obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= scu/
 obj-$(CONFIG_INTEL_SCU_WDT)		+= scu/
 obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= scu/
+obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
diff --git a/drivers/platform/x86/intel/telemetry/Kconfig b/drivers/platform/x86/intel/telemetry/Kconfig
new file mode 100644
index 000000000000..af7a712ae90e
--- /dev/null
+++ b/drivers/platform/x86/intel/telemetry/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_TELEMETRY
+	tristate "Intel SoC Telemetry Driver"
+	depends on X86_64
+	depends on MFD_INTEL_PMC_BXT
+	depends on INTEL_PUNIT_IPC
+	help
+	  This driver provides interfaces to configure and use
+	  telemetry for INTEL SoC from APL onwards. It is also
+	  used to get various SoC events and parameters
+	  directly via debugfs files. Various tools may use
+	  this interface for SoC state monitoring.
\ No newline at end of file
diff --git a/drivers/platform/x86/intel/telemetry/Makefile b/drivers/platform/x86/intel/telemetry/Makefile
new file mode 100644
index 000000000000..c28c45ee5e9c
--- /dev/null
+++ b/drivers/platform/x86/intel/telemetry/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+
+obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_core.o \
+					   intel_telemetry_pltdrv.o \
+					   intel_telemetry_debugfs.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel_telemetry_core.c b/drivers/platform/x86/intel/telemetry/intel_telemetry_core.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_core.c
rename to drivers/platform/x86/intel/telemetry/intel_telemetry_core.c
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel/telemetry/intel_telemetry_debugfs.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_debugfs.c
rename to drivers/platform/x86/intel/telemetry/intel_telemetry_debugfs.c
diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel/telemetry/intel_telemetry_pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_pltdrv.c
rename to drivers/platform/x86/intel/telemetry/intel_telemetry_pltdrv.c
-- 
2.31.1

[PATCH 11/20] Move Intel IPS driver of pdx86 to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Makefile                    |  7 +------
 drivers/platform/x86/intel/Kconfig               |  1 +
 drivers/platform/x86/intel/Makefile              |  3 +++
 drivers/platform/x86/intel/ips/Kconfig           | 14 ++++++++++++++
 drivers/platform/x86/intel/ips/Makefile          |  6 ++++++
 drivers/platform/x86/{ => intel/ips}/intel_ips.c |  0
 drivers/platform/x86/{ => intel/ips}/intel_ips.h |  0
 7 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 drivers/platform/x86/intel/ips/Kconfig
 create mode 100644 drivers/platform/x86/intel/ips/Makefile
 rename drivers/platform/x86/{ => intel/ips}/intel_ips.c (100%)
 rename drivers/platform/x86/{ => intel/ips}/intel_ips.h (100%)

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 1d7acccf5e3a..a755736341a0 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -113,17 +113,12 @@ obj-$(CONFIG_TOUCHSCREEN_DMI)		+= touchscreen_dmi.o
 obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 
 # Intel uncore drivers
-obj-$(CONFIG_INTEL_IPS)				+= intel_ips.o
+
 obj-$(CONFIG_INTEL_RST)				+= intel-rst.o
 obj-$(CONFIG_INTEL_SMARTCONNECT)		+= intel-smartconnect.o
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
 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_PMC_ATOM)			+= pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 02e7792d34b0..5cbc1e4a4756 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -29,6 +29,7 @@ source "drivers/platform/x86/intel/pmt/Kconfig"
 source "drivers/platform/x86/intel/punit/Kconfig"
 source "drivers/platform/x86/intel/scu/Kconfig"
 source "drivers/platform/x86/intel/telemetry/Kconfig"
+source "drivers/platform/x86/intel/ips/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 3edbd5209072..b87767623f94 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -28,3 +28,6 @@ obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= scu/
 obj-$(CONFIG_INTEL_SCU_WDT)		+= scu/
 obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= scu/
 obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
+
+# Intel uncore drivers
+obj-$(CONFIG_INTEL_IPS)				+= ips/
diff --git a/drivers/platform/x86/intel/ips/Kconfig b/drivers/platform/x86/intel/ips/Kconfig
new file mode 100644
index 000000000000..3417f3586d73
--- /dev/null
+++ b/drivers/platform/x86/intel/ips/Kconfig
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_IPS
+	tristate "Intel Intelligent Power Sharing"
+	depends on ACPI && PCI
+	help
+	  Intel Calpella platforms support dynamic power sharing between the
+	  CPU and GPU, maximizing performance in a given TDP.  This driver,
+	  along with the CPU frequency and i915 drivers, provides that
+	  functionality.  If in doubt, say Y here; it will only load on
+	  supported platforms.
\ No newline at end of file
diff --git a/drivers/platform/x86/intel/ips/Makefile b/drivers/platform/x86/intel/ips/Makefile
new file mode 100644
index 000000000000..a76450b840c8
--- /dev/null
+++ b/drivers/platform/x86/intel/ips/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_IPS)				+= intel_ips.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel/ips/intel_ips.c
similarity index 100%
rename from drivers/platform/x86/intel_ips.c
rename to drivers/platform/x86/intel/ips/intel_ips.c
diff --git a/drivers/platform/x86/intel_ips.h b/drivers/platform/x86/intel/ips/intel_ips.h
similarity index 100%
rename from drivers/platform/x86/intel_ips.h
rename to drivers/platform/x86/intel/ips/intel_ips.h
-- 
2.31.1

[PATCH 12/20] Move Intel RST driver of pdx86 to intel directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                  | 21 -------------------
 drivers/platform/x86/Makefile                 |  2 --
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  1 +
 drivers/platform/x86/intel/rst/Kconfig        | 16 ++++++++++++++
 drivers/platform/x86/intel/rst/Makefile       |  6 ++++++
 .../platform/x86/{ => intel/rst}/intel-rst.c  |  0
 7 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 drivers/platform/x86/intel/rst/Kconfig
 create mode 100644 drivers/platform/x86/intel/rst/Makefile
 rename drivers/platform/x86/{ => intel/rst}/intel-rst.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b14c3a2953db..ffb3957c5b57 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1026,27 +1026,6 @@ config INTEL_IMR
 
 	  If you are running on a Galileo/Quark say Y here.
 
-config INTEL_IPS
-	tristate "Intel Intelligent Power Sharing"
-	depends on ACPI && PCI
-	help
-	  Intel Calpella platforms support dynamic power sharing between the
-	  CPU and GPU, maximizing performance in a given TDP.  This driver,
-	  along with the CPU frequency and i915 drivers, provides that
-	  functionality.  If in doubt, say Y here; it will only load on
-	  supported platforms.
-
-config INTEL_RST
-        tristate "Intel Rapid Start Technology Driver"
-	depends on ACPI
-	help
-	  This driver provides support for modifying parameters on systems
-	  equipped with Intel's Rapid Start Technology. When put in an ACPI
-	  sleep state, these devices will wake after either a configured
-	  timeout or when the system battery reaches a critical state,
-	  automatically copying memory contents to disk. On resume, the
-	  firmware will copy the memory contents back to RAM and resume the OS
-	  as usual.
 
 config INTEL_SMARTCONNECT
         tristate "Intel Smart Connect disabling driver"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index a755736341a0..d3ee3413ad13 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -113,8 +113,6 @@ obj-$(CONFIG_TOUCHSCREEN_DMI)		+= touchscreen_dmi.o
 obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 
 # Intel uncore drivers
-
-obj-$(CONFIG_INTEL_RST)				+= intel-rst.o
 obj-$(CONFIG_INTEL_SMARTCONNECT)		+= intel-smartconnect.o
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
 obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 5cbc1e4a4756..e16b93c8ea68 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -30,6 +30,7 @@ source "drivers/platform/x86/intel/punit/Kconfig"
 source "drivers/platform/x86/intel/scu/Kconfig"
 source "drivers/platform/x86/intel/telemetry/Kconfig"
 source "drivers/platform/x86/intel/ips/Kconfig"
+source "drivers/platform/x86/intel/rst/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index b87767623f94..335eb1bc7eaf 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -31,3 +31,4 @@ obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 
 # Intel uncore drivers
 obj-$(CONFIG_INTEL_IPS)				+= ips/
+obj-$(CONFIG_INTEL_RST)				+= rst/
diff --git a/drivers/platform/x86/intel/rst/Kconfig b/drivers/platform/x86/intel/rst/Kconfig
new file mode 100644
index 000000000000..12265c2c9c32
--- /dev/null
+++ b/drivers/platform/x86/intel/rst/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_RST
+        tristate "Intel Rapid Start Technology Driver"
+	depends on ACPI
+	help
+	  This driver provides support for modifying parameters on systems
+	  equipped with Intel's Rapid Start Technology. When put in an ACPI
+	  sleep state, these devices will wake after either a configured
+	  timeout or when the system battery reaches a critical state,
+	  automatically copying memory contents to disk. On resume, the
+	  firmware will copy the memory contents back to RAM and resume the OS
+	  as usual.
diff --git a/drivers/platform/x86/intel/rst/Makefile b/drivers/platform/x86/intel/rst/Makefile
new file mode 100644
index 000000000000..2dc6d16fca19
--- /dev/null
+++ b/drivers/platform/x86/intel/rst/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_RST)				+= intel-rst.o
diff --git a/drivers/platform/x86/intel-rst.c b/drivers/platform/x86/intel/rst/intel-rst.c
similarity index 100%
rename from drivers/platform/x86/intel-rst.c
rename to drivers/platform/x86/intel/rst/intel-rst.c
-- 
2.31.1

[PATCH 13/20] Move Intel smartconnect driver of pdx86 to intel/ directory to improve readability.

[Kate Hsuan]

 Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                   | 13 -------------
 drivers/platform/x86/Makefile                  |  2 +-
 drivers/platform/x86/intel/Kconfig             |  1 +
 drivers/platform/x86/intel/Makefile            |  1 +
 .../platform/x86/intel/smartconnect/Kconfig    | 18 ++++++++++++++++++
 .../platform/x86/intel/smartconnect/Makefile   |  6 ++++++
 .../smartconnect}/intel-smartconnect.c         |  0
 7 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 drivers/platform/x86/intel/smartconnect/Kconfig
 create mode 100644 drivers/platform/x86/intel/smartconnect/Makefile
 rename drivers/platform/x86/{ => intel/smartconnect}/intel-smartconnect.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ffb3957c5b57..f722f08cd89c 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1027,19 +1027,6 @@ config INTEL_IMR
 	  If you are running on a Galileo/Quark say Y here.
 
 
-config INTEL_SMARTCONNECT
-        tristate "Intel Smart Connect disabling driver"
-	depends on ACPI
-	help
-	  Intel Smart Connect is a technology intended to permit devices to
-	  update state by resuming for a short period of time at regular
-	  intervals. If a user enables this functionality under Windows and
-	  then reboots into Linux, the system may remain configured to resume
-	  on suspend. In the absence of any userspace to support it, the system
-	  will then remain awake until something triggers another suspend.
-
-	  This driver checks to determine whether the device has Intel Smart
-	  Connect enabled, and if so disables it.
 
 source "drivers/platform/x86/intel_speed_select_if/Kconfig"
 
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index d3ee3413ad13..b809aaac300c 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -113,7 +113,7 @@ obj-$(CONFIG_TOUCHSCREEN_DMI)		+= touchscreen_dmi.o
 obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 
 # Intel uncore drivers
-obj-$(CONFIG_INTEL_SMARTCONNECT)		+= intel-smartconnect.o
+
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
 obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index e16b93c8ea68..0ebc6e0a24ca 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -31,6 +31,7 @@ source "drivers/platform/x86/intel/scu/Kconfig"
 source "drivers/platform/x86/intel/telemetry/Kconfig"
 source "drivers/platform/x86/intel/ips/Kconfig"
 source "drivers/platform/x86/intel/rst/Kconfig"
+source "drivers/platform/x86/intel/smartconnect/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 335eb1bc7eaf..5a916bb1512f 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -32,3 +32,4 @@ obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 # Intel uncore drivers
 obj-$(CONFIG_INTEL_IPS)				+= ips/
 obj-$(CONFIG_INTEL_RST)				+= rst/
+obj-$(CONFIG_INTEL_SMARTCONNECT)		+= smartconnect/
diff --git a/drivers/platform/x86/intel/smartconnect/Kconfig b/drivers/platform/x86/intel/smartconnect/Kconfig
new file mode 100644
index 000000000000..2cc0c8504285
--- /dev/null
+++ b/drivers/platform/x86/intel/smartconnect/Kconfig
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_SMARTCONNECT
+        tristate "Intel Smart Connect disabling driver"
+	depends on ACPI
+	help
+	  Intel Smart Connect is a technology intended to permit devices to
+	  update state by resuming for a short period of time at regular
+	  intervals. If a user enables this functionality under Windows and
+	  then reboots into Linux, the system may remain configured to resume
+	  on suspend. In the absence of any userspace to support it, the system
+	  will then remain awake until something triggers another suspend.
+
+	  This driver checks to determine whether the device has Intel Smart
+	  Connect enabled, and if so disables it.
diff --git a/drivers/platform/x86/intel/smartconnect/Makefile b/drivers/platform/x86/intel/smartconnect/Makefile
new file mode 100644
index 000000000000..74ef29b5b714
--- /dev/null
+++ b/drivers/platform/x86/intel/smartconnect/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_SMARTCONNECT)		+= intel-smartconnect.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel/smartconnect/intel-smartconnect.c
similarity index 100%
rename from drivers/platform/x86/intel-smartconnect.c
rename to drivers/platform/x86/intel/smartconnect/intel-smartconnect.c
-- 
2.31.1

[PATCH 14/20] Move Intel SST driver to intel/ directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                                    | 2 --
 drivers/platform/x86/Makefile                                   | 2 +-
 drivers/platform/x86/intel/Kconfig                              | 1 +
 drivers/platform/x86/intel/Makefile                             | 1 +
 drivers/platform/x86/{ => intel}/intel_speed_select_if/Kconfig  | 0
 drivers/platform/x86/{ => intel}/intel_speed_select_if/Makefile | 0
 .../x86/{ => intel}/intel_speed_select_if/isst_if_common.c      | 0
 .../x86/{ => intel}/intel_speed_select_if/isst_if_common.h      | 0
 .../x86/{ => intel}/intel_speed_select_if/isst_if_mbox_msr.c    | 0
 .../x86/{ => intel}/intel_speed_select_if/isst_if_mbox_pci.c    | 0
 .../x86/{ => intel}/intel_speed_select_if/isst_if_mmio.c        | 0
 11 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/Kconfig (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/Makefile (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_common.c (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_common.h (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_mbox_msr.c (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_mbox_pci.c (100%)
 rename drivers/platform/x86/{ => intel}/intel_speed_select_if/isst_if_mmio.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index f722f08cd89c..ff0a36a61404 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1028,8 +1028,6 @@ config INTEL_IMR
 
 
 
-source "drivers/platform/x86/intel_speed_select_if/Kconfig"
-
 config INTEL_TURBO_MAX_3
 	bool "Intel Turbo Boost Max Technology 3.0 enumeration driver"
 	depends on X86_64 && SCHED_MC_PRIO
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index b809aaac300c..2ce50bae6b71 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -114,7 +114,7 @@ obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 
 # Intel uncore drivers
 
-obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
+
 obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 0ebc6e0a24ca..f6c326d33ea0 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -32,6 +32,7 @@ source "drivers/platform/x86/intel/telemetry/Kconfig"
 source "drivers/platform/x86/intel/ips/Kconfig"
 source "drivers/platform/x86/intel/rst/Kconfig"
 source "drivers/platform/x86/intel/smartconnect/Kconfig"
+source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 5a916bb1512f..972076bdcd4e 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -33,3 +33,4 @@ obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 obj-$(CONFIG_INTEL_IPS)				+= ips/
 obj-$(CONFIG_INTEL_RST)				+= rst/
 obj-$(CONFIG_INTEL_SMARTCONNECT)		+= smartconnect/
+obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
\ No newline at end of file
diff --git a/drivers/platform/x86/intel_speed_select_if/Kconfig b/drivers/platform/x86/intel/intel_speed_select_if/Kconfig
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/Kconfig
rename to drivers/platform/x86/intel/intel_speed_select_if/Kconfig
diff --git a/drivers/platform/x86/intel_speed_select_if/Makefile b/drivers/platform/x86/intel/intel_speed_select_if/Makefile
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/Makefile
rename to drivers/platform/x86/intel/intel_speed_select_if/Makefile
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_common.c b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_common.c
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_common.c
rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_common.c
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_common.h b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_common.h
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_common.h
rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_common.h
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_mbox_msr.c
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c
rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_mbox_msr.c
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_mbox_pci.c
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c
rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_mbox_pci.c
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c b/drivers/platform/x86/intel/intel_speed_select_if/isst_if_mmio.c
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c
rename to drivers/platform/x86/intel/intel_speed_select_if/isst_if_mmio.c
-- 
2.31.1

[PATCH 15/20] Move Intel turbo max 3 driver to intel/ directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                       | 10 ----------
 drivers/platform/x86/Makefile                      |  1 -
 drivers/platform/x86/intel/Kconfig                 |  1 +
 drivers/platform/x86/intel/Makefile                |  3 ++-
 drivers/platform/x86/intel/turbo_max_3/Kconfig     | 14 ++++++++++++++
 drivers/platform/x86/intel/turbo_max_3/Makefile    |  6 ++++++
 .../{ => intel/turbo_max_3}/intel_turbo_max_3.c    |  0
 7 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 drivers/platform/x86/intel/turbo_max_3/Kconfig
 create mode 100644 drivers/platform/x86/intel/turbo_max_3/Makefile
 rename drivers/platform/x86/{ => intel/turbo_max_3}/intel_turbo_max_3.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ff0a36a61404..735949c406d3 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1028,16 +1028,6 @@ config INTEL_IMR
 
 
 
-config INTEL_TURBO_MAX_3
-	bool "Intel Turbo Boost Max Technology 3.0 enumeration driver"
-	depends on X86_64 && SCHED_MC_PRIO
-	help
-	  This driver reads maximum performance ratio of each CPU and set up
-	  the scheduler priority metrics. In this way scheduler can prefer
-	  CPU with higher performance to schedule tasks.
-	  This driver is only required when the system is not using Hardware
-	  P-States (HWP). In HWP mode, priority can be read from ACPI tables.
-
 config INTEL_UNCORE_FREQ_CONTROL
 	tristate "Intel Uncore frequency control driver"
 	depends on X86_64
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 2ce50bae6b71..e3ea8bf3647b 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -115,7 +115,6 @@ obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 # Intel uncore drivers
 
 
-obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
 
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index f6c326d33ea0..d3f1be45a25f 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -33,6 +33,7 @@ source "drivers/platform/x86/intel/ips/Kconfig"
 source "drivers/platform/x86/intel/rst/Kconfig"
 source "drivers/platform/x86/intel/smartconnect/Kconfig"
 source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
+source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 972076bdcd4e..040109e2908a 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -33,4 +33,5 @@ obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 obj-$(CONFIG_INTEL_IPS)				+= ips/
 obj-$(CONFIG_INTEL_RST)				+= rst/
 obj-$(CONFIG_INTEL_SMARTCONNECT)		+= smartconnect/
-obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
\ No newline at end of file
+obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
+obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= turbo_max_3/
diff --git a/drivers/platform/x86/intel/turbo_max_3/Kconfig b/drivers/platform/x86/intel/turbo_max_3/Kconfig
new file mode 100644
index 000000000000..e4518914ccc4
--- /dev/null
+++ b/drivers/platform/x86/intel/turbo_max_3/Kconfig
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_TURBO_MAX_3
+	bool "Intel Turbo Boost Max Technology 3.0 enumeration driver"
+	depends on X86_64 && SCHED_MC_PRIO
+	help
+	  This driver reads maximum performance ratio of each CPU and set up
+	  the scheduler priority metrics. In this way scheduler can prefer
+	  CPU with higher performance to schedule tasks.
+	  This driver is only required when the system is not using Hardware
+	  P-States (HWP). In HWP mode, priority can be read from ACPI tables.
diff --git a/drivers/platform/x86/intel/turbo_max_3/Makefile b/drivers/platform/x86/intel/turbo_max_3/Makefile
new file mode 100644
index 000000000000..4715da45373b
--- /dev/null
+++ b/drivers/platform/x86/intel/turbo_max_3/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
diff --git a/drivers/platform/x86/intel_turbo_max_3.c b/drivers/platform/x86/intel/turbo_max_3/intel_turbo_max_3.c
similarity index 100%
rename from drivers/platform/x86/intel_turbo_max_3.c
rename to drivers/platform/x86/intel/turbo_max_3/intel_turbo_max_3.c
-- 
2.31.1

[PATCH 16/20] Move Intel uncore freq driver to intel/ directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                      | 13 -------------
 drivers/platform/x86/Makefile                     |  5 -----
 drivers/platform/x86/intel/Kconfig                |  1 +
 drivers/platform/x86/intel/Makefile               |  1 +
 drivers/platform/x86/intel/uncore_freq/Kconfig    | 15 +++++++++++++++
 drivers/platform/x86/intel/uncore_freq/Makefile   |  6 ++++++
 .../uncore_freq}/intel-uncore-frequency.c         |  0
 7 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 drivers/platform/x86/intel/uncore_freq/Kconfig
 create mode 100644 drivers/platform/x86/intel/uncore_freq/Makefile
 rename drivers/platform/x86/{ => intel/uncore_freq}/intel-uncore-frequency.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 735949c406d3..ba760d1cb873 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1026,19 +1026,6 @@ config INTEL_IMR
 
 	  If you are running on a Galileo/Quark say Y here.
 
-
-
-config INTEL_UNCORE_FREQ_CONTROL
-	tristate "Intel Uncore frequency control driver"
-	depends on X86_64
-	help
-	  This driver allows control of uncore frequency limits on
-	  supported server platforms.
-	  Uncore frequency controls RING/LLC (last-level cache) clocks.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel-uncore-frequency.
-
 endif # X86_PLATFORM_DEVICES
 
 config PMC_ATOM
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index e3ea8bf3647b..a657eef9e10f 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -112,10 +112,5 @@ obj-$(CONFIG_MLX_PLATFORM)		+= mlx-platform.o
 obj-$(CONFIG_TOUCHSCREEN_DMI)		+= touchscreen_dmi.o
 obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 
-# Intel uncore drivers
-
-
-obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
-
 
 obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index d3f1be45a25f..f1f09c7bd992 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -34,6 +34,7 @@ source "drivers/platform/x86/intel/rst/Kconfig"
 source "drivers/platform/x86/intel/smartconnect/Kconfig"
 source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
 source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
+source "drivers/platform/x86/intel/uncore_freq/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 040109e2908a..a4993248cfde 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -35,3 +35,4 @@ obj-$(CONFIG_INTEL_RST)				+= rst/
 obj-$(CONFIG_INTEL_SMARTCONNECT)		+= smartconnect/
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
 obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= turbo_max_3/
+obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= uncore_freq/
diff --git a/drivers/platform/x86/intel/uncore_freq/Kconfig b/drivers/platform/x86/intel/uncore_freq/Kconfig
new file mode 100644
index 000000000000..dd237195fb81
--- /dev/null
+++ b/drivers/platform/x86/intel/uncore_freq/Kconfig
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_UNCORE_FREQ_CONTROL
+	tristate "Intel Uncore frequency control driver"
+	depends on X86_64
+	help
+	  This driver allows control of uncore frequency limits on
+	  supported server platforms.
+	  Uncore frequency controls RING/LLC (last-level cache) clocks.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel-uncore-frequency.
diff --git a/drivers/platform/x86/intel/uncore_freq/Makefile b/drivers/platform/x86/intel/uncore_freq/Makefile
new file mode 100644
index 000000000000..c1516bed69e5
--- /dev/null
+++ b/drivers/platform/x86/intel/uncore_freq/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
diff --git a/drivers/platform/x86/intel-uncore-frequency.c b/drivers/platform/x86/intel/uncore_freq/intel-uncore-frequency.c
similarity index 100%
rename from drivers/platform/x86/intel-uncore-frequency.c
rename to drivers/platform/x86/intel/uncore_freq/intel-uncore-frequency.c
-- 
2.31.1

[PATCH 17/20] Move Intel int0002 vgpio driver to intel/ directory to inprove readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                  | 19 ---------------
 drivers/platform/x86/Makefile                 |  1 -
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  2 ++
 drivers/platform/x86/intel/int0002/Kconfig    | 23 +++++++++++++++++++
 drivers/platform/x86/intel/int0002/Makefile   |  6 +++++
 .../{ => intel/int0002}/intel_int0002_vgpio.c |  0
 7 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 drivers/platform/x86/intel/int0002/Kconfig
 create mode 100644 drivers/platform/x86/intel/int0002/Makefile
 rename drivers/platform/x86/{ => intel/int0002}/intel_int0002_vgpio.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ba760d1cb873..b9c0d2d97793 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -632,25 +632,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_INT0002_VGPIO
-	tristate "Intel ACPI INT0002 Virtual GPIO driver"
-	depends on GPIOLIB && ACPI && PM_SLEEP
-	select GPIOLIB_IRQCHIP
-	help
-	  Some peripherals on Bay Trail and Cherry Trail platforms signal a
-	  Power Management Event (PME) to the Power Management Controller (PMC)
-	  to wakeup the system. When this happens software needs to explicitly
-	  clear the PME bus 0 status bit in the GPE0a_STS register to avoid an
-	  IRQ storm on IRQ 9.
-
-	  This is modelled in ACPI through the INT0002 ACPI device, which is
-	  called a "Virtual GPIO controller" in ACPI because it defines the
-	  event handler to call when the PME triggers through _AEI and _L02
-	  methods as would be done for a real GPIO interrupt in ACPI.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called intel_int0002_vgpio.
-
 config INTEL_MENLOW
 	tristate "Thermal Management driver for Intel menlow platform"
 	depends on ACPI_THERMAL
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index a657eef9e10f..f4c6ced59da1 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -67,7 +67,6 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
 
 
-obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.o
 obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
 obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
 obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index f1f09c7bd992..4efb5ad3e3e1 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -35,6 +35,7 @@ source "drivers/platform/x86/intel/smartconnect/Kconfig"
 source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
 source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
 source "drivers/platform/x86/intel/uncore_freq/Kconfig"
+source "drivers/platform/x86/intel/int0002/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index a4993248cfde..fe5058c3af18 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -11,6 +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/
+obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= int0002/
 
 
 # Intel PMIC / PMC / P-Unit devices
@@ -36,3 +37,4 @@ obj-$(CONFIG_INTEL_SMARTCONNECT)		+= smartconnect/
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
 obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= turbo_max_3/
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= uncore_freq/
+
diff --git a/drivers/platform/x86/intel/int0002/Kconfig b/drivers/platform/x86/intel/int0002/Kconfig
new file mode 100644
index 000000000000..b1368f3c9f31
--- /dev/null
+++ b/drivers/platform/x86/intel/int0002/Kconfig
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_INT0002_VGPIO
+	tristate "Intel ACPI INT0002 Virtual GPIO driver"
+	depends on GPIOLIB && ACPI && PM_SLEEP
+	select GPIOLIB_IRQCHIP
+	help
+	  Some peripherals on Bay Trail and Cherry Trail platforms signal a
+	  Power Management Event (PME) to the Power Management Controller (PMC)
+	  to wakeup the system. When this happens software needs to explicitly
+	  clear the PME bus 0 status bit in the GPE0a_STS register to avoid an
+	  IRQ storm on IRQ 9.
+
+	  This is modelled in ACPI through the INT0002 ACPI device, which is
+	  called a "Virtual GPIO controller" in ACPI because it defines the
+	  event handler to call when the PME triggers through _AEI and _L02
+	  methods as would be done for a real GPIO interrupt in ACPI.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called intel_int0002_vgpio.
diff --git a/drivers/platform/x86/intel/int0002/Makefile b/drivers/platform/x86/intel/int0002/Makefile
new file mode 100644
index 000000000000..a4040416bcf6
--- /dev/null
+++ b/drivers/platform/x86/intel/int0002/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.o
diff --git a/drivers/platform/x86/intel_int0002_vgpio.c b/drivers/platform/x86/intel/int0002/intel_int0002_vgpio.c
similarity index 100%
rename from drivers/platform/x86/intel_int0002_vgpio.c
rename to drivers/platform/x86/intel/int0002/intel_int0002_vgpio.c
-- 
2.31.1

[PATCH 18/20] Move Intel thermal driver for menlow platform driver to intel/ directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                       |  8 --------
 drivers/platform/x86/Makefile                      |  2 +-
 drivers/platform/x86/intel/Kconfig                 |  1 +
 drivers/platform/x86/intel/Makefile                |  2 ++
 drivers/platform/x86/intel/menlow/Kconfig          | 14 ++++++++++++++
 drivers/platform/x86/intel/menlow/Makefile         |  6 ++++++
 .../platform/x86/{ => intel/menlow}/intel_menlow.c |  0
 7 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
 create mode 100644 drivers/platform/x86/intel/menlow/Makefile
 rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b9c0d2d97793..50ded236a841 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -632,15 +632,7 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_MENLOW
-	tristate "Thermal Management driver for Intel menlow platform"
-	depends on ACPI_THERMAL
-	select THERMAL
-	help
-	  ACPI thermal management enhancement driver on
-	  Intel Menlow platform.
 
-	  If unsure, say N.
 
 config INTEL_OAKTRAIL
 	tristate "Intel Oaktrail Platform Extras"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index f4c6ced59da1..ea5f5dd3f78a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -67,7 +67,7 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
 
 
-obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
+
 obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
 obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
 
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 4efb5ad3e3e1..59c9b602c784 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -36,6 +36,7 @@ source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
 source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
 source "drivers/platform/x86/intel/uncore_freq/Kconfig"
 source "drivers/platform/x86/intel/int0002/Kconfig"
+source "drivers/platform/x86/intel/menlow/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index fe5058c3af18..b2326554bd84 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_INTEL_HID_EVENT)		+= hid/
 obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= wmi/
 obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= wmi/
 obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= int0002/
+obj-$(CONFIG_INTEL_MENLOW)		+= menlow/
 
 
 # Intel PMIC / PMC / P-Unit devices
@@ -38,3 +39,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
 obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= turbo_max_3/
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= uncore_freq/
 
+
diff --git a/drivers/platform/x86/intel/menlow/Kconfig b/drivers/platform/x86/intel/menlow/Kconfig
new file mode 100644
index 000000000000..b2920d259ff7
--- /dev/null
+++ b/drivers/platform/x86/intel/menlow/Kconfig
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_MENLOW
+	tristate "Thermal Management driver for Intel menlow platform"
+	depends on ACPI_THERMAL
+	select THERMAL
+	help
+	  ACPI thermal management enhancement driver on
+	  Intel Menlow platform.
+
+	  If unsure, say N.
diff --git a/drivers/platform/x86/intel/menlow/Makefile b/drivers/platform/x86/intel/menlow/Makefile
new file mode 100644
index 000000000000..0e9fda9bff98
--- /dev/null
+++ b/drivers/platform/x86/intel/menlow/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel/menlow/intel_menlow.c
similarity index 100%
rename from drivers/platform/x86/intel_menlow.c
rename to drivers/platform/x86/intel/menlow/intel_menlow.c
-- 
2.31.1

[PATCH 19/20] Move OakTrail driver to the intel/ directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                      |  9 ---------
 drivers/platform/x86/Makefile                     |  3 ---
 drivers/platform/x86/intel/Kconfig                |  1 +
 drivers/platform/x86/intel/Makefile               |  2 +-
 drivers/platform/x86/intel/oaktrail/Kconfig       | 15 +++++++++++++++
 drivers/platform/x86/intel/oaktrail/Makefile      |  6 ++++++
 .../x86/{ => intel/oaktrail}/intel_oaktrail.c     |  0
 7 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 drivers/platform/x86/intel/oaktrail/Kconfig
 create mode 100644 drivers/platform/x86/intel/oaktrail/Makefile
 rename drivers/platform/x86/{ => intel/oaktrail}/intel_oaktrail.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 50ded236a841..2426f8feb41f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -634,15 +634,6 @@ source "drivers/platform/x86/intel/Kconfig"
 
 
 
-config INTEL_OAKTRAIL
-	tristate "Intel Oaktrail Platform Extras"
-	depends on ACPI
-	depends on ACPI_VIDEO || ACPI_VIDEO = n
-	depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
-	help
-	  Intel Oaktrail platform need this driver to provide interfaces to
-	  enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y
-	  here; it will only load on supported platforms.
 
 config INTEL_VBTN
 	tristate "INTEL VIRTUAL BUTTON"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index ea5f5dd3f78a..d3992588408a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -66,9 +66,6 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 # Intel
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
 
-
-
-obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
 obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
 
 # MSI
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 59c9b602c784..afc0f70c45ac 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -37,6 +37,7 @@ source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
 source "drivers/platform/x86/intel/uncore_freq/Kconfig"
 source "drivers/platform/x86/intel/int0002/Kconfig"
 source "drivers/platform/x86/intel/menlow/Kconfig"
+source "drivers/platform/x86/intel/oaktrail/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index b2326554bd84..6acf5db0e847 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= wmi/
 obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= wmi/
 obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= int0002/
 obj-$(CONFIG_INTEL_MENLOW)		+= menlow/
-
+obj-$(CONFIG_INTEL_OAKTRAIL)		+= oaktrail/
 
 # Intel PMIC / PMC / P-Unit devices
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= bxtwc/
diff --git a/drivers/platform/x86/intel/oaktrail/Kconfig b/drivers/platform/x86/intel/oaktrail/Kconfig
new file mode 100644
index 000000000000..6063fd4e19ca
--- /dev/null
+++ b/drivers/platform/x86/intel/oaktrail/Kconfig
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_OAKTRAIL
+	tristate "Intel Oaktrail Platform Extras"
+	depends on ACPI
+	depends on ACPI_VIDEO || ACPI_VIDEO = n
+	depends on RFKILL && BACKLIGHT_CLASS_DEVICE && ACPI
+	help
+	  Intel Oaktrail platform need this driver to provide interfaces to
+	  enable/disable the Camera, WiFi, BT etc. devices. If in doubt, say Y
+	  here; it will only load on supported platforms.
+
diff --git a/drivers/platform/x86/intel/oaktrail/Makefile b/drivers/platform/x86/intel/oaktrail/Makefile
new file mode 100644
index 000000000000..dc2a7e850153
--- /dev/null
+++ b/drivers/platform/x86/intel/oaktrail/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel/oaktrail/intel_oaktrail.c
similarity index 100%
rename from drivers/platform/x86/intel_oaktrail.c
rename to drivers/platform/x86/intel/oaktrail/intel_oaktrail.c
-- 
2.31.1

[PATCH 20/20] Move Intel virtual botton driver to intel/ directory to improve readability.

[Kate Hsuan]

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                  | 15 ---------------
 drivers/platform/x86/Makefile                 |  2 --
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           | 19 +++++++++----------
 drivers/platform/x86/intel/vbtn/Kconfig       | 16 ++++++++++++++++
 drivers/platform/x86/intel/vbtn/Makefile      |  6 ++++++
 .../x86/{ => intel/vbtn}/intel-vbtn.c         |  0
 7 files changed, 32 insertions(+), 27 deletions(-)
 create mode 100644 drivers/platform/x86/intel/vbtn/Kconfig
 create mode 100644 drivers/platform/x86/intel/vbtn/Makefile
 rename drivers/platform/x86/{ => intel/vbtn}/intel-vbtn.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 2426f8feb41f..a27584b77c52 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -632,21 +632,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-
-
-
-config INTEL_VBTN
-	tristate "INTEL VIRTUAL BUTTON"
-	depends on ACPI
-	depends on INPUT
-	select INPUT_SPARSEKMAP
-	help
-	  This driver provides support for the Intel Virtual Button interface.
-	  Some laptops require this driver for power button support.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called intel_vbtn.
-
 config MSI_LAPTOP
 	tristate "MSI Laptop Extras"
 	depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index d3992588408a..a797e3444e63 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -66,8 +66,6 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 # Intel
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
 
-obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
-
 # MSI
 obj-$(CONFIG_MSI_LAPTOP)	+= msi-laptop.o
 obj-$(CONFIG_MSI_WMI)		+= msi-wmi.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index afc0f70c45ac..2f376edab328 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -38,6 +38,7 @@ source "drivers/platform/x86/intel/uncore_freq/Kconfig"
 source "drivers/platform/x86/intel/int0002/Kconfig"
 source "drivers/platform/x86/intel/menlow/Kconfig"
 source "drivers/platform/x86/intel/oaktrail/Kconfig"
+source "drivers/platform/x86/intel/vbtn/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 6acf5db0e847..5decc9eb1b0e 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -12,8 +12,9 @@ obj-$(CONFIG_INTEL_HID_EVENT)		+= hid/
 obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= wmi/
 obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= wmi/
 obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= int0002/
-obj-$(CONFIG_INTEL_MENLOW)		+= menlow/
+obj-$(CONFIG_INTEL_MENLOW)			+= menlow/
 obj-$(CONFIG_INTEL_OAKTRAIL)		+= oaktrail/
+obj-$(CONFIG_INTEL_VBTN)			+= vbtn/
 
 # Intel PMIC / PMC / P-Unit devices
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= bxtwc/
@@ -24,19 +25,17 @@ obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= pmt/
 obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= pmt/
 obj-$(CONFIG_INTEL_PUNIT_IPC)		+= punit/
-obj-$(CONFIG_INTEL_SCU_IPC)		+= scu/
-obj-$(CONFIG_INTEL_SCU_PCI)		+= scu/
+obj-$(CONFIG_INTEL_SCU_IPC)			+= scu/
+obj-$(CONFIG_INTEL_SCU_PCI)			+= scu/
 obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= scu/
-obj-$(CONFIG_INTEL_SCU_WDT)		+= scu/
+obj-$(CONFIG_INTEL_SCU_WDT)			+= scu/
 obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= scu/
 obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 
 # Intel uncore drivers
-obj-$(CONFIG_INTEL_IPS)				+= ips/
-obj-$(CONFIG_INTEL_RST)				+= rst/
-obj-$(CONFIG_INTEL_SMARTCONNECT)		+= smartconnect/
+obj-$(CONFIG_INTEL_IPS)						+= ips/
+obj-$(CONFIG_INTEL_RST)						+= rst/
+obj-$(CONFIG_INTEL_SMARTCONNECT)			+= smartconnect/
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
-obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= turbo_max_3/
+obj-$(CONFIG_INTEL_TURBO_MAX_3)				+= turbo_max_3/
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= uncore_freq/
-
-
diff --git a/drivers/platform/x86/intel/vbtn/Kconfig b/drivers/platform/x86/intel/vbtn/Kconfig
new file mode 100644
index 000000000000..c5dfd520530d
--- /dev/null
+++ b/drivers/platform/x86/intel/vbtn/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_VBTN
+	tristate "INTEL VIRTUAL BUTTON"
+	depends on ACPI
+	depends on INPUT
+	select INPUT_SPARSEKMAP
+	help
+	  This driver provides support for the Intel Virtual Button interface.
+	  Some laptops require this driver for power button support.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called intel_vbtn.
diff --git a/drivers/platform/x86/intel/vbtn/Makefile b/drivers/platform/x86/intel/vbtn/Makefile
new file mode 100644
index 000000000000..596833e13a31
--- /dev/null
+++ b/drivers/platform/x86/intel/vbtn/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel/vbtn/intel-vbtn.c
similarity index 100%
rename from drivers/platform/x86/intel-vbtn.c
rename to drivers/platform/x86/intel/vbtn/intel-vbtn.c
-- 
2.31.1

Re: [PATCH 09/20] Move Intel SCU IPC of pdx86 to intel directory to increase readability.

[Mika Westerberg]

Hi,

No objections, I think this is good idea but..

On Tue, Aug 10, 2021 at 05:58:21PM +0800, Kate Hsuan wrote:

.. I suggest to add proper commit message here. Many maintainers ignore
patches that don't have one.

> Signed-off-by: Kate Hsuan <hpa@redhat.com>
> ---
>  drivers/platform/x86/Kconfig                  | 47 -----------------
>  drivers/platform/x86/Makefile                 |  6 +--
>  drivers/platform/x86/intel/Kconfig            |  1 +
>  drivers/platform/x86/intel/Makefile           |  5 ++
>  drivers/platform/x86/intel/scu/Kconfig        | 52 +++++++++++++++++++
>  drivers/platform/x86/intel/scu/Makefile       | 11 ++++
>  .../x86/{ => intel/scu}/intel_scu_ipc.c       |  0
>  .../x86/{ => intel/scu}/intel_scu_ipcutil.c   |  0
>  .../x86/{ => intel/scu}/intel_scu_pcidrv.c    |  0
>  .../x86/{ => intel/scu}/intel_scu_pltdrv.c    |  0
>  .../x86/{ => intel/scu}/intel_scu_wdt.c       |  0
>  11 files changed, 70 insertions(+), 52 deletions(-)
>  create mode 100644 drivers/platform/x86/intel/scu/Kconfig
>  create mode 100644 drivers/platform/x86/intel/scu/Makefile
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipc.c (100%)
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipcutil.c (100%)
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_pcidrv.c (100%)
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_pltdrv.c (100%)
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_wdt.c (100%)

Re: [PATCH 09/20] Move Intel SCU IPC of pdx86 to intel directory to increase readability.

[Kate Hsuan]

Hi Mika,

Thanks for your suggestion.
I'll add them to the patches and resend them again.

Thank you.

BR,
Kate

Kate Hsuan

PhD

Senior Software Engineer

Red Hat APAC

Rm. 2708, 27F., No.9, Songgao Rd., Xinyi Dist., Taipei City 110

kate.hsuan@redhat.com
M: +886-919560388



On Tue, Aug 10, 2021 at 6:06 PM Mika Westerberg
<mika.westerberg@linux.intel.com> wrote:
>
> Hi,
>
> No objections, I think this is good idea but..
>
> On Tue, Aug 10, 2021 at 05:58:21PM +0800, Kate Hsuan wrote:
>
> .. I suggest to add proper commit message here. Many maintainers ignore
> patches that don't have one.
>
> > Signed-off-by: Kate Hsuan <hpa@redhat.com>
> > ---
> >  drivers/platform/x86/Kconfig                  | 47 -----------------
> >  drivers/platform/x86/Makefile                 |  6 +--
> >  drivers/platform/x86/intel/Kconfig            |  1 +
> >  drivers/platform/x86/intel/Makefile           |  5 ++
> >  drivers/platform/x86/intel/scu/Kconfig        | 52 +++++++++++++++++++
> >  drivers/platform/x86/intel/scu/Makefile       | 11 ++++
> >  .../x86/{ => intel/scu}/intel_scu_ipc.c       |  0
> >  .../x86/{ => intel/scu}/intel_scu_ipcutil.c   |  0
> >  .../x86/{ => intel/scu}/intel_scu_pcidrv.c    |  0
> >  .../x86/{ => intel/scu}/intel_scu_pltdrv.c    |  0
> >  .../x86/{ => intel/scu}/intel_scu_wdt.c       |  0
> >  11 files changed, 70 insertions(+), 52 deletions(-)
> >  create mode 100644 drivers/platform/x86/intel/scu/Kconfig
> >  create mode 100644 drivers/platform/x86/intel/scu/Makefile
> >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipc.c (100%)
> >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipcutil.c (100%)
> >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_pcidrv.c (100%)
> >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_pltdrv.c (100%)
> >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_wdt.c (100%)
>

Re: [PATCH 00/20] Move Intel platform drivers to intel directory to improve readability.

[Andy Shevchenko]

On Tue, Aug 10, 2021 at 4:20 PM Kate Hsuan <hpa@redhat.com> wrote:
>
> All the intel platform specific drivers are moved to intel/.
> It makes more clear file structure to improve the readability.

Thanks for doing this!
I'll review it later on (this or next week), meanwhile can you rebase
it on top of PDx86 for-next?


-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 09/20] Move Intel SCU IPC of pdx86 to intel directory to increase readability.

[Andy Shevchenko]

On Tue, Aug 10, 2021 at 07:43:42PM +0800, Kate Hsuan wrote:
> Hi Mika,
> 
> Thanks for your suggestion.
> I'll add them to the patches and resend them again.
> 
> Thank you.

Please, do not top post!

> On Tue, Aug 10, 2021 at 6:06 PM Mika Westerberg
> <mika.westerberg@linux.intel.com> wrote:
> >
> > Hi,
> >
> > No objections, I think this is good idea but..
> >
> > On Tue, Aug 10, 2021 at 05:58:21PM +0800, Kate Hsuan wrote:
> >
> > .. I suggest to add proper commit message here. Many maintainers ignore
> > patches that don't have one.

> > >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipc.c (100%)
> > >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipcutil.c (100%)
> > >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_pcidrv.c (100%)
> > >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_pltdrv.c (100%)
> > >  rename drivers/platform/x86/{ => intel/scu}/intel_scu_wdt.c (100%)

Besides what Mika said this should follow the example of pmt, like dropping the
intel_scu prefix from the files, but leave it for the module (see Makefile
tricks for the details how to achieve this).

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 00/20] Move Intel platform drivers to intel directory to improve readability.

[Hans de Goede]

Hi Kate,

On 8/10/21 11:58 AM, Kate Hsuan wrote:
> All the intel platform specific drivers are moved to intel/.
> It makes more clear file structure to improve the readability.
> 
> Kate Hsuan (20):
>   Move Intel hid of pdx86 to intel directory to improve readability.
>   Move Intel WMI driver of pdx86 to intel/ directory to improve
>     readability.
>   Move Intel bxtwc driver of pdx86 to intel/ directory to improve
>     readability.
>   Move Intel chtdc_ti driver of pdx86 to improve readability.
>   Move MRFLD power button driver of pdx86 to intel directory to improve
>     readability.
>   Move Intel PMC core of pdx86 to intel/ directory to improve
>     readability.
>   Move Intel PMT driver of pdx86 to intel/ to improve readability.
>   Move Intel P-Unit of pdx86 to intel/ directory to improve readability.
>   Move Intel SCU IPC of pdx86 to intel directory to increase
>     readability.
>   Move Intel SoC telemetry driver to intel directory to improve
>     readability.
>   Move Intel IPS driver of pdx86 to improve readability.
>   Move Intel RST driver of pdx86 to intel directory to improve
>     readability.
>   Move Intel smartconnect driver of pdx86 to intel/ directory to improve
>     readability.
>   Move Intel SST driver to intel/ directory to improve readability.
>   Move Intel turbo max 3 driver to intel/ directory to improve
>     readability.
>   Move Intel uncore freq driver to intel/ directory to improve
>     readability.
>   Move Intel int0002 vgpio driver to intel/ directory to inprove
>     readability.
>   Move Intel thermal driver for menlow platform driver to intel/
>     directory to improve readability.
>   Move OakTrail driver to the intel/ directory to improve readability.
>   Move Intel virtual botton driver to intel/ directory to improve
>     readability.

Thank you for doing this. I have a couple of remarks which I would
like to see addressed for version 2 of this series:

1. The commit messages are currently all one line, so basically
only a Subject and they are missing a Body describing the change
in more detail (as already pointed out by Mika).


2. Kernel patch subjects (the first line of the commit message)
should always be prefixed with the subsystem + component which they
are for, so instead of e.g.

"Move Intel hid of pdx86 to intel directory to improve readability."

you would use:

"platform/x86: intel-hid: Move to intel sub-directory to improve readability."

But that is a bit long; and normally the Subject line is just
a summary while the body explains things like the why, so this should
probably be shorted to:

"platform/x86: intel-hid: Move to intel sub-directory"

For the Subject, with the Body explaining what exactly is being changed
and why.


3. You are using new sub-directories for all drivers which you
are moving, but for drivers which are currently just 1 c-file, this 
means going from 1 c-file to 3 files (c-file + Kconfig + Makefile)
this seems a bit too much. I believe that it would be better for
the single file drivers (e.g. intel-hid.c, intel-vbtn.c) to be moved
directly under drivers/platform/x86/intel and for there Kconfig
and Makefile bits to be moved to the already existing Kconfig
and Makefile files there.


4. As Andy already mentioned when moving a file like
"intel_scu_ipc.c" to drivers/platform/x86/intel/scu then the
whole path becomes:

drivers/platform/x86/intel/scu/intel_scu_ipc.c

Which is quite long / quite a lot to type and repeats
intel + scu twice, so it would be better to drop the intel_scu
prefix from the filenames in this case resulting in:

drivers/platform/x86/intel/scu/ipc.c

in this example's case. This requires some extrea work:

4.1 You will need to adjust private includes to the new
filenames

4.2 If you simply adjust say this Makefile line:

obj-$(CONFIG_INTEL_SCU_PCI)             += intel_scu_pcidrv.o

to:

obj-$(CONFIG_INTEL_SCU_PCI)             += pcidrv.o

a pcidrv.ko will get build, but that is a very generic name
and then we end up with module-name clashes which are not
allowed.

So the Makefile needs to become a bit more complicated like this:

intel_scu_pcidrv-y			:= pcidrv.o
obj-$(CONFIG_INTEL_SCU_PCI)             += intel_scu_pcidrv.o

See for example:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/tree/drivers/platform/x86/intel/pmt/Makefile?h=for-next


5. Some of the files which you are moving are mentioned in the
MAINTAINERS file. For each file which you are moving please check if
it is listed in the MAINTAINERS file, keeping wildcards in mind,
so search e.g. for intel_scu for the intel_scu_* move.

And if the file is listed then update the MAINTAINERS entry to
point to the new location.

Regards,

Hans

Re: [PATCH 07/20] Move Intel PMT driver of pdx86 to intel/ to improve readability.

[David E. Box]

On Tue, 2021-08-10 at 17:58 +0800, Kate Hsuan wrote:
> Signed-off-by: Kate Hsuan <hpa@redhat.com>

Already done for these drivers in pdx86 for-next. Thanks.

> ---
>  drivers/platform/x86/Makefile                 |  4 +-
>  drivers/platform/x86/intel/Kconfig            |  2 +
>  drivers/platform/x86/intel/Makefile           |  3 ++
>  drivers/platform/x86/intel/pmt/Kconfig        | 41
> +++++++++++++++++++
>  drivers/platform/x86/intel/pmt/Makefile       |  9 ++++
>  .../x86/{ => intel/pmt}/intel_pmt_class.c     |  0
>  .../x86/{ => intel/pmt}/intel_pmt_class.h     |  0
>  .../x86/{ => intel/pmt}/intel_pmt_crashlog.c  |  0
>  .../x86/{ => intel/pmt}/intel_pmt_telemetry.c |  0
>  9 files changed, 56 insertions(+), 3 deletions(-)
>  create mode 100644 drivers/platform/x86/intel/pmt/Kconfig
>  create mode 100644 drivers/platform/x86/intel/pmt/Makefile
>  rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.c (100%)
>  rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.h (100%)
>  rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_crashlog.c
> (100%)
>  rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_telemetry.c
> (100%)
> 
> diff --git a/drivers/platform/x86/Makefile
> b/drivers/platform/x86/Makefile
> index 30771dd51a84..1310b1ebc3f0 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -123,9 +123,7 @@ obj-
> $(CONFIG_INTEL_UNCORE_FREQ_CONTROL)             += intel-uncore-
> frequency.o
>  # Intel PMIC / PMC / P-Unit devices
>  
>  
> -obj-$(CONFIG_INTEL_PMT_CLASS)          += intel_pmt_class.o
> -obj-$(CONFIG_INTEL_PMT_TELEMETRY)      += intel_pmt_telemetry.o
> -obj-$(CONFIG_INTEL_PMT_CRASHLOG)       += intel_pmt_crashlog.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
> diff --git a/drivers/platform/x86/intel/Kconfig
> b/drivers/platform/x86/intel/Kconfig
> index 2565b676b911..38bfca25940d 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -25,5 +25,7 @@ source "drivers/platform/x86/intel/bxtwc/Kconfig"
>  source "drivers/platform/x86/intel/chtdc_ti/Kconfig"
>  source "drivers/platform/x86/intel/mrfld/Kconfig"
>  source "drivers/platform/x86/intel/pmc_core/Kconfig"
> +source "drivers/platform/x86/intel/pmt/Kconfig"
> +
>  
>  endif # X86_PLATFORM_DRIVERS_INTEL
> diff --git a/drivers/platform/x86/intel/Makefile
> b/drivers/platform/x86/intel/Makefile
> index 7a9faf15bfb9..746bee1db055 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -18,3 +18,6 @@ obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)    += bxtwc/
>  obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)    += chtdc_ti/
>  obj-$(CONFIG_INTEL_MRFLD_PWRBTN)       += mrfld/
>  obj-$(CONFIG_INTEL_PMC_CORE)           += pmc_core/
> +obj-$(CONFIG_INTEL_PMT_CLASS)          += pmt/
> +obj-$(CONFIG_INTEL_PMT_TELEMETRY)      += pmt/
> +obj-$(CONFIG_INTEL_PMT_CRASHLOG)       += pmt/
> diff --git a/drivers/platform/x86/intel/pmt/Kconfig
> b/drivers/platform/x86/intel/pmt/Kconfig
> new file mode 100644
> index 000000000000..1a5f0fa789e0
> --- /dev/null
> +++ b/drivers/platform/x86/intel/pmt/Kconfig
> @@ -0,0 +1,41 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +config INTEL_PMT_CLASS
> +       tristate
> +       help
> +         The Intel Platform Monitoring Technology (PMT) class driver
> provides
> +         the basic sysfs interface and file hierarchy used by PMT
> devices.
> +
> +         For more information, see:
> +         <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
> +
> +         To compile this driver as a module, choose M here: the
> module
> +         will be called intel_pmt_class.
> +
> +config INTEL_PMT_TELEMETRY
> +       tristate "Intel Platform Monitoring Technology (PMT)
> Telemetry driver"
> +       depends on MFD_INTEL_PMT
> +       select INTEL_PMT_CLASS
> +       help
> +         The Intel Platform Monitory Technology (PMT) Telemetry
> driver provides
> +         access to hardware telemetry metrics on devices that
> support the
> +         feature.
> +
> +         To compile this driver as a module, choose M here: the
> module
> +         will be called intel_pmt_telemetry.
> +
> +config INTEL_PMT_CRASHLOG
> +       tristate "Intel Platform Monitoring Technology (PMT) Crashlog
> driver"
> +       depends on MFD_INTEL_PMT
> +       select INTEL_PMT_CLASS
> +       help
> +         The Intel Platform Monitoring Technology (PMT) crashlog
> driver provides
> +         access to hardware crashlog capabilities on devices that
> support the
> +         feature.
> +
> +         To compile this driver as a module, choose M here: the
> module
> +         will be called intel_pmt_crashlog.
> +
> diff --git a/drivers/platform/x86/intel/pmt/Makefile
> b/drivers/platform/x86/intel/pmt/Makefile
> new file mode 100644
> index 000000000000..b41f52e09f27
> --- /dev/null
> +++ b/drivers/platform/x86/intel/pmt/Makefile
> @@ -0,0 +1,9 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +
> +obj-$(CONFIG_INTEL_PMT_CLASS)          += intel_pmt_class.o
> +obj-$(CONFIG_INTEL_PMT_TELEMETRY)      += intel_pmt_telemetry.o
> +obj-$(CONFIG_INTEL_PMT_CRASHLOG)       += intel_pmt_crashlog.o
> diff --git a/drivers/platform/x86/intel_pmt_class.c
> b/drivers/platform/x86/intel/pmt/intel_pmt_class.c
> similarity index 100%
> rename from drivers/platform/x86/intel_pmt_class.c
> rename to drivers/platform/x86/intel/pmt/intel_pmt_class.c
> diff --git a/drivers/platform/x86/intel_pmt_class.h
> b/drivers/platform/x86/intel/pmt/intel_pmt_class.h
> similarity index 100%
> rename from drivers/platform/x86/intel_pmt_class.h
> rename to drivers/platform/x86/intel/pmt/intel_pmt_class.h
> diff --git a/drivers/platform/x86/intel_pmt_crashlog.c
> b/drivers/platform/x86/intel/pmt/intel_pmt_crashlog.c
> similarity index 100%
> rename from drivers/platform/x86/intel_pmt_crashlog.c
> rename to drivers/platform/x86/intel/pmt/intel_pmt_crashlog.c
> diff --git a/drivers/platform/x86/intel_pmt_telemetry.c
> b/drivers/platform/x86/intel/pmt/intel_pmt_telemetry.c
> similarity index 100%
> rename from drivers/platform/x86/intel_pmt_telemetry.c
> rename to drivers/platform/x86/intel/pmt/intel_pmt_telemetry.c

Re: [PATCH 08/20] Move Intel P-Unit of pdx86 to intel/ directory to improve readability.

[David E. Box]

Hi,

On Tue, 2021-08-10 at 17:58 +0800, Kate Hsuan wrote:
> Signed-off-by: Kate Hsuan <hpa@redhat.com>
> ---
>  drivers/platform/x86/Kconfig                  | 43 -----------------
> --
>  drivers/platform/x86/Makefile                 |  2 +-
>  drivers/platform/x86/intel/Kconfig            |  1 +
>  drivers/platform/x86/intel/Makefile           |  1 +
>  drivers/platform/x86/intel/punit/Kconfig      | 10 +++++
>  drivers/platform/x86/intel/punit/Makefile     |  6 +++
>  .../x86/{ => intel/punit}/intel_punit_ipc.c   |  0
>  7 files changed, 19 insertions(+), 44 deletions(-)
>  create mode 100644 drivers/platform/x86/intel/punit/Kconfig
>  create mode 100644 drivers/platform/x86/intel/punit/Makefile
>  rename drivers/platform/x86/{ => intel/punit}/intel_punit_ipc.c
> (100%)
> 
> diff --git a/drivers/platform/x86/Kconfig
> b/drivers/platform/x86/Kconfig
> index b9a324ba17e3..00fa213e9adb 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1086,49 +1086,6 @@ config INTEL_UNCORE_FREQ_CONTROL
>           will be called intel-uncore-frequency.
>  
>  
> -
> -config INTEL_PMT_CLASS
> -       tristate
> -       help
> -         The Intel Platform Monitoring Technology (PMT) class driver
> provides
> -         the basic sysfs interface and file hierarchy used by PMT
> devices.
> -
> -         For more information, see:
> -         <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
> -
> -         To compile this driver as a module, choose M here: the
> module
> -         will be called intel_pmt_class.
> -
> -config INTEL_PMT_TELEMETRY
> -       tristate "Intel Platform Monitoring Technology (PMT)
> Telemetry driver"
> -       depends on MFD_INTEL_PMT
> -       select INTEL_PMT_CLASS
> -       help
> -         The Intel Platform Monitory Technology (PMT) Telemetry
> driver provides
> -         access to hardware telemetry metrics on devices that
> support the
> -         feature.
> -
> -         To compile this driver as a module, choose M here: the
> module
> -         will be called intel_pmt_telemetry.
> -
> -config INTEL_PMT_CRASHLOG
> -       tristate "Intel Platform Monitoring Technology (PMT) Crashlog
> driver"
> -       depends on MFD_INTEL_PMT
> -       select INTEL_PMT_CLASS
> -       help
> -         The Intel Platform Monitoring Technology (PMT) crashlog
> driver provides
> -         access to hardware crashlog capabilities on devices that
> support the
> -         feature.
> -
> -         To compile this driver as a module, choose M here: the
> module
> -         will be called intel_pmt_crashlog.
> -

Accidentally caught the above configs not part of P-Unit IPC driver.

> -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 1310b1ebc3f0..dbb62085e7f9 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -124,7 +124,7 @@ obj-
> $(CONFIG_INTEL_UNCORE_FREQ_CONTROL)             += intel-uncore-
> frequency.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 38bfca25940d..189a34226fe0 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -26,6 +26,7 @@ source
> "drivers/platform/x86/intel/chtdc_ti/Kconfig"
>  source "drivers/platform/x86/intel/mrfld/Kconfig"
>  source "drivers/platform/x86/intel/pmc_core/Kconfig"
>  source "drivers/platform/x86/intel/pmt/Kconfig"
> +source "drivers/platform/x86/intel/punit/Kconfig"
>  
>  
>  endif # X86_PLATFORM_DRIVERS_INTEL
> diff --git a/drivers/platform/x86/intel/Makefile
> b/drivers/platform/x86/intel/Makefile
> index 746bee1db055..9bd49a920900 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -21,3 +21,4 @@ obj-$(CONFIG_INTEL_PMC_CORE)          += pmc_core/
>  obj-$(CONFIG_INTEL_PMT_CLASS)          += pmt/
>  obj-$(CONFIG_INTEL_PMT_TELEMETRY)      += pmt/
>  obj-$(CONFIG_INTEL_PMT_CRASHLOG)       += pmt/
> +obj-$(CONFIG_INTEL_PUNIT_IPC)          += punit/
> diff --git a/drivers/platform/x86/intel/punit/Kconfig
> b/drivers/platform/x86/intel/punit/Kconfig
> new file mode 100644
> index 000000000000..db56ef3bb086
> --- /dev/null
> +++ b/drivers/platform/x86/intel/punit/Kconfig
> @@ -0,0 +1,10 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# X86 Platform Specific Drivers
> +#
> +
> +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.
> diff --git a/drivers/platform/x86/intel/punit/Makefile
> b/drivers/platform/x86/intel/punit/Makefile
> new file mode 100644
> index 000000000000..f25284806f63
> --- /dev/null
> +++ b/drivers/platform/x86/intel/punit/Makefile
> @@ -0,0 +1,6 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# X86 Platform Specific Drivers
> +#
> +
> +obj-$(CONFIG_INTEL_PUNIT_IPC)          += intel_punit_ipc.o
> \ No newline at end of file
> diff --git a/drivers/platform/x86/intel_punit_ipc.c
> b/drivers/platform/x86/intel/punit/intel_punit_ipc.c
> similarity index 100%
> rename from drivers/platform/x86/intel_punit_ipc.c
> rename to drivers/platform/x86/intel/punit/intel_punit_ipc.c

Re: [PATCH 00/20] Move Intel platform drivers to intel directory to improve readability.

[David E. Box]

Hi,

On Tue, 2021-08-10 at 17:58 +0800, Kate Hsuan wrote:
> All the intel platform specific drivers are moved to intel/.
> It makes more clear file structure to improve the readability.
> 

A lot of subfolders for single files. Is this necessary? I'm submitting
a single driver soon, unrelated to anything else. I was just going to
drop it in /intel.

David

> Kate Hsuan (20):
>   Move Intel hid of pdx86 to intel directory to improve readability.
>   Move Intel WMI driver of pdx86 to intel/ directory to improve
>     readability.
>   Move Intel bxtwc driver of pdx86 to intel/ directory to improve
>     readability.
>   Move Intel chtdc_ti driver of pdx86 to improve readability.
>   Move MRFLD power button driver of pdx86 to intel directory to
> improve
>     readability.
>   Move Intel PMC core of pdx86 to intel/ directory to improve
>     readability.
>   Move Intel PMT driver of pdx86 to intel/ to improve readability.
>   Move Intel P-Unit of pdx86 to intel/ directory to improve
> readability.
>   Move Intel SCU IPC of pdx86 to intel directory to increase
>     readability.
>   Move Intel SoC telemetry driver to intel directory to improve
>     readability.
>   Move Intel IPS driver of pdx86 to improve readability.
>   Move Intel RST driver of pdx86 to intel directory to improve
>     readability.
>   Move Intel smartconnect driver of pdx86 to intel/ directory to
> improve
>     readability.
>   Move Intel SST driver to intel/ directory to improve readability.
>   Move Intel turbo max 3 driver to intel/ directory to improve
>     readability.
>   Move Intel uncore freq driver to intel/ directory to improve
>     readability.
>   Move Intel int0002 vgpio driver to intel/ directory to inprove
>     readability.
>   Move Intel thermal driver for menlow platform driver to intel/
>     directory to improve readability.
>   Move OakTrail driver to the intel/ directory to improve
> readability.
>   Move Intel virtual botton driver to intel/ directory to improve
>     readability.
> 
>  drivers/platform/x86/Kconfig                  | 297 ----------------
> --
>  drivers/platform/x86/Makefile                 |  34 +-
>  drivers/platform/x86/intel/Kconfig            |  21 ++
>  drivers/platform/x86/intel/Makefile           |  31 ++
>  drivers/platform/x86/intel/bxtwc/Kconfig      |  15 +
>  drivers/platform/x86/intel/bxtwc/Makefile     |   6 +
>  .../x86/{ => intel/bxtwc}/intel_bxtwc_tmu.c   |   0
>  drivers/platform/x86/intel/chtdc_ti/Kconfig   |  16 +
>  drivers/platform/x86/intel/chtdc_ti/Makefile  |   7 +
>  .../chtdc_ti}/intel_chtdc_ti_pwrbtn.c         |   0
>  drivers/platform/x86/intel/hid/Kconfig        |  17 +
>  drivers/platform/x86/intel/hid/Makefile       |   7 +
>  .../platform/x86/{ => intel/hid}/intel-hid.c  |   0
>  drivers/platform/x86/intel/int0002/Kconfig    |  23 ++
>  drivers/platform/x86/intel/int0002/Makefile   |   6 +
>  .../{ => intel/int0002}/intel_int0002_vgpio.c |   0
>  .../{ => intel}/intel_speed_select_if/Kconfig |   0
>  .../intel_speed_select_if/Makefile            |   0
>  .../intel_speed_select_if/isst_if_common.c    |   0
>  .../intel_speed_select_if/isst_if_common.h    |   0
>  .../intel_speed_select_if/isst_if_mbox_msr.c  |   0
>  .../intel_speed_select_if/isst_if_mbox_pci.c  |   0
>  .../intel_speed_select_if/isst_if_mmio.c      |   0
>  drivers/platform/x86/intel/ips/Kconfig        |  14 +
>  drivers/platform/x86/intel/ips/Makefile       |   6 +
>  .../platform/x86/{ => intel/ips}/intel_ips.c  |   0
>  .../platform/x86/{ => intel/ips}/intel_ips.h  |   0
>  drivers/platform/x86/intel/menlow/Kconfig     |  14 +
>  drivers/platform/x86/intel/menlow/Makefile    |   6 +
>  .../x86/{ => intel/menlow}/intel_menlow.c     |   0
>  drivers/platform/x86/intel/mrfld/Kconfig      |  17 +
>  drivers/platform/x86/intel/mrfld/Makefile     |   6 +
>  .../{ => intel/mrfld}/intel_mrfld_pwrbtn.c    |   0
>  drivers/platform/x86/intel/oaktrail/Kconfig   |  15 +
>  drivers/platform/x86/intel/oaktrail/Makefile  |   6 +
>  .../x86/{ => intel/oaktrail}/intel_oaktrail.c |   0
>  drivers/platform/x86/intel/pmc_core/Kconfig   |  26 ++
>  drivers/platform/x86/intel/pmc_core/Makefile  |   6 +
>  .../x86/{ => intel/pmc_core}/intel_pmc_core.c |   0
>  .../x86/{ => intel/pmc_core}/intel_pmc_core.h |   0
>  .../pmc_core}/intel_pmc_core_pltdrv.c         |   0
>  drivers/platform/x86/intel/pmt/Kconfig        |  41 +++
>  drivers/platform/x86/intel/pmt/Makefile       |   9 +
>  .../x86/{ => intel/pmt}/intel_pmt_class.c     |   0
>  .../x86/{ => intel/pmt}/intel_pmt_class.h     |   0
>  .../x86/{ => intel/pmt}/intel_pmt_crashlog.c  |   0
>  .../x86/{ => intel/pmt}/intel_pmt_telemetry.c |   0
>  drivers/platform/x86/intel/punit/Kconfig      |  10 +
>  drivers/platform/x86/intel/punit/Makefile     |   6 +
>  .../x86/{ => intel/punit}/intel_punit_ipc.c   |   0
>  drivers/platform/x86/intel/rst/Kconfig        |  16 +
>  drivers/platform/x86/intel/rst/Makefile       |   6 +
>  .../platform/x86/{ => intel/rst}/intel-rst.c  |   0
>  drivers/platform/x86/intel/scu/Kconfig        |  52 +++
>  drivers/platform/x86/intel/scu/Makefile       |  11 +
>  .../x86/{ => intel/scu}/intel_scu_ipc.c       |   0
>  .../x86/{ => intel/scu}/intel_scu_ipcutil.c   |   0
>  .../x86/{ => intel/scu}/intel_scu_pcidrv.c    |   0
>  .../x86/{ => intel/scu}/intel_scu_pltdrv.c    |   0
>  .../x86/{ => intel/scu}/intel_scu_wdt.c       |   0
>  .../platform/x86/intel/smartconnect/Kconfig   |  18 ++
>  .../platform/x86/intel/smartconnect/Makefile  |   6 +
>  .../smartconnect}/intel-smartconnect.c        |   0
>  drivers/platform/x86/intel/telemetry/Kconfig  |  16 +
>  drivers/platform/x86/intel/telemetry/Makefile |   9 +
>  .../telemetry}/intel_telemetry_core.c         |   0
>  .../telemetry}/intel_telemetry_debugfs.c      |   0
>  .../telemetry}/intel_telemetry_pltdrv.c       |   0
>  .../platform/x86/intel/turbo_max_3/Kconfig    |  14 +
>  .../platform/x86/intel/turbo_max_3/Makefile   |   6 +
>  .../turbo_max_3}/intel_turbo_max_3.c          |   0
>  .../platform/x86/intel/uncore_freq/Kconfig    |  15 +
>  .../platform/x86/intel/uncore_freq/Makefile   |   6 +
>  .../uncore_freq}/intel-uncore-frequency.c     |   0
>  drivers/platform/x86/intel/vbtn/Kconfig       |  16 +
>  drivers/platform/x86/intel/vbtn/Makefile      |   6 +
>  .../x86/{ => intel/vbtn}/intel-vbtn.c         |   0
>  drivers/platform/x86/intel/wmi/Kconfig        |  26 ++
>  drivers/platform/x86/intel/wmi/Makefile       |   7 +
>  .../{ => intel/wmi}/intel-wmi-sbl-fw-update.c |   0
>  .../{ => intel/wmi}/intel-wmi-thunderbolt.c   |   0
>  81 files changed, 562 insertions(+), 330 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%)
>  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%)
>  create mode 100644 drivers/platform/x86/intel/hid/Kconfig
>  create mode 100644 drivers/platform/x86/intel/hid/Makefile
>  rename drivers/platform/x86/{ => intel/hid}/intel-hid.c (100%)
>  create mode 100644 drivers/platform/x86/intel/int0002/Kconfig
>  create mode 100644 drivers/platform/x86/intel/int0002/Makefile
>  rename drivers/platform/x86/{ =>
> intel/int0002}/intel_int0002_vgpio.c (100%)
>  rename drivers/platform/x86/{ =>
> intel}/intel_speed_select_if/Kconfig (100%)
>  rename drivers/platform/x86/{ =>
> intel}/intel_speed_select_if/Makefile (100%)
>  rename drivers/platform/x86/{ =>
> intel}/intel_speed_select_if/isst_if_common.c (100%)
>  rename drivers/platform/x86/{ =>
> intel}/intel_speed_select_if/isst_if_common.h (100%)
>  rename drivers/platform/x86/{ =>
> intel}/intel_speed_select_if/isst_if_mbox_msr.c (100%)
>  rename drivers/platform/x86/{ =>
> intel}/intel_speed_select_if/isst_if_mbox_pci.c (100%)
>  rename drivers/platform/x86/{ =>
> intel}/intel_speed_select_if/isst_if_mmio.c (100%)
>  create mode 100644 drivers/platform/x86/intel/ips/Kconfig
>  create mode 100644 drivers/platform/x86/intel/ips/Makefile
>  rename drivers/platform/x86/{ => intel/ips}/intel_ips.c (100%)
>  rename drivers/platform/x86/{ => intel/ips}/intel_ips.h (100%)
>  create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
>  create mode 100644 drivers/platform/x86/intel/menlow/Makefile
>  rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c (100%)
>  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%)
>  create mode 100644 drivers/platform/x86/intel/oaktrail/Kconfig
>  create mode 100644 drivers/platform/x86/intel/oaktrail/Makefile
>  rename drivers/platform/x86/{ => intel/oaktrail}/intel_oaktrail.c
> (100%)
>  create mode 100644 drivers/platform/x86/intel/pmc_core/Kconfig
>  create mode 100644 drivers/platform/x86/intel/pmc_core/Makefile
>  rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core.c
> (100%)
>  rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core.h
> (100%)
>  rename drivers/platform/x86/{ =>
> intel/pmc_core}/intel_pmc_core_pltdrv.c (100%)
>  create mode 100644 drivers/platform/x86/intel/pmt/Kconfig
>  create mode 100644 drivers/platform/x86/intel/pmt/Makefile
>  rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.c (100%)
>  rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.h (100%)
>  rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_crashlog.c
> (100%)
>  rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_telemetry.c
> (100%)
>  create mode 100644 drivers/platform/x86/intel/punit/Kconfig
>  create mode 100644 drivers/platform/x86/intel/punit/Makefile
>  rename drivers/platform/x86/{ => intel/punit}/intel_punit_ipc.c
> (100%)
>  create mode 100644 drivers/platform/x86/intel/rst/Kconfig
>  create mode 100644 drivers/platform/x86/intel/rst/Makefile
>  rename drivers/platform/x86/{ => intel/rst}/intel-rst.c (100%)
>  create mode 100644 drivers/platform/x86/intel/scu/Kconfig
>  create mode 100644 drivers/platform/x86/intel/scu/Makefile
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipc.c (100%)
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipcutil.c
> (100%)
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_pcidrv.c
> (100%)
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_pltdrv.c
> (100%)
>  rename drivers/platform/x86/{ => intel/scu}/intel_scu_wdt.c (100%)
>  create mode 100644 drivers/platform/x86/intel/smartconnect/Kconfig
>  create mode 100644 drivers/platform/x86/intel/smartconnect/Makefile
>  rename drivers/platform/x86/{ => intel/smartconnect}/intel-
> smartconnect.c (100%)
>  create mode 100644 drivers/platform/x86/intel/telemetry/Kconfig
>  create mode 100644 drivers/platform/x86/intel/telemetry/Makefile
>  rename drivers/platform/x86/{ =>
> intel/telemetry}/intel_telemetry_core.c (100%)
>  rename drivers/platform/x86/{ =>
> intel/telemetry}/intel_telemetry_debugfs.c (100%)
>  rename drivers/platform/x86/{ =>
> intel/telemetry}/intel_telemetry_pltdrv.c (100%)
>  create mode 100644 drivers/platform/x86/intel/turbo_max_3/Kconfig
>  create mode 100644 drivers/platform/x86/intel/turbo_max_3/Makefile
>  rename drivers/platform/x86/{ =>
> intel/turbo_max_3}/intel_turbo_max_3.c (100%)
>  create mode 100644 drivers/platform/x86/intel/uncore_freq/Kconfig
>  create mode 100644 drivers/platform/x86/intel/uncore_freq/Makefile
>  rename drivers/platform/x86/{ => intel/uncore_freq}/intel-uncore-
> frequency.c (100%)
>  create mode 100644 drivers/platform/x86/intel/vbtn/Kconfig
>  create mode 100644 drivers/platform/x86/intel/vbtn/Makefile
>  rename drivers/platform/x86/{ => intel/vbtn}/intel-vbtn.c (100%)
>  create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
>  create mode 100644 drivers/platform/x86/intel/wmi/Makefile
>  rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-sbl-fw-
> update.c (100%)
>  rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-thunderbolt.c
> (100%)
> 

Re: [PATCH 00/20] Move Intel platform drivers to intel directory to improve readability.

[Randy Dunlap]

On 8/10/21 10:03 AM, David E. Box wrote:
> Hi,
> 
> On Tue, 2021-08-10 at 17:58 +0800, Kate Hsuan wrote:
>> All the intel platform specific drivers are moved to intel/.
>> It makes more clear file structure to improve the readability.
>>
> 
> A lot of subfolders for single files. Is this necessary? I'm submitting
> a single driver soon, unrelated to anything else. I was just going to
> drop it in /intel.
> 

Ugh, surely not necessary. Not even desirable IMO.

Thanks for bringing that up.

> 
>> Kate Hsuan (20):
>>    Move Intel hid of pdx86 to intel directory to improve readability.
>>    Move Intel WMI driver of pdx86 to intel/ directory to improve
>>      readability.
>>    Move Intel bxtwc driver of pdx86 to intel/ directory to improve
>>      readability.
>>    Move Intel chtdc_ti driver of pdx86 to improve readability.
>>    Move MRFLD power button driver of pdx86 to intel directory to
>> improve
>>      readability.
>>    Move Intel PMC core of pdx86 to intel/ directory to improve
>>      readability.
>>    Move Intel PMT driver of pdx86 to intel/ to improve readability.
>>    Move Intel P-Unit of pdx86 to intel/ directory to improve
>> readability.
>>    Move Intel SCU IPC of pdx86 to intel directory to increase
>>      readability.
>>    Move Intel SoC telemetry driver to intel directory to improve
>>      readability.
>>    Move Intel IPS driver of pdx86 to improve readability.
>>    Move Intel RST driver of pdx86 to intel directory to improve
>>      readability.
>>    Move Intel smartconnect driver of pdx86 to intel/ directory to
>> improve
>>      readability.
>>    Move Intel SST driver to intel/ directory to improve readability.
>>    Move Intel turbo max 3 driver to intel/ directory to improve
>>      readability.
>>    Move Intel uncore freq driver to intel/ directory to improve
>>      readability.
>>    Move Intel int0002 vgpio driver to intel/ directory to inprove
>>      readability.
>>    Move Intel thermal driver for menlow platform driver to intel/
>>      directory to improve readability.
>>    Move OakTrail driver to the intel/ directory to improve
>> readability.
>>    Move Intel virtual botton driver to intel/ directory to improve
>>      readability.
>>
>>   drivers/platform/x86/Kconfig                  | 297 ----------------
>> --
>>   drivers/platform/x86/Makefile                 |  34 +-
>>   drivers/platform/x86/intel/Kconfig            |  21 ++
>>   drivers/platform/x86/intel/Makefile           |  31 ++
>>   drivers/platform/x86/intel/bxtwc/Kconfig      |  15 +
>>   drivers/platform/x86/intel/bxtwc/Makefile     |   6 +
>>   .../x86/{ => intel/bxtwc}/intel_bxtwc_tmu.c   |   0
>>   drivers/platform/x86/intel/chtdc_ti/Kconfig   |  16 +
>>   drivers/platform/x86/intel/chtdc_ti/Makefile  |   7 +
>>   .../chtdc_ti}/intel_chtdc_ti_pwrbtn.c         |   0
>>   drivers/platform/x86/intel/hid/Kconfig        |  17 +
>>   drivers/platform/x86/intel/hid/Makefile       |   7 +
>>   .../platform/x86/{ => intel/hid}/intel-hid.c  |   0
>>   drivers/platform/x86/intel/int0002/Kconfig    |  23 ++
>>   drivers/platform/x86/intel/int0002/Makefile   |   6 +
>>   .../{ => intel/int0002}/intel_int0002_vgpio.c |   0
>>   .../{ => intel}/intel_speed_select_if/Kconfig |   0
>>   .../intel_speed_select_if/Makefile            |   0
>>   .../intel_speed_select_if/isst_if_common.c    |   0
>>   .../intel_speed_select_if/isst_if_common.h    |   0
>>   .../intel_speed_select_if/isst_if_mbox_msr.c  |   0
>>   .../intel_speed_select_if/isst_if_mbox_pci.c  |   0
>>   .../intel_speed_select_if/isst_if_mmio.c      |   0
>>   drivers/platform/x86/intel/ips/Kconfig        |  14 +
>>   drivers/platform/x86/intel/ips/Makefile       |   6 +
>>   .../platform/x86/{ => intel/ips}/intel_ips.c  |   0
>>   .../platform/x86/{ => intel/ips}/intel_ips.h  |   0
>>   drivers/platform/x86/intel/menlow/Kconfig     |  14 +
>>   drivers/platform/x86/intel/menlow/Makefile    |   6 +
>>   .../x86/{ => intel/menlow}/intel_menlow.c     |   0
>>   drivers/platform/x86/intel/mrfld/Kconfig      |  17 +
>>   drivers/platform/x86/intel/mrfld/Makefile     |   6 +
>>   .../{ => intel/mrfld}/intel_mrfld_pwrbtn.c    |   0
>>   drivers/platform/x86/intel/oaktrail/Kconfig   |  15 +
>>   drivers/platform/x86/intel/oaktrail/Makefile  |   6 +
>>   .../x86/{ => intel/oaktrail}/intel_oaktrail.c |   0
>>   drivers/platform/x86/intel/pmc_core/Kconfig   |  26 ++
>>   drivers/platform/x86/intel/pmc_core/Makefile  |   6 +
>>   .../x86/{ => intel/pmc_core}/intel_pmc_core.c |   0
>>   .../x86/{ => intel/pmc_core}/intel_pmc_core.h |   0
>>   .../pmc_core}/intel_pmc_core_pltdrv.c         |   0
>>   drivers/platform/x86/intel/pmt/Kconfig        |  41 +++
>>   drivers/platform/x86/intel/pmt/Makefile       |   9 +
>>   .../x86/{ => intel/pmt}/intel_pmt_class.c     |   0
>>   .../x86/{ => intel/pmt}/intel_pmt_class.h     |   0
>>   .../x86/{ => intel/pmt}/intel_pmt_crashlog.c  |   0
>>   .../x86/{ => intel/pmt}/intel_pmt_telemetry.c |   0
>>   drivers/platform/x86/intel/punit/Kconfig      |  10 +
>>   drivers/platform/x86/intel/punit/Makefile     |   6 +
>>   .../x86/{ => intel/punit}/intel_punit_ipc.c   |   0
>>   drivers/platform/x86/intel/rst/Kconfig        |  16 +
>>   drivers/platform/x86/intel/rst/Makefile       |   6 +
>>   .../platform/x86/{ => intel/rst}/intel-rst.c  |   0
>>   drivers/platform/x86/intel/scu/Kconfig        |  52 +++
>>   drivers/platform/x86/intel/scu/Makefile       |  11 +
>>   .../x86/{ => intel/scu}/intel_scu_ipc.c       |   0
>>   .../x86/{ => intel/scu}/intel_scu_ipcutil.c   |   0
>>   .../x86/{ => intel/scu}/intel_scu_pcidrv.c    |   0
>>   .../x86/{ => intel/scu}/intel_scu_pltdrv.c    |   0
>>   .../x86/{ => intel/scu}/intel_scu_wdt.c       |   0
>>   .../platform/x86/intel/smartconnect/Kconfig   |  18 ++
>>   .../platform/x86/intel/smartconnect/Makefile  |   6 +
>>   .../smartconnect}/intel-smartconnect.c        |   0
>>   drivers/platform/x86/intel/telemetry/Kconfig  |  16 +
>>   drivers/platform/x86/intel/telemetry/Makefile |   9 +
>>   .../telemetry}/intel_telemetry_core.c         |   0
>>   .../telemetry}/intel_telemetry_debugfs.c      |   0
>>   .../telemetry}/intel_telemetry_pltdrv.c       |   0
>>   .../platform/x86/intel/turbo_max_3/Kconfig    |  14 +
>>   .../platform/x86/intel/turbo_max_3/Makefile   |   6 +
>>   .../turbo_max_3}/intel_turbo_max_3.c          |   0
>>   .../platform/x86/intel/uncore_freq/Kconfig    |  15 +
>>   .../platform/x86/intel/uncore_freq/Makefile   |   6 +
>>   .../uncore_freq}/intel-uncore-frequency.c     |   0
>>   drivers/platform/x86/intel/vbtn/Kconfig       |  16 +
>>   drivers/platform/x86/intel/vbtn/Makefile      |   6 +
>>   .../x86/{ => intel/vbtn}/intel-vbtn.c         |   0
>>   drivers/platform/x86/intel/wmi/Kconfig        |  26 ++
>>   drivers/platform/x86/intel/wmi/Makefile       |   7 +
>>   .../{ => intel/wmi}/intel-wmi-sbl-fw-update.c |   0
>>   .../{ => intel/wmi}/intel-wmi-thunderbolt.c   |   0
>>   81 files changed, 562 insertions(+), 330 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%)
>>   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%)
>>   create mode 100644 drivers/platform/x86/intel/hid/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/hid/Makefile
>>   rename drivers/platform/x86/{ => intel/hid}/intel-hid.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/int0002/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/int0002/Makefile
>>   rename drivers/platform/x86/{ =>
>> intel/int0002}/intel_int0002_vgpio.c (100%)
>>   rename drivers/platform/x86/{ =>
>> intel}/intel_speed_select_if/Kconfig (100%)
>>   rename drivers/platform/x86/{ =>
>> intel}/intel_speed_select_if/Makefile (100%)
>>   rename drivers/platform/x86/{ =>
>> intel}/intel_speed_select_if/isst_if_common.c (100%)
>>   rename drivers/platform/x86/{ =>
>> intel}/intel_speed_select_if/isst_if_common.h (100%)
>>   rename drivers/platform/x86/{ =>
>> intel}/intel_speed_select_if/isst_if_mbox_msr.c (100%)
>>   rename drivers/platform/x86/{ =>
>> intel}/intel_speed_select_if/isst_if_mbox_pci.c (100%)
>>   rename drivers/platform/x86/{ =>
>> intel}/intel_speed_select_if/isst_if_mmio.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/ips/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/ips/Makefile
>>   rename drivers/platform/x86/{ => intel/ips}/intel_ips.c (100%)
>>   rename drivers/platform/x86/{ => intel/ips}/intel_ips.h (100%)
>>   create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/menlow/Makefile
>>   rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c (100%)
>>   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%)
>>   create mode 100644 drivers/platform/x86/intel/oaktrail/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/oaktrail/Makefile
>>   rename drivers/platform/x86/{ => intel/oaktrail}/intel_oaktrail.c
>> (100%)
>>   create mode 100644 drivers/platform/x86/intel/pmc_core/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/pmc_core/Makefile
>>   rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core.c
>> (100%)
>>   rename drivers/platform/x86/{ => intel/pmc_core}/intel_pmc_core.h
>> (100%)
>>   rename drivers/platform/x86/{ =>
>> intel/pmc_core}/intel_pmc_core_pltdrv.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/pmt/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/pmt/Makefile
>>   rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.c (100%)
>>   rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_class.h (100%)
>>   rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_crashlog.c
>> (100%)
>>   rename drivers/platform/x86/{ => intel/pmt}/intel_pmt_telemetry.c
>> (100%)
>>   create mode 100644 drivers/platform/x86/intel/punit/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/punit/Makefile
>>   rename drivers/platform/x86/{ => intel/punit}/intel_punit_ipc.c
>> (100%)
>>   create mode 100644 drivers/platform/x86/intel/rst/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/rst/Makefile
>>   rename drivers/platform/x86/{ => intel/rst}/intel-rst.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/scu/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/scu/Makefile
>>   rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipc.c (100%)
>>   rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipcutil.c
>> (100%)
>>   rename drivers/platform/x86/{ => intel/scu}/intel_scu_pcidrv.c
>> (100%)
>>   rename drivers/platform/x86/{ => intel/scu}/intel_scu_pltdrv.c
>> (100%)
>>   rename drivers/platform/x86/{ => intel/scu}/intel_scu_wdt.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/smartconnect/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/smartconnect/Makefile
>>   rename drivers/platform/x86/{ => intel/smartconnect}/intel-
>> smartconnect.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/telemetry/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/telemetry/Makefile
>>   rename drivers/platform/x86/{ =>
>> intel/telemetry}/intel_telemetry_core.c (100%)
>>   rename drivers/platform/x86/{ =>
>> intel/telemetry}/intel_telemetry_debugfs.c (100%)
>>   rename drivers/platform/x86/{ =>
>> intel/telemetry}/intel_telemetry_pltdrv.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/turbo_max_3/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/turbo_max_3/Makefile
>>   rename drivers/platform/x86/{ =>
>> intel/turbo_max_3}/intel_turbo_max_3.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/uncore_freq/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/uncore_freq/Makefile
>>   rename drivers/platform/x86/{ => intel/uncore_freq}/intel-uncore-
>> frequency.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/vbtn/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/vbtn/Makefile
>>   rename drivers/platform/x86/{ => intel/vbtn}/intel-vbtn.c (100%)
>>   create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
>>   create mode 100644 drivers/platform/x86/intel/wmi/Makefile
>>   rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-sbl-fw-
>> update.c (100%)
>>   rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-thunderbolt.c
>> (100%)
>>
> 
> 


-- 
~Randy
Reported-by: Randy Dunlap <rdunlap@infradead.org>
https://people.kernel.org/tglx/notes-about-netiquette

Re: [PATCH 08/20] Move Intel P-Unit of pdx86 to intel/ directory to improve readability.

[Kate Hsuan]

Some commit mistakes. I'll correct this.

Thank you. :)

On Wed, Aug 11, 2021 at 12:55 AM David E. Box
<david.e.box@linux.intel.com> wrote:
>
> Hi,
>
> On Tue, 2021-08-10 at 17:58 +0800, Kate Hsuan wrote:
> > Signed-off-by: Kate Hsuan <hpa@redhat.com>
> > ---
> >  drivers/platform/x86/Kconfig                  | 43 -----------------
> > --
> >  drivers/platform/x86/Makefile                 |  2 +-
> >  drivers/platform/x86/intel/Kconfig            |  1 +
> >  drivers/platform/x86/intel/Makefile           |  1 +
> >  drivers/platform/x86/intel/punit/Kconfig      | 10 +++++
> >  drivers/platform/x86/intel/punit/Makefile     |  6 +++
> >  .../x86/{ => intel/punit}/intel_punit_ipc.c   |  0
> >  7 files changed, 19 insertions(+), 44 deletions(-)
> >  create mode 100644 drivers/platform/x86/intel/punit/Kconfig
> >  create mode 100644 drivers/platform/x86/intel/punit/Makefile
> >  rename drivers/platform/x86/{ => intel/punit}/intel_punit_ipc.c
> > (100%)
> >
> > diff --git a/drivers/platform/x86/Kconfig
> > b/drivers/platform/x86/Kconfig
> > index b9a324ba17e3..00fa213e9adb 100644
> > --- a/drivers/platform/x86/Kconfig
> > +++ b/drivers/platform/x86/Kconfig
> > @@ -1086,49 +1086,6 @@ config INTEL_UNCORE_FREQ_CONTROL
> >           will be called intel-uncore-frequency.
> >
> >
> > -
> > -config INTEL_PMT_CLASS
> > -       tristate
> > -       help
> > -         The Intel Platform Monitoring Technology (PMT) class driver
> > provides
> > -         the basic sysfs interface and file hierarchy used by PMT
> > devices.
> > -
> > -         For more information, see:
> > -         <file:Documentation/ABI/testing/sysfs-class-intel_pmt>
> > -
> > -         To compile this driver as a module, choose M here: the
> > module
> > -         will be called intel_pmt_class.
> > -
> > -config INTEL_PMT_TELEMETRY
> > -       tristate "Intel Platform Monitoring Technology (PMT)
> > Telemetry driver"
> > -       depends on MFD_INTEL_PMT
> > -       select INTEL_PMT_CLASS
> > -       help
> > -         The Intel Platform Monitory Technology (PMT) Telemetry
> > driver provides
> > -         access to hardware telemetry metrics on devices that
> > support the
> > -         feature.
> > -
> > -         To compile this driver as a module, choose M here: the
> > module
> > -         will be called intel_pmt_telemetry.
> > -
> > -config INTEL_PMT_CRASHLOG
> > -       tristate "Intel Platform Monitoring Technology (PMT) Crashlog
> > driver"
> > -       depends on MFD_INTEL_PMT
> > -       select INTEL_PMT_CLASS
> > -       help
> > -         The Intel Platform Monitoring Technology (PMT) crashlog
> > driver provides
> > -         access to hardware crashlog capabilities on devices that
> > support the
> > -         feature.
> > -
> > -         To compile this driver as a module, choose M here: the
> > module
> > -         will be called intel_pmt_crashlog.
> > -
>
> Accidentally caught the above configs not part of P-Unit IPC driver.
>
> > -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 1310b1ebc3f0..dbb62085e7f9 100644
> > --- a/drivers/platform/x86/Makefile
> > +++ b/drivers/platform/x86/Makefile
> > @@ -124,7 +124,7 @@ obj-
> > $(CONFIG_INTEL_UNCORE_FREQ_CONTROL)             += intel-uncore-
> > frequency.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 38bfca25940d..189a34226fe0 100644
> > --- a/drivers/platform/x86/intel/Kconfig
> > +++ b/drivers/platform/x86/intel/Kconfig
> > @@ -26,6 +26,7 @@ source
> > "drivers/platform/x86/intel/chtdc_ti/Kconfig"
> >  source "drivers/platform/x86/intel/mrfld/Kconfig"
> >  source "drivers/platform/x86/intel/pmc_core/Kconfig"
> >  source "drivers/platform/x86/intel/pmt/Kconfig"
> > +source "drivers/platform/x86/intel/punit/Kconfig"
> >
> >
> >  endif # X86_PLATFORM_DRIVERS_INTEL
> > diff --git a/drivers/platform/x86/intel/Makefile
> > b/drivers/platform/x86/intel/Makefile
> > index 746bee1db055..9bd49a920900 100644
> > --- a/drivers/platform/x86/intel/Makefile
> > +++ b/drivers/platform/x86/intel/Makefile
> > @@ -21,3 +21,4 @@ obj-$(CONFIG_INTEL_PMC_CORE)          += pmc_core/
> >  obj-$(CONFIG_INTEL_PMT_CLASS)          += pmt/
> >  obj-$(CONFIG_INTEL_PMT_TELEMETRY)      += pmt/
> >  obj-$(CONFIG_INTEL_PMT_CRASHLOG)       += pmt/
> > +obj-$(CONFIG_INTEL_PUNIT_IPC)          += punit/
> > diff --git a/drivers/platform/x86/intel/punit/Kconfig
> > b/drivers/platform/x86/intel/punit/Kconfig
> > new file mode 100644
> > index 000000000000..db56ef3bb086
> > --- /dev/null
> > +++ b/drivers/platform/x86/intel/punit/Kconfig
> > @@ -0,0 +1,10 @@
> > +# SPDX-License-Identifier: GPL-2.0-only
> > +#
> > +# X86 Platform Specific Drivers
> > +#
> > +
> > +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.
> > diff --git a/drivers/platform/x86/intel/punit/Makefile
> > b/drivers/platform/x86/intel/punit/Makefile
> > new file mode 100644
> > index 000000000000..f25284806f63
> > --- /dev/null
> > +++ b/drivers/platform/x86/intel/punit/Makefile
> > @@ -0,0 +1,6 @@
> > +# SPDX-License-Identifier: GPL-2.0-only
> > +#
> > +# X86 Platform Specific Drivers
> > +#
> > +
> > +obj-$(CONFIG_INTEL_PUNIT_IPC)          += intel_punit_ipc.o
> > \ No newline at end of file
> > diff --git a/drivers/platform/x86/intel_punit_ipc.c
> > b/drivers/platform/x86/intel/punit/intel_punit_ipc.c
> > similarity index 100%
> > rename from drivers/platform/x86/intel_punit_ipc.c
> > rename to drivers/platform/x86/intel/punit/intel_punit_ipc.c
>
>

Re: [PATCH 00/20] Move Intel platform drivers to intel directory to improve readability.

[Kate Hsuan]

On Tue, Aug 10, 2021 at 10:05 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Hi Kate,
>
> On 8/10/21 11:58 AM, Kate Hsuan wrote:
> > All the intel platform specific drivers are moved to intel/.
> > It makes more clear file structure to improve the readability.
> >
> > Kate Hsuan (20):
> >   Move Intel hid of pdx86 to intel directory to improve readability.
> >   Move Intel WMI driver of pdx86 to intel/ directory to improve
> >     readability.
> >   Move Intel bxtwc driver of pdx86 to intel/ directory to improve
> >     readability.
> >   Move Intel chtdc_ti driver of pdx86 to improve readability.
> >   Move MRFLD power button driver of pdx86 to intel directory to improve
> >     readability.
> >   Move Intel PMC core of pdx86 to intel/ directory to improve
> >     readability.
> >   Move Intel PMT driver of pdx86 to intel/ to improve readability.
> >   Move Intel P-Unit of pdx86 to intel/ directory to improve readability.
> >   Move Intel SCU IPC of pdx86 to intel directory to increase
> >     readability.
> >   Move Intel SoC telemetry driver to intel directory to improve
> >     readability.
> >   Move Intel IPS driver of pdx86 to improve readability.
> >   Move Intel RST driver of pdx86 to intel directory to improve
> >     readability.
> >   Move Intel smartconnect driver of pdx86 to intel/ directory to improve
> >     readability.
> >   Move Intel SST driver to intel/ directory to improve readability.
> >   Move Intel turbo max 3 driver to intel/ directory to improve
> >     readability.
> >   Move Intel uncore freq driver to intel/ directory to improve
> >     readability.
> >   Move Intel int0002 vgpio driver to intel/ directory to inprove
> >     readability.
> >   Move Intel thermal driver for menlow platform driver to intel/
> >     directory to improve readability.
> >   Move OakTrail driver to the intel/ directory to improve readability.
> >   Move Intel virtual botton driver to intel/ directory to improve
> >     readability.
>
> Thank you for doing this. I have a couple of remarks which I would
> like to see addressed for version 2 of this series:
>
> 1. The commit messages are currently all one line, so basically
> only a Subject and they are missing a Body describing the change
> in more detail (as already pointed out by Mika).
>
>
> 2. Kernel patch subjects (the first line of the commit message)
> should always be prefixed with the subsystem + component which they
> are for, so instead of e.g.
>
> "Move Intel hid of pdx86 to intel directory to improve readability."
>
> you would use:
>
> "platform/x86: intel-hid: Move to intel sub-directory to improve readability."
>
> But that is a bit long; and normally the Subject line is just
> a summary while the body explains things like the why, so this should
> probably be shorted to:
>
> "platform/x86: intel-hid: Move to intel sub-directory"
>
> For the Subject, with the Body explaining what exactly is being changed
> and why.
>
>
> 3. You are using new sub-directories for all drivers which you
> are moving, but for drivers which are currently just 1 c-file, this
> means going from 1 c-file to 3 files (c-file + Kconfig + Makefile)
> this seems a bit too much. I believe that it would be better for
> the single file drivers (e.g. intel-hid.c, intel-vbtn.c) to be moved
> directly under drivers/platform/x86/intel and for there Kconfig
> and Makefile bits to be moved to the already existing Kconfig
> and Makefile files there.
>
>
> 4. As Andy already mentioned when moving a file like
> "intel_scu_ipc.c" to drivers/platform/x86/intel/scu then the
> whole path becomes:
>
> drivers/platform/x86/intel/scu/intel_scu_ipc.c
>
> Which is quite long / quite a lot to type and repeats
> intel + scu twice, so it would be better to drop the intel_scu
> prefix from the filenames in this case resulting in:
>
> drivers/platform/x86/intel/scu/ipc.c
>
> in this example's case. This requires some extrea work:
>
> 4.1 You will need to adjust private includes to the new
> filenames
>
> 4.2 If you simply adjust say this Makefile line:
>
> obj-$(CONFIG_INTEL_SCU_PCI)             += intel_scu_pcidrv.o
>
> to:
>
> obj-$(CONFIG_INTEL_SCU_PCI)             += pcidrv.o
>
> a pcidrv.ko will get build, but that is a very generic name
> and then we end up with module-name clashes which are not
> allowed.
>
> So the Makefile needs to become a bit more complicated like this:
>
> intel_scu_pcidrv-y                      := pcidrv.o
> obj-$(CONFIG_INTEL_SCU_PCI)             += intel_scu_pcidrv.o
>
> See for example:
> https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/tree/drivers/platform/x86/intel/pmt/Makefile?h=for-next
>
>
> 5. Some of the files which you are moving are mentioned in the
> MAINTAINERS file. For each file which you are moving please check if
> it is listed in the MAINTAINERS file, keeping wildcards in mind,
> so search e.g. for intel_scu for the intel_scu_* move.
>
> And if the file is listed then update the MAINTAINERS entry to
> point to the new location.
>
> Regards,
>
> Hans
>

Thanks Hans. I'll do that for my v2 patches.

Re: [PATCH 00/20] Move Intel platform drivers to intel directory to improve readability.

[Andy Shevchenko]

On Tue, Aug 10, 2021 at 04:23:57PM +0300, Andy Shevchenko wrote:
> On Tue, Aug 10, 2021 at 4:20 PM Kate Hsuan <hpa@redhat.com> wrote:
> >
> > All the intel platform specific drivers are moved to intel/.
> > It makes more clear file structure to improve the readability.
> 
> Thanks for doing this!
> I'll review it later on (this or next week), meanwhile can you rebase
> it on top of PDx86 for-next?

Okay, most of the basic comments were given by a few people already, I'll wait
for v2.


-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 18/20] Move Intel thermal driver for menlow platform driver to intel/ directory to improve readability.

[Daniel Lezcano]

On 10/08/2021 11:58, Kate Hsuan wrote:


Why not move it into drivers/thermal/intel ?


> Signed-off-by: Kate Hsuan <hpa@redhat.com>
> ---
>  drivers/platform/x86/Kconfig                       |  8 --------
>  drivers/platform/x86/Makefile                      |  2 +-
>  drivers/platform/x86/intel/Kconfig                 |  1 +
>  drivers/platform/x86/intel/Makefile                |  2 ++
>  drivers/platform/x86/intel/menlow/Kconfig          | 14 ++++++++++++++
>  drivers/platform/x86/intel/menlow/Makefile         |  6 ++++++
>  .../platform/x86/{ => intel/menlow}/intel_menlow.c |  0
>  7 files changed, 24 insertions(+), 9 deletions(-)
>  create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
>  create mode 100644 drivers/platform/x86/intel/menlow/Makefile
>  rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c (100%)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index b9c0d2d97793..50ded236a841 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -632,15 +632,7 @@ config THINKPAD_LMI
>  
>  source "drivers/platform/x86/intel/Kconfig"
>  
> -config INTEL_MENLOW
> -	tristate "Thermal Management driver for Intel menlow platform"
> -	depends on ACPI_THERMAL
> -	select THERMAL
> -	help
> -	  ACPI thermal management enhancement driver on
> -	  Intel Menlow platform.
>  
> -	  If unsure, say N.
>  
>  config INTEL_OAKTRAIL
>  	tristate "Intel Oaktrail Platform Extras"
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index f4c6ced59da1..ea5f5dd3f78a 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -67,7 +67,7 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
>  obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
>  
>  
> -obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
> +
>  obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
>  obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
>  
> diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
> index 4efb5ad3e3e1..59c9b602c784 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -36,6 +36,7 @@ source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
>  source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
>  source "drivers/platform/x86/intel/uncore_freq/Kconfig"
>  source "drivers/platform/x86/intel/int0002/Kconfig"
> +source "drivers/platform/x86/intel/menlow/Kconfig"
>  
>  
>  endif # X86_PLATFORM_DRIVERS_INTEL
> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
> index fe5058c3af18..b2326554bd84 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -12,6 +12,7 @@ obj-$(CONFIG_INTEL_HID_EVENT)		+= hid/
>  obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= wmi/
>  obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= wmi/
>  obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= int0002/
> +obj-$(CONFIG_INTEL_MENLOW)		+= menlow/
>  
>  
>  # Intel PMIC / PMC / P-Unit devices
> @@ -38,3 +39,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
>  obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= turbo_max_3/
>  obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= uncore_freq/
>  
> +
> diff --git a/drivers/platform/x86/intel/menlow/Kconfig b/drivers/platform/x86/intel/menlow/Kconfig
> new file mode 100644
> index 000000000000..b2920d259ff7
> --- /dev/null
> +++ b/drivers/platform/x86/intel/menlow/Kconfig
> @@ -0,0 +1,14 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +config INTEL_MENLOW
> +	tristate "Thermal Management driver for Intel menlow platform"
> +	depends on ACPI_THERMAL
> +	select THERMAL
> +	help
> +	  ACPI thermal management enhancement driver on
> +	  Intel Menlow platform.
> +
> +	  If unsure, say N.
> diff --git a/drivers/platform/x86/intel/menlow/Makefile b/drivers/platform/x86/intel/menlow/Makefile
> new file mode 100644
> index 000000000000..0e9fda9bff98
> --- /dev/null
> +++ b/drivers/platform/x86/intel/menlow/Makefile
> @@ -0,0 +1,6 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
> diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel/menlow/intel_menlow.c
> similarity index 100%
> rename from drivers/platform/x86/intel_menlow.c
> rename to drivers/platform/x86/intel/menlow/intel_menlow.c
> 


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH 18/20] Move Intel thermal driver for menlow platform driver to intel/ directory to improve readability.

[Hans de Goede]

Hi,

On 8/14/21 12:39 PM, Daniel Lezcano wrote:
> On 10/08/2021 11:58, Kate Hsuan wrote:
> 
> 
> Why not move it into drivers/thermal/intel ?

This cleanup is really something which Intel should have been doing
itself, but they have not done that, so now Kate has stepped up to
do this.

Figuring out if there is a better home for each of these drivers
really falls outside of the scope of this. If Intel and specifically
Sujith Thomas, the maintainer for that driver who is in the Cc,
believe that drivers/thermal/intel is a better place then they
can submit a patch for this themselves.

If Intel does that right away, then this patch can be dropped from
Kate's patch-set. Otherwise this can be moved a second time once
someone from Intel gets around to it.

Regards,

Hans




> 
> 
>> Signed-off-by: Kate Hsuan <hpa@redhat.com>
>> ---
>>  drivers/platform/x86/Kconfig                       |  8 --------
>>  drivers/platform/x86/Makefile                      |  2 +-
>>  drivers/platform/x86/intel/Kconfig                 |  1 +
>>  drivers/platform/x86/intel/Makefile                |  2 ++
>>  drivers/platform/x86/intel/menlow/Kconfig          | 14 ++++++++++++++
>>  drivers/platform/x86/intel/menlow/Makefile         |  6 ++++++
>>  .../platform/x86/{ => intel/menlow}/intel_menlow.c |  0
>>  7 files changed, 24 insertions(+), 9 deletions(-)
>>  create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
>>  create mode 100644 drivers/platform/x86/intel/menlow/Makefile
>>  rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c (100%)
>>
>> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
>> index b9c0d2d97793..50ded236a841 100644
>> --- a/drivers/platform/x86/Kconfig
>> +++ b/drivers/platform/x86/Kconfig
>> @@ -632,15 +632,7 @@ config THINKPAD_LMI
>>  
>>  source "drivers/platform/x86/intel/Kconfig"
>>  
>> -config INTEL_MENLOW
>> -	tristate "Thermal Management driver for Intel menlow platform"
>> -	depends on ACPI_THERMAL
>> -	select THERMAL
>> -	help
>> -	  ACPI thermal management enhancement driver on
>> -	  Intel Menlow platform.
>>  
>> -	  If unsure, say N.
>>  
>>  config INTEL_OAKTRAIL
>>  	tristate "Intel Oaktrail Platform Extras"
>> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
>> index f4c6ced59da1..ea5f5dd3f78a 100644
>> --- a/drivers/platform/x86/Makefile
>> +++ b/drivers/platform/x86/Makefile
>> @@ -67,7 +67,7 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
>>  obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
>>  
>>  
>> -obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
>> +
>>  obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
>>  obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
>>  
>> diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
>> index 4efb5ad3e3e1..59c9b602c784 100644
>> --- a/drivers/platform/x86/intel/Kconfig
>> +++ b/drivers/platform/x86/intel/Kconfig
>> @@ -36,6 +36,7 @@ source "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
>>  source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
>>  source "drivers/platform/x86/intel/uncore_freq/Kconfig"
>>  source "drivers/platform/x86/intel/int0002/Kconfig"
>> +source "drivers/platform/x86/intel/menlow/Kconfig"
>>  
>>  
>>  endif # X86_PLATFORM_DRIVERS_INTEL
>> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
>> index fe5058c3af18..b2326554bd84 100644
>> --- a/drivers/platform/x86/intel/Makefile
>> +++ b/drivers/platform/x86/intel/Makefile
>> @@ -12,6 +12,7 @@ obj-$(CONFIG_INTEL_HID_EVENT)		+= hid/
>>  obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= wmi/
>>  obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= wmi/
>>  obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= int0002/
>> +obj-$(CONFIG_INTEL_MENLOW)		+= menlow/
>>  
>>  
>>  # Intel PMIC / PMC / P-Unit devices
>> @@ -38,3 +39,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
>>  obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= turbo_max_3/
>>  obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= uncore_freq/
>>  
>> +
>> diff --git a/drivers/platform/x86/intel/menlow/Kconfig b/drivers/platform/x86/intel/menlow/Kconfig
>> new file mode 100644
>> index 000000000000..b2920d259ff7
>> --- /dev/null
>> +++ b/drivers/platform/x86/intel/menlow/Kconfig
>> @@ -0,0 +1,14 @@
>> +# SPDX-License-Identifier: GPL-2.0-only
>> +#
>> +# Intel x86 Platform Specific Drivers
>> +#
>> +
>> +config INTEL_MENLOW
>> +	tristate "Thermal Management driver for Intel menlow platform"
>> +	depends on ACPI_THERMAL
>> +	select THERMAL
>> +	help
>> +	  ACPI thermal management enhancement driver on
>> +	  Intel Menlow platform.
>> +
>> +	  If unsure, say N.
>> diff --git a/drivers/platform/x86/intel/menlow/Makefile b/drivers/platform/x86/intel/menlow/Makefile
>> new file mode 100644
>> index 000000000000..0e9fda9bff98
>> --- /dev/null
>> +++ b/drivers/platform/x86/intel/menlow/Makefile
>> @@ -0,0 +1,6 @@
>> +# SPDX-License-Identifier: GPL-2.0-only
>> +#
>> +# Intel x86 Platform Specific Drivers
>> +#
>> +
>> +obj-$(CONFIG_INTEL_MENLOW)		+= intel_menlow.o
>> diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel/menlow/intel_menlow.c
>> similarity index 100%
>> rename from drivers/platform/x86/intel_menlow.c
>> rename to drivers/platform/x86/intel/menlow/intel_menlow.c
>>
> 
> 

Re: [PATCH 18/20] Move Intel thermal driver for menlow platform driver to intel/ directory to improve readability.

[Pandruvada, Srinivas]

On Sun, 2021-08-15 at 16:08 +0200, Hans de Goede wrote:
> Hi,
> 
> On 8/14/21 12:39 PM, Daniel Lezcano wrote:
> > On 10/08/2021 11:58, Kate Hsuan wrote:
> > 
> > 
> > Why not move it into drivers/thermal/intel ?
> 
> This cleanup is really something which Intel should have been doing
> itself, but they have not done that, so now Kate has stepped up to
> do this.
> 
> Figuring out if there is a better home for each of these drivers
> really falls outside of the scope of this. If Intel and specifically
> Sujith Thomas, the maintainer for that driver who is in the Cc,
> believe that drivers/thermal/intel is a better place then they
> can submit a patch for this themselves.
> 
> If Intel does that right away, then this patch can be dropped from
> Kate's patch-set. Otherwise this can be moved a second time once
> someone from Intel gets around to it.
We can move to thermal/intel. I will submit a change to do that.

Thanks,
Srinivas

> 
> Regards,
> 
> Hans
> 
> 
> 
> 
> > 
> > 
> > > Signed-off-by: Kate Hsuan <hpa@redhat.com>
> > > ---
> > >  drivers/platform/x86/Kconfig                       |  8 --------
> > >  drivers/platform/x86/Makefile                      |  2 +-
> > >  drivers/platform/x86/intel/Kconfig                 |  1 +
> > >  drivers/platform/x86/intel/Makefile                |  2 ++
> > >  drivers/platform/x86/intel/menlow/Kconfig          | 14
> > > ++++++++++++++
> > >  drivers/platform/x86/intel/menlow/Makefile         |  6 ++++++
> > >  .../platform/x86/{ => intel/menlow}/intel_menlow.c |  0
> > >  7 files changed, 24 insertions(+), 9 deletions(-)
> > >  create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
> > >  create mode 100644 drivers/platform/x86/intel/menlow/Makefile
> > >  rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c
> > > (100%)
> > > 
> > > diff --git a/drivers/platform/x86/Kconfig
> > > b/drivers/platform/x86/Kconfig
> > > index b9c0d2d97793..50ded236a841 100644
> > > --- a/drivers/platform/x86/Kconfig
> > > +++ b/drivers/platform/x86/Kconfig
> > > @@ -632,15 +632,7 @@ config THINKPAD_LMI
> > >  
> > >  source "drivers/platform/x86/intel/Kconfig"
> > >  
> > > -config INTEL_MENLOW
> > > -       tristate "Thermal Management driver for Intel menlow
> > > platform"
> > > -       depends on ACPI_THERMAL
> > > -       select THERMAL
> > > -       help
> > > -         ACPI thermal management enhancement driver on
> > > -         Intel Menlow platform.
> > >  
> > > -         If unsure, say N.
> > >  
> > >  config INTEL_OAKTRAIL
> > >         tristate "Intel Oaktrail Platform Extras"
> > > diff --git a/drivers/platform/x86/Makefile
> > > b/drivers/platform/x86/Makefile
> > > index f4c6ced59da1..ea5f5dd3f78a 100644
> > > --- a/drivers/platform/x86/Makefile
> > > +++ b/drivers/platform/x86/Makefile
> > > @@ -67,7 +67,7 @@ obj-$(CONFIG_THINKPAD_LMI)    += think-lmi.o
> > >  obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)               += intel/
> > >  
> > >  
> > > -obj-$(CONFIG_INTEL_MENLOW)             += intel_menlow.o
> > > +
> > >  obj-$(CONFIG_INTEL_OAKTRAIL)           += intel_oaktrail.o
> > >  obj-$(CONFIG_INTEL_VBTN)               += intel-vbtn.o
> > >  
> > > diff --git a/drivers/platform/x86/intel/Kconfig
> > > b/drivers/platform/x86/intel/Kconfig
> > > index 4efb5ad3e3e1..59c9b602c784 100644
> > > --- a/drivers/platform/x86/intel/Kconfig
> > > +++ b/drivers/platform/x86/intel/Kconfig
> > > @@ -36,6 +36,7 @@ source
> > > "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
> > >  source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
> > >  source "drivers/platform/x86/intel/uncore_freq/Kconfig"
> > >  source "drivers/platform/x86/intel/int0002/Kconfig"
> > > +source "drivers/platform/x86/intel/menlow/Kconfig"
> > >  
> > >  
> > >  endif # X86_PLATFORM_DRIVERS_INTEL
> > > diff --git a/drivers/platform/x86/intel/Makefile
> > > b/drivers/platform/x86/intel/Makefile
> > > index fe5058c3af18..b2326554bd84 100644
> > > --- a/drivers/platform/x86/intel/Makefile
> > > +++ b/drivers/platform/x86/intel/Makefile
> > > @@ -12,6 +12,7 @@ obj-$(CONFIG_INTEL_HID_EVENT)         += hid/
> > >  obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)  += wmi/
> > >  obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)    += wmi/
> > >  obj-$(CONFIG_INTEL_INT0002_VGPIO)      += int0002/
> > > +obj-$(CONFIG_INTEL_MENLOW)             += menlow/
> > >  
> > >  
> > >  # Intel PMIC / PMC / P-Unit devices
> > > @@ -38,3 +39,4 @@ obj-
> > > $(CONFIG_INTEL_SPEED_SELECT_INTERFACE)    +=
> > > intel_speed_select_if/
> > >  obj-$(CONFIG_INTEL_TURBO_MAX_3)                        +=
> > > turbo_max_3/
> > >  obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)                +=
> > > uncore_freq/
> > >  
> > > +
> > > diff --git a/drivers/platform/x86/intel/menlow/Kconfig
> > > b/drivers/platform/x86/intel/menlow/Kconfig
> > > new file mode 100644
> > > index 000000000000..b2920d259ff7
> > > --- /dev/null
> > > +++ b/drivers/platform/x86/intel/menlow/Kconfig
> > > @@ -0,0 +1,14 @@
> > > +# SPDX-License-Identifier: GPL-2.0-only
> > > +#
> > > +# Intel x86 Platform Specific Drivers
> > > +#
> > > +
> > > +config INTEL_MENLOW
> > > +       tristate "Thermal Management driver for Intel menlow
> > > platform"
> > > +       depends on ACPI_THERMAL
> > > +       select THERMAL
> > > +       help
> > > +         ACPI thermal management enhancement driver on
> > > +         Intel Menlow platform.
> > > +
> > > +         If unsure, say N.
> > > diff --git a/drivers/platform/x86/intel/menlow/Makefile
> > > b/drivers/platform/x86/intel/menlow/Makefile
> > > new file mode 100644
> > > index 000000000000..0e9fda9bff98
> > > --- /dev/null
> > > +++ b/drivers/platform/x86/intel/menlow/Makefile
> > > @@ -0,0 +1,6 @@
> > > +# SPDX-License-Identifier: GPL-2.0-only
> > > +#
> > > +# Intel x86 Platform Specific Drivers
> > > +#
> > > +
> > > +obj-$(CONFIG_INTEL_MENLOW)             += intel_menlow.o
> > > diff --git a/drivers/platform/x86/intel_menlow.c
> > > b/drivers/platform/x86/intel/menlow/intel_menlow.c
> > > similarity index 100%
> > > rename from drivers/platform/x86/intel_menlow.c
> > > rename to drivers/platform/x86/intel/menlow/intel_menlow.c
> > > 
> > 
> > 
> 

Re: [PATCH 18/20] Move Intel thermal driver for menlow platform driver to intel/ directory to improve readability.

[Hans de Goede]

Hi,

On 8/16/21 5:11 AM, Pandruvada, Srinivas wrote:
> On Sun, 2021-08-15 at 16:08 +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 8/14/21 12:39 PM, Daniel Lezcano wrote:
>>> On 10/08/2021 11:58, Kate Hsuan wrote:
>>>
>>>
>>> Why not move it into drivers/thermal/intel ?
>>
>> This cleanup is really something which Intel should have been doing
>> itself, but they have not done that, so now Kate has stepped up to
>> do this.
>>
>> Figuring out if there is a better home for each of these drivers
>> really falls outside of the scope of this. If Intel and specifically
>> Sujith Thomas, the maintainer for that driver who is in the Cc,
>> believe that drivers/thermal/intel is a better place then they
>> can submit a patch for this themselves.
>>
>> If Intel does that right away, then this patch can be dropped from
>> Kate's patch-set. Otherwise this can be moved a second time once
>> someone from Intel gets around to it.
> We can move to thermal/intel. I will submit a change to do that.

Great, I see that you've already send a patch for this, thank you.

Kate, please drop this patch from your series.

Regards,

Hans


>>>> Signed-off-by: Kate Hsuan <hpa@redhat.com>
>>>> ---
>>>>  drivers/platform/x86/Kconfig                       |  8 --------
>>>>  drivers/platform/x86/Makefile                      |  2 +-
>>>>  drivers/platform/x86/intel/Kconfig                 |  1 +
>>>>  drivers/platform/x86/intel/Makefile                |  2 ++
>>>>  drivers/platform/x86/intel/menlow/Kconfig          | 14
>>>> ++++++++++++++
>>>>  drivers/platform/x86/intel/menlow/Makefile         |  6 ++++++
>>>>  .../platform/x86/{ => intel/menlow}/intel_menlow.c |  0
>>>>  7 files changed, 24 insertions(+), 9 deletions(-)
>>>>  create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
>>>>  create mode 100644 drivers/platform/x86/intel/menlow/Makefile
>>>>  rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c
>>>> (100%)
>>>>
>>>> diff --git a/drivers/platform/x86/Kconfig
>>>> b/drivers/platform/x86/Kconfig
>>>> index b9c0d2d97793..50ded236a841 100644
>>>> --- a/drivers/platform/x86/Kconfig
>>>> +++ b/drivers/platform/x86/Kconfig
>>>> @@ -632,15 +632,7 @@ config THINKPAD_LMI
>>>>  
>>>>  source "drivers/platform/x86/intel/Kconfig"
>>>>  
>>>> -config INTEL_MENLOW
>>>> -       tristate "Thermal Management driver for Intel menlow
>>>> platform"
>>>> -       depends on ACPI_THERMAL
>>>> -       select THERMAL
>>>> -       help
>>>> -         ACPI thermal management enhancement driver on
>>>> -         Intel Menlow platform.
>>>>  
>>>> -         If unsure, say N.
>>>>  
>>>>  config INTEL_OAKTRAIL
>>>>         tristate "Intel Oaktrail Platform Extras"
>>>> diff --git a/drivers/platform/x86/Makefile
>>>> b/drivers/platform/x86/Makefile
>>>> index f4c6ced59da1..ea5f5dd3f78a 100644
>>>> --- a/drivers/platform/x86/Makefile
>>>> +++ b/drivers/platform/x86/Makefile
>>>> @@ -67,7 +67,7 @@ obj-$(CONFIG_THINKPAD_LMI)    += think-lmi.o
>>>>  obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)               += intel/
>>>>  
>>>>  
>>>> -obj-$(CONFIG_INTEL_MENLOW)             += intel_menlow.o
>>>> +
>>>>  obj-$(CONFIG_INTEL_OAKTRAIL)           += intel_oaktrail.o
>>>>  obj-$(CONFIG_INTEL_VBTN)               += intel-vbtn.o
>>>>  
>>>> diff --git a/drivers/platform/x86/intel/Kconfig
>>>> b/drivers/platform/x86/intel/Kconfig
>>>> index 4efb5ad3e3e1..59c9b602c784 100644
>>>> --- a/drivers/platform/x86/intel/Kconfig
>>>> +++ b/drivers/platform/x86/intel/Kconfig
>>>> @@ -36,6 +36,7 @@ source
>>>> "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
>>>>  source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
>>>>  source "drivers/platform/x86/intel/uncore_freq/Kconfig"
>>>>  source "drivers/platform/x86/intel/int0002/Kconfig"
>>>> +source "drivers/platform/x86/intel/menlow/Kconfig"
>>>>  
>>>>  
>>>>  endif # X86_PLATFORM_DRIVERS_INTEL
>>>> diff --git a/drivers/platform/x86/intel/Makefile
>>>> b/drivers/platform/x86/intel/Makefile
>>>> index fe5058c3af18..b2326554bd84 100644
>>>> --- a/drivers/platform/x86/intel/Makefile
>>>> +++ b/drivers/platform/x86/intel/Makefile
>>>> @@ -12,6 +12,7 @@ obj-$(CONFIG_INTEL_HID_EVENT)         += hid/
>>>>  obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)  += wmi/
>>>>  obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)    += wmi/
>>>>  obj-$(CONFIG_INTEL_INT0002_VGPIO)      += int0002/
>>>> +obj-$(CONFIG_INTEL_MENLOW)             += menlow/
>>>>  
>>>>  
>>>>  # Intel PMIC / PMC / P-Unit devices
>>>> @@ -38,3 +39,4 @@ obj-
>>>> $(CONFIG_INTEL_SPEED_SELECT_INTERFACE)    +=
>>>> intel_speed_select_if/
>>>>  obj-$(CONFIG_INTEL_TURBO_MAX_3)                        +=
>>>> turbo_max_3/
>>>>  obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)                +=
>>>> uncore_freq/
>>>>  
>>>> +
>>>> diff --git a/drivers/platform/x86/intel/menlow/Kconfig
>>>> b/drivers/platform/x86/intel/menlow/Kconfig
>>>> new file mode 100644
>>>> index 000000000000..b2920d259ff7
>>>> --- /dev/null
>>>> +++ b/drivers/platform/x86/intel/menlow/Kconfig
>>>> @@ -0,0 +1,14 @@
>>>> +# SPDX-License-Identifier: GPL-2.0-only
>>>> +#
>>>> +# Intel x86 Platform Specific Drivers
>>>> +#
>>>> +
>>>> +config INTEL_MENLOW
>>>> +       tristate "Thermal Management driver for Intel menlow
>>>> platform"
>>>> +       depends on ACPI_THERMAL
>>>> +       select THERMAL
>>>> +       help
>>>> +         ACPI thermal management enhancement driver on
>>>> +         Intel Menlow platform.
>>>> +
>>>> +         If unsure, say N.
>>>> diff --git a/drivers/platform/x86/intel/menlow/Makefile
>>>> b/drivers/platform/x86/intel/menlow/Makefile
>>>> new file mode 100644
>>>> index 000000000000..0e9fda9bff98
>>>> --- /dev/null
>>>> +++ b/drivers/platform/x86/intel/menlow/Makefile
>>>> @@ -0,0 +1,6 @@
>>>> +# SPDX-License-Identifier: GPL-2.0-only
>>>> +#
>>>> +# Intel x86 Platform Specific Drivers
>>>> +#
>>>> +
>>>> +obj-$(CONFIG_INTEL_MENLOW)             += intel_menlow.o
>>>> diff --git a/drivers/platform/x86/intel_menlow.c
>>>> b/drivers/platform/x86/intel/menlow/intel_menlow.c
>>>> similarity index 100%
>>>> rename from drivers/platform/x86/intel_menlow.c
>>>> rename to drivers/platform/x86/intel/menlow/intel_menlow.c
>>>>
>>>
>>>
>>
> 

Re: [PATCH 18/20] Move Intel thermal driver for menlow platform driver to intel/ directory to improve readability.

[Kate Hsuan]

On Mon, Aug 16, 2021 at 3:40 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Hi,
>
> On 8/16/21 5:11 AM, Pandruvada, Srinivas wrote:
> > On Sun, 2021-08-15 at 16:08 +0200, Hans de Goede wrote:
> >> Hi,
> >>
> >> On 8/14/21 12:39 PM, Daniel Lezcano wrote:
> >>> On 10/08/2021 11:58, Kate Hsuan wrote:
> >>>
> >>>
> >>> Why not move it into drivers/thermal/intel ?
> >>
> >> This cleanup is really something which Intel should have been doing
> >> itself, but they have not done that, so now Kate has stepped up to
> >> do this.
> >>
> >> Figuring out if there is a better home for each of these drivers
> >> really falls outside of the scope of this. If Intel and specifically
> >> Sujith Thomas, the maintainer for that driver who is in the Cc,
> >> believe that drivers/thermal/intel is a better place then they
> >> can submit a patch for this themselves.
> >>
> >> If Intel does that right away, then this patch can be dropped from
> >> Kate's patch-set. Otherwise this can be moved a second time once
> >> someone from Intel gets around to it.
> > We can move to thermal/intel. I will submit a change to do that.
>
> Great, I see that you've already send a patch for this, thank you.
>
> Kate, please drop this patch from your series.
>
> Regards,
>
> Hans
>

Got it. I have dropped it.

--
BR,
Kate

>
>
> >>>> Signed-off-by: Kate Hsuan <hpa@redhat.com>
> >>>> ---
> >>>>  drivers/platform/x86/Kconfig                       |  8 --------
> >>>>  drivers/platform/x86/Makefile                      |  2 +-
> >>>>  drivers/platform/x86/intel/Kconfig                 |  1 +
> >>>>  drivers/platform/x86/intel/Makefile                |  2 ++
> >>>>  drivers/platform/x86/intel/menlow/Kconfig          | 14
> >>>> ++++++++++++++
> >>>>  drivers/platform/x86/intel/menlow/Makefile         |  6 ++++++
> >>>>  .../platform/x86/{ => intel/menlow}/intel_menlow.c |  0
> >>>>  7 files changed, 24 insertions(+), 9 deletions(-)
> >>>>  create mode 100644 drivers/platform/x86/intel/menlow/Kconfig
> >>>>  create mode 100644 drivers/platform/x86/intel/menlow/Makefile
> >>>>  rename drivers/platform/x86/{ => intel/menlow}/intel_menlow.c
> >>>> (100%)
> >>>>
> >>>> diff --git a/drivers/platform/x86/Kconfig
> >>>> b/drivers/platform/x86/Kconfig
> >>>> index b9c0d2d97793..50ded236a841 100644
> >>>> --- a/drivers/platform/x86/Kconfig
> >>>> +++ b/drivers/platform/x86/Kconfig
> >>>> @@ -632,15 +632,7 @@ config THINKPAD_LMI
> >>>>
> >>>>  source "drivers/platform/x86/intel/Kconfig"
> >>>>
> >>>> -config INTEL_MENLOW
> >>>> -       tristate "Thermal Management driver for Intel menlow
> >>>> platform"
> >>>> -       depends on ACPI_THERMAL
> >>>> -       select THERMAL
> >>>> -       help
> >>>> -         ACPI thermal management enhancement driver on
> >>>> -         Intel Menlow platform.
> >>>>
> >>>> -         If unsure, say N.
> >>>>
> >>>>  config INTEL_OAKTRAIL
> >>>>         tristate "Intel Oaktrail Platform Extras"
> >>>> diff --git a/drivers/platform/x86/Makefile
> >>>> b/drivers/platform/x86/Makefile
> >>>> index f4c6ced59da1..ea5f5dd3f78a 100644
> >>>> --- a/drivers/platform/x86/Makefile
> >>>> +++ b/drivers/platform/x86/Makefile
> >>>> @@ -67,7 +67,7 @@ obj-$(CONFIG_THINKPAD_LMI)    += think-lmi.o
> >>>>  obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)               += intel/
> >>>>
> >>>>
> >>>> -obj-$(CONFIG_INTEL_MENLOW)             += intel_menlow.o
> >>>> +
> >>>>  obj-$(CONFIG_INTEL_OAKTRAIL)           += intel_oaktrail.o
> >>>>  obj-$(CONFIG_INTEL_VBTN)               += intel-vbtn.o
> >>>>
> >>>> diff --git a/drivers/platform/x86/intel/Kconfig
> >>>> b/drivers/platform/x86/intel/Kconfig
> >>>> index 4efb5ad3e3e1..59c9b602c784 100644
> >>>> --- a/drivers/platform/x86/intel/Kconfig
> >>>> +++ b/drivers/platform/x86/intel/Kconfig
> >>>> @@ -36,6 +36,7 @@ source
> >>>> "drivers/platform/x86/intel/intel_speed_select_if/Kconfig"
> >>>>  source "drivers/platform/x86/intel/turbo_max_3/Kconfig"
> >>>>  source "drivers/platform/x86/intel/uncore_freq/Kconfig"
> >>>>  source "drivers/platform/x86/intel/int0002/Kconfig"
> >>>> +source "drivers/platform/x86/intel/menlow/Kconfig"
> >>>>
> >>>>
> >>>>  endif # X86_PLATFORM_DRIVERS_INTEL
> >>>> diff --git a/drivers/platform/x86/intel/Makefile
> >>>> b/drivers/platform/x86/intel/Makefile
> >>>> index fe5058c3af18..b2326554bd84 100644
> >>>> --- a/drivers/platform/x86/intel/Makefile
> >>>> +++ b/drivers/platform/x86/intel/Makefile
> >>>> @@ -12,6 +12,7 @@ obj-$(CONFIG_INTEL_HID_EVENT)         += hid/
> >>>>  obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)  += wmi/
> >>>>  obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)    += wmi/
> >>>>  obj-$(CONFIG_INTEL_INT0002_VGPIO)      += int0002/
> >>>> +obj-$(CONFIG_INTEL_MENLOW)             += menlow/
> >>>>
> >>>>
> >>>>  # Intel PMIC / PMC / P-Unit devices
> >>>> @@ -38,3 +39,4 @@ obj-
> >>>> $(CONFIG_INTEL_SPEED_SELECT_INTERFACE)    +=
> >>>> intel_speed_select_if/
> >>>>  obj-$(CONFIG_INTEL_TURBO_MAX_3)                        +=
> >>>> turbo_max_3/
> >>>>  obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)                +=
> >>>> uncore_freq/
> >>>>
> >>>> +
> >>>> diff --git a/drivers/platform/x86/intel/menlow/Kconfig
> >>>> b/drivers/platform/x86/intel/menlow/Kconfig
> >>>> new file mode 100644
> >>>> index 000000000000..b2920d259ff7
> >>>> --- /dev/null
> >>>> +++ b/drivers/platform/x86/intel/menlow/Kconfig
> >>>> @@ -0,0 +1,14 @@
> >>>> +# SPDX-License-Identifier: GPL-2.0-only
> >>>> +#
> >>>> +# Intel x86 Platform Specific Drivers
> >>>> +#
> >>>> +
> >>>> +config INTEL_MENLOW
> >>>> +       tristate "Thermal Management driver for Intel menlow
> >>>> platform"
> >>>> +       depends on ACPI_THERMAL
> >>>> +       select THERMAL
> >>>> +       help
> >>>> +         ACPI thermal management enhancement driver on
> >>>> +         Intel Menlow platform.
> >>>> +
> >>>> +         If unsure, say N.
> >>>> diff --git a/drivers/platform/x86/intel/menlow/Makefile
> >>>> b/drivers/platform/x86/intel/menlow/Makefile
> >>>> new file mode 100644
> >>>> index 000000000000..0e9fda9bff98
> >>>> --- /dev/null
> >>>> +++ b/drivers/platform/x86/intel/menlow/Makefile
> >>>> @@ -0,0 +1,6 @@
> >>>> +# SPDX-License-Identifier: GPL-2.0-only
> >>>> +#
> >>>> +# Intel x86 Platform Specific Drivers
> >>>> +#
> >>>> +
> >>>> +obj-$(CONFIG_INTEL_MENLOW)             += intel_menlow.o
> >>>> diff --git a/drivers/platform/x86/intel_menlow.c
> >>>> b/drivers/platform/x86/intel/menlow/intel_menlow.c
> >>>> similarity index 100%
> >>>> rename from drivers/platform/x86/intel_menlow.c
> >>>> rename to drivers/platform/x86/intel/menlow/intel_menlow.c
> >>>>
> >>>
> >>>
> >>
> >
>