linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v5 00/20] platform/x86: Intel platform driver code movement
@ 2021-08-20 11:04 Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 01/20] platform/x86: intel_scu_ipc: Fix doc of intel_scu_ipc_dev_command_with_size() Andy Shevchenko
                   ` (20 more replies)
  0 siblings, 21 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

This is v5 of the Intel drivers move on in the source tree.
v4: https://lore.kernel.org/platform-driver-x86/20210819163735.81803-1-andriy.shevchenko@linux.intel.com/
v3 has been done by Kate:
https://lore.kernel.org/platform-driver-x86/20210819033001.20136-1-hpa@redhat.com/

I have taken the initial set from review-hans branch and removed Hans' SoB
along with Link, while leaving others' tags.

Changelog v5:
- dropped SCU and IPS patches since there are somehow problematic
- added Intel Atom PMC driver move
- moved SCU kernel doc fix to be first in the series

Changelog v4:
- spelled fully the driver names in the commit messages
- fixed SCU *.ko module names
- dropped extra prefix in PMC files
- dropped stray changes within the series
- removed confusing comments in Makefile and Kconfig files
- embedded a few of Kconfig improvements here and there (ordering, spelling)
- split miscellaneous group
- added a patch to fix kernel doc issue in SCU IPC code

Andy Shevchenko (2):
  platform/x86: intel_scu_ipc: Fix doc of
    intel_scu_ipc_dev_command_with_size()
  platform/x86: pmc_atom: Move to intel sub-directory

Kate Hsuan (18):
  platform/x86: intel_bxtwc_tmu: Move to intel sub-directory
  platform/x86: intel_chtdc_ti_pwrbtn: Move to intel sub-directory
  platform/x86: intel_mrfld_pwrbtn: Move to intel sub-directory
  platform/x86: intel_punit_ipc: Move to intel sub-directory
  platform/x86: intel_pmc_core: Move to intel sub-directory
  platform/x86: intel_telemetry: Move to intel sub-directory
  platform/x86: intel-rst: Move to intel sub-directory
  platform/x86: intel-smartconnect: Move to intel sub-directory
  platform/x86: intel_turbo_max_3: Move to intel sub-directory
  platform/x86: intel-uncore-frequency: Move to intel sub-directory
  platform/x86: intel_speed_select_if: Move to intel sub-directory
  platform/x86: intel_atomisp2: Move to intel sub-directory
  platform/x86: intel-hid: Move to intel sub-directory
  platform/x86: intel_int0002_vgpio: Move to intel sub-directory
  platform/x86: intel_oaktrail: Move to intel sub-directory
  platform/x86: intel-vbtn: Move to intel sub-directory
  platform/x86: intel-wmi-sbl-fw-update: Move to intel sub-directory
  platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory

 MAINTAINERS                                   |  22 +-
 drivers/platform/x86/Kconfig                  | 236 ------------------
 drivers/platform/x86/Makefile                 |  23 --
 drivers/platform/x86/intel/Kconfig            | 152 +++++++++++
 drivers/platform/x86/intel/Makefile           |  38 +++
 drivers/platform/x86/intel/atomisp2/Kconfig   |  43 ++++
 drivers/platform/x86/intel/atomisp2/Makefile  |   9 +
 .../atomisp2/led.c}                           |   0
 .../atomisp2/pm.c}                            |   0
 .../{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c}  |   0
 .../chtdc_ti_pwrbtn.c}                        |   0
 .../platform/x86/{intel-hid.c => intel/hid.c} |   2 +-
 .../int0002_vgpio.c}                          |   0
 .../mrfld_pwrbtn.c}                           |   0
 .../{intel_oaktrail.c => intel/oaktrail.c}    |   0
 drivers/platform/x86/intel/pmc/Kconfig        |  25 ++
 drivers/platform/x86/intel/pmc/Makefile       |   9 +
 .../{intel_pmc_core.c => intel/pmc/core.c}    |   2 +-
 .../{intel_pmc_core.h => intel/pmc/core.h}    |   0
 .../pmc/pltdrv.c}                             |   0
 drivers/platform/x86/{ => intel}/pmc_atom.c   |   0
 .../{intel_punit_ipc.c => intel/punit_ipc.c}  |   0
 .../platform/x86/{intel-rst.c => intel/rst.c} |   0
 .../smartconnect.c}                           |   0
 .../speed_select_if}/Kconfig                  |   0
 .../speed_select_if}/Makefile                 |   0
 .../speed_select_if}/isst_if_common.c         |   0
 .../speed_select_if}/isst_if_common.h         |   0
 .../speed_select_if}/isst_if_mbox_msr.c       |   0
 .../speed_select_if}/isst_if_mbox_pci.c       |   0
 .../speed_select_if}/isst_if_mmio.c           |   0
 drivers/platform/x86/intel/telemetry/Kconfig  |  16 ++
 drivers/platform/x86/intel/telemetry/Makefile |  11 +
 .../telemetry/core.c}                         |   0
 .../telemetry/debugfs.c}                      |   0
 .../telemetry/pltdrv.c}                       |   0
 .../turbo_max_3.c}                            |   0
 .../uncore-frequency.c}                       |   0
 .../x86/{intel-vbtn.c => intel/vbtn.c}        |   2 +-
 drivers/platform/x86/intel/wmi/Kconfig        |  31 +++
 drivers/platform/x86/intel/wmi/Makefile       |   9 +
 .../wmi/sbl-fw-update.c}                      |   0
 .../wmi/thunderbolt.c}                        |   0
 drivers/platform/x86/intel_scu_ipc.c          |   2 +-
 44 files changed, 358 insertions(+), 274 deletions(-)
 create mode 100644 drivers/platform/x86/intel/atomisp2/Kconfig
 create mode 100644 drivers/platform/x86/intel/atomisp2/Makefile
 rename drivers/platform/x86/{intel_atomisp2_led.c => intel/atomisp2/led.c} (100%)
 rename drivers/platform/x86/{intel_atomisp2_pm.c => intel/atomisp2/pm.c} (100%)
 rename drivers/platform/x86/{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c} (100%)
 rename drivers/platform/x86/{intel_chtdc_ti_pwrbtn.c => intel/chtdc_ti_pwrbtn.c} (100%)
 rename drivers/platform/x86/{intel-hid.c => intel/hid.c} (99%)
 rename drivers/platform/x86/{intel_int0002_vgpio.c => intel/int0002_vgpio.c} (100%)
 rename drivers/platform/x86/{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c} (100%)
 rename drivers/platform/x86/{intel_oaktrail.c => intel/oaktrail.c} (100%)
 create mode 100644 drivers/platform/x86/intel/pmc/Kconfig
 create mode 100644 drivers/platform/x86/intel/pmc/Makefile
 rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/core.c} (99%)
 rename drivers/platform/x86/{intel_pmc_core.h => intel/pmc/core.h} (100%)
 rename drivers/platform/x86/{intel_pmc_core_pltdrv.c => intel/pmc/pltdrv.c} (100%)
 rename drivers/platform/x86/{ => intel}/pmc_atom.c (100%)
 rename drivers/platform/x86/{intel_punit_ipc.c => intel/punit_ipc.c} (100%)
 rename drivers/platform/x86/{intel-rst.c => intel/rst.c} (100%)
 rename drivers/platform/x86/{intel-smartconnect.c => intel/smartconnect.c} (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Kconfig (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Makefile (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.c (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.h (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_msr.c (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_pci.c (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mmio.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_core.c => intel/telemetry/core.c} (100%)
 rename drivers/platform/x86/{intel_telemetry_debugfs.c => intel/telemetry/debugfs.c} (100%)
 rename drivers/platform/x86/{intel_telemetry_pltdrv.c => intel/telemetry/pltdrv.c} (100%)
 rename drivers/platform/x86/{intel_turbo_max_3.c => intel/turbo_max_3.c} (100%)
 rename drivers/platform/x86/{intel-uncore-frequency.c => intel/uncore-frequency.c} (100%)
 rename drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} (99%)
 create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
 create mode 100644 drivers/platform/x86/intel/wmi/Makefile
 rename drivers/platform/x86/{intel-wmi-sbl-fw-update.c => intel/wmi/sbl-fw-update.c} (100%)
 rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%)

-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 01/20] platform/x86: intel_scu_ipc: Fix doc of intel_scu_ipc_dev_command_with_size()
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 02/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Andy Shevchenko
                   ` (19 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma,
	kernel test robot

The kernel doc validator complains:

.../ipc.c:478: warning: expecting prototype for intel_scu_ipc_command_with_size(). Prototype was for intel_scu_ipc_dev_command_with_size() instead

Fix the prototype name in the kernel documentation.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/intel_scu_ipc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 9171a46a9e3f..bfa0cc20750d 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -457,7 +457,7 @@ int intel_scu_ipc_dev_simple_command(struct intel_scu_ipc_dev *scu, int cmd,
 EXPORT_SYMBOL(intel_scu_ipc_dev_simple_command);
 
 /**
- * intel_scu_ipc_command_with_size() - Command with data
+ * intel_scu_ipc_dev_command_with_size() - Command with data
  * @scu: Optional SCU IPC instance
  * @cmd: Command
  * @sub: Sub type
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 02/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 01/20] platform/x86: intel_scu_ipc: Fix doc of intel_scu_ipc_dev_command_with_size() Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 03/20] platform/x86: intel_chtdc_ti_pwrbtn: " Andy Shevchenko
                   ` (18 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel Broxton Whiskey Cove TMU driver to intel sub-directory
to improve readability.

While at it, spell BXT fully in the Kconfig and switch to select REGMAP.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                           | 10 ----------
 drivers/platform/x86/Makefile                          |  1 -
 drivers/platform/x86/intel/Kconfig                     | 10 ++++++++++
 drivers/platform/x86/intel/Makefile                    |  4 ++++
 .../x86/{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c}       |  0
 5 files changed, 14 insertions(+), 11 deletions(-)
 rename drivers/platform/x86/{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 9868e26b37ed..084167d70f1b 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1159,16 +1159,6 @@ config INTEL_UNCORE_FREQ_CONTROL
 	  To compile this driver as a module, choose M here: the module
 	  will be called intel-uncore-frequency.
 
-config INTEL_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"
 	depends on INTEL_SOC_PMIC_CHTDC_TI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 03a1fc20bba5..bcdd75a48a80 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -127,7 +127,6 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
 # Intel PMIC / PMC / P-Unit devices
-obj-$(CONFIG_INTEL_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 4dd1fd4450ad..46db129bee7f 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -21,4 +21,14 @@ source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
 
+config INTEL_BXTWC_PMIC_TMU
+	tristate "Intel Broxton Whiskey Cove TMU Driver"
+	depends on INTEL_SOC_PMIC_BXTWC
+	depends on MFD_INTEL_PMC_BXT
+	select REGMAP
+	help
+	  Select this driver to use Intel Broxton Whiskey Cove PMIC TMU feature.
+	  This driver enables the alarm wakeup functionality in the TMU unit of
+	  Whiskey Cove PMIC.
+
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index dc6baf420808..dbdf4877ad10 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -8,3 +8,7 @@ obj-$(CONFIG_INTEL_SAR_INT1092)		+= int1092/
 obj-$(CONFIG_INTEL_CHT_INT33FE)		+= int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
 obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
+
+# Intel PMIC / PMC / P-Unit drivers
+intel_bxtwc_tmu-y			:= bxtwc_tmu.o
+obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= intel_bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel_bxtwc_tmu.c b/drivers/platform/x86/intel/bxtwc_tmu.c
similarity index 100%
rename from drivers/platform/x86/intel_bxtwc_tmu.c
rename to drivers/platform/x86/intel/bxtwc_tmu.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 03/20] platform/x86: intel_chtdc_ti_pwrbtn: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 01/20] platform/x86: intel_scu_ipc: Fix doc of intel_scu_ipc_dev_command_with_size() Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 02/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 04/20] platform/x86: intel_mrfld_pwrbtn: " Andy Shevchenko
                   ` (17 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel Cherry Trail Dollar Cove TI power button driver
to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                          | 11 -----------
 drivers/platform/x86/Makefile                         |  1 -
 drivers/platform/x86/intel/Kconfig                    | 11 +++++++++++
 drivers/platform/x86/intel/Makefile                   |  2 ++
 .../chtdc_ti_pwrbtn.c}                                |  0
 5 files changed, 13 insertions(+), 12 deletions(-)
 rename drivers/platform/x86/{intel_chtdc_ti_pwrbtn.c => intel/chtdc_ti_pwrbtn.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 084167d70f1b..ba0454450335 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1159,17 +1159,6 @@ config INTEL_UNCORE_FREQ_CONTROL
 	  To compile this driver as a module, choose M here: the module
 	  will be called intel-uncore-frequency.
 
-config INTEL_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 bcdd75a48a80..bf94af0749f5 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -127,7 +127,6 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
 # Intel PMIC / PMC / P-Unit devices
-obj-$(CONFIG_INTEL_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_PUNIT_IPC)		+= intel_punit_ipc.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 46db129bee7f..3792a5492a8a 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -31,4 +31,15 @@ config INTEL_BXTWC_PMIC_TMU
 	  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"
+	depends on INTEL_SOC_PMIC_CHTDC_TI
+	depends on INPUT
+	help
+	  This option adds a power button 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.
+
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index dbdf4877ad10..52d7bc0948f3 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -12,3 +12,5 @@ obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 # Intel PMIC / PMC / P-Unit drivers
 intel_bxtwc_tmu-y			:= bxtwc_tmu.o
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= intel_bxtwc_tmu.o
+intel_chtdc_ti_pwrbtn-y			:= chtdc_ti_pwrbtn.o
+obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)	+= intel_chtdc_ti_pwrbtn.o
diff --git a/drivers/platform/x86/intel_chtdc_ti_pwrbtn.c b/drivers/platform/x86/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_pwrbtn.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 04/20] platform/x86: intel_mrfld_pwrbtn: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (2 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 03/20] platform/x86: intel_chtdc_ti_pwrbtn: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 05/20] platform/x86: intel_punit_ipc: " Andy Shevchenko
                   ` (16 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel Merrifield power button driver to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                          | 11 -----------
 drivers/platform/x86/Makefile                         |  1 -
 drivers/platform/x86/intel/Kconfig                    | 11 +++++++++++
 drivers/platform/x86/intel/Makefile                   |  2 ++
 .../{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c}    |  0
 5 files changed, 13 insertions(+), 12 deletions(-)
 rename drivers/platform/x86/{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ba0454450335..2d6723bb6459 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1159,17 +1159,6 @@ config INTEL_UNCORE_FREQ_CONTROL
 	  To compile this driver as a module, choose M here: the module
 	  will be called intel-uncore-frequency.
 
-config INTEL_MRFLD_PWRBTN
-	tristate "Intel Merrifield Basin Cove power button driver"
-	depends on INTEL_SOC_PMIC_MRFLD
-	depends on INPUT
-	help
-	  This option adds a power button driver for Basin Cove PMIC
-	  on Intel Merrifield devices.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_mrfld_pwrbtn.
-
 config INTEL_PMC_CORE
 	tristate "Intel PMC Core driver"
 	depends on PCI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index bf94af0749f5..f70c0aa30cdd 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -127,7 +127,6 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
 # Intel PMIC / PMC / P-Unit devices
-obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o
 obj-$(CONFIG_INTEL_PMC_CORE)		+= intel_pmc_core.o intel_pmc_core_pltdrv.o
 obj-$(CONFIG_INTEL_PUNIT_IPC)		+= intel_punit_ipc.o
 obj-$(CONFIG_INTEL_SCU_IPC)		+= intel_scu_ipc.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 3792a5492a8a..9e719db8450c 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -42,4 +42,15 @@ config INTEL_CHTDC_TI_PWRBTN
 	  To compile this driver as a module, choose M here: the module
 	  will be called intel_chtdc_ti_pwrbtn.
 
+config INTEL_MRFLD_PWRBTN
+	tristate "Intel Merrifield Basin Cove power button driver"
+	depends on INTEL_SOC_PMIC_MRFLD
+	depends on INPUT
+	help
+	  This option adds a power button driver for Basin Cove PMIC
+	  on Intel Merrifield devices.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_mrfld_pwrbtn.
+
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 52d7bc0948f3..4ff755a11770 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -14,3 +14,5 @@ intel_bxtwc_tmu-y			:= bxtwc_tmu.o
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= intel_bxtwc_tmu.o
 intel_chtdc_ti_pwrbtn-y			:= chtdc_ti_pwrbtn.o
 obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)	+= intel_chtdc_ti_pwrbtn.o
+intel_mrfld_pwrbtn-y			:= mrfld_pwrbtn.o
+obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o
diff --git a/drivers/platform/x86/intel_mrfld_pwrbtn.c b/drivers/platform/x86/intel/mrfld_pwrbtn.c
similarity index 100%
rename from drivers/platform/x86/intel_mrfld_pwrbtn.c
rename to drivers/platform/x86/intel/mrfld_pwrbtn.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 05/20] platform/x86: intel_punit_ipc: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (3 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 04/20] platform/x86: intel_mrfld_pwrbtn: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 06/20] platform/x86: intel_pmc_core: " Andy Shevchenko
                   ` (15 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel P-Unit IPC driver to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                                 | 2 +-
 drivers/platform/x86/Kconfig                                | 6 ------
 drivers/platform/x86/Makefile                               | 1 -
 drivers/platform/x86/intel/Kconfig                          | 6 ++++++
 drivers/platform/x86/intel/Makefile                         | 2 ++
 .../platform/x86/{intel_punit_ipc.c => intel/punit_ipc.c}   | 0
 6 files changed, 9 insertions(+), 8 deletions(-)
 rename drivers/platform/x86/{intel_punit_ipc.c => intel/punit_ipc.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index b731988a4452..21813a0e00eb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9475,7 +9475,7 @@ M:	Zha Qipeng <qipeng.zha@intel.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
 F:	arch/x86/include/asm/intel_punit_ipc.h
-F:	drivers/platform/x86/intel_punit_ipc.c
+F:	drivers/platform/x86/intel/punit_ipc.c
 
 INTEL PMC CORE DRIVER
 M:	Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 2d6723bb6459..9cadce7908ea 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1180,12 +1180,6 @@ config INTEL_PMC_CORE
 		- Low Power Mode registers (Tigerlake and beyond)
 		- PMC quirks as needed to enable SLPS0/S0ix
 
-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 f70c0aa30cdd..776370ce8fbb 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -128,7 +128,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_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 9e719db8450c..c4ceb5ee83f3 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -53,4 +53,10 @@ config INTEL_MRFLD_PWRBTN
 	  To compile this driver as a module, choose M here: the module
 	  will be called intel_mrfld_pwrbtn.
 
+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.
+
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 4ff755a11770..58fc8e7a3b62 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -16,3 +16,5 @@ intel_chtdc_ti_pwrbtn-y			:= chtdc_ti_pwrbtn.o
 obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)	+= intel_chtdc_ti_pwrbtn.o
 intel_mrfld_pwrbtn-y			:= mrfld_pwrbtn.o
 obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o
+intel_punit_ipc-y			:= punit_ipc.o
+obj-$(CONFIG_INTEL_PUNIT_IPC)		+= intel_punit_ipc.o
diff --git a/drivers/platform/x86/intel_punit_ipc.c b/drivers/platform/x86/intel/punit_ipc.c
similarity index 100%
rename from drivers/platform/x86/intel_punit_ipc.c
rename to drivers/platform/x86/intel/punit_ipc.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 06/20] platform/x86: intel_pmc_core: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (4 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 05/20] platform/x86: intel_punit_ipc: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 07/20] platform/x86: pmc_atom: " Andy Shevchenko
                   ` (14 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel PMC core driver to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                   |  2 +-
 drivers/platform/x86/Kconfig                  | 21 ----------------
 drivers/platform/x86/Makefile                 |  1 -
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  1 +
 drivers/platform/x86/intel/pmc/Kconfig        | 25 +++++++++++++++++++
 drivers/platform/x86/intel/pmc/Makefile       |  9 +++++++
 .../{intel_pmc_core.c => intel/pmc/core.c}    |  2 +-
 .../{intel_pmc_core.h => intel/pmc/core.h}    |  0
 .../pmc/pltdrv.c}                             |  0
 10 files changed, 38 insertions(+), 24 deletions(-)
 create mode 100644 drivers/platform/x86/intel/pmc/Kconfig
 create mode 100644 drivers/platform/x86/intel/pmc/Makefile
 rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/core.c} (99%)
 rename drivers/platform/x86/{intel_pmc_core.h => intel/pmc/core.h} (100%)
 rename drivers/platform/x86/{intel_pmc_core_pltdrv.c => intel/pmc/pltdrv.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 21813a0e00eb..eefe4edb1b3d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9483,7 +9483,7 @@ M:	David E Box <david.e.box@intel.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
 F:	Documentation/ABI/testing/sysfs-platform-intel-pmc
-F:	drivers/platform/x86/intel_pmc_core*
+F:	drivers/platform/x86/intel/pmc/
 
 INTEL PMIC GPIO DRIVERS
 M:	Andy Shevchenko <andy@kernel.org>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 9cadce7908ea..aed7570388ef 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1159,27 +1159,6 @@ config INTEL_UNCORE_FREQ_CONTROL
 	  To compile this driver as a module, choose M here: the module
 	  will be called intel-uncore-frequency.
 
-config INTEL_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_SCU_IPC
 	bool
 
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 776370ce8fbb..1668f7360833 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -127,7 +127,6 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
 # Intel PMIC / PMC / P-Unit devices
-obj-$(CONFIG_INTEL_PMC_CORE)		+= intel_pmc_core.o intel_pmc_core_pltdrv.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 c4ceb5ee83f3..7de11636904d 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -19,6 +19,7 @@ if X86_PLATFORM_DRIVERS_INTEL
 source "drivers/platform/x86/intel/int1092/Kconfig"
 source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
+source "drivers/platform/x86/intel/pmc/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
 
 config INTEL_BXTWC_PMIC_TMU
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 58fc8e7a3b62..a1555a1e421d 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -7,6 +7,7 @@
 obj-$(CONFIG_INTEL_SAR_INT1092)		+= int1092/
 obj-$(CONFIG_INTEL_CHT_INT33FE)		+= int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
+obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc/
 obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 
 # Intel PMIC / PMC / P-Unit drivers
diff --git a/drivers/platform/x86/intel/pmc/Kconfig b/drivers/platform/x86/intel/pmc/Kconfig
new file mode 100644
index 000000000000..b526597e4deb
--- /dev/null
+++ b/drivers/platform/x86/intel/pmc/Kconfig
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# 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/Makefile b/drivers/platform/x86/intel/pmc/Makefile
new file mode 100644
index 000000000000..8966fcdc0e1d
--- /dev/null
+++ b/drivers/platform/x86/intel/pmc/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Intel x86 Platform-Specific Drivers
+#
+
+intel_pmc_core-y			:= core.o
+obj-$(CONFIG_INTEL_PMC_CORE)		+= intel_pmc_core.o
+intel_pmc_core_pltdrv-y			:= pltdrv.o
+obj-$(CONFIG_INTEL_PMC_CORE)		+= intel_pmc_core_pltdrv.o
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel/pmc/core.c
similarity index 99%
rename from drivers/platform/x86/intel_pmc_core.c
rename to drivers/platform/x86/intel/pmc/core.c
index ae410a358ffe..9963bc3d470c 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -31,7 +31,7 @@
 #include <asm/msr.h>
 #include <asm/tsc.h>
 
-#include "intel_pmc_core.h"
+#include "core.h"
 
 #define ACPI_S0IX_DSM_UUID		"57a6512e-3979-4e9d-9708-ff13b2508972"
 #define ACPI_GET_LOW_MODE_REGISTERS	1
diff --git a/drivers/platform/x86/intel_pmc_core.h b/drivers/platform/x86/intel/pmc/core.h
similarity index 100%
rename from drivers/platform/x86/intel_pmc_core.h
rename to drivers/platform/x86/intel/pmc/core.h
diff --git a/drivers/platform/x86/intel_pmc_core_pltdrv.c b/drivers/platform/x86/intel/pmc/pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_pmc_core_pltdrv.c
rename to drivers/platform/x86/intel/pmc/pltdrv.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 07/20] platform/x86: pmc_atom: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (5 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 06/20] platform/x86: intel_pmc_core: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 18:18   ` Hans de Goede
  2021-08-20 11:04 ` [PATCH v5 08/20] platform/x86: intel_telemetry: " Andy Shevchenko
                   ` (13 subsequent siblings)
  20 siblings, 1 reply; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

Move Intel Atom PMC driver to intel sub-directory to improve readability.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                | 5 -----
 drivers/platform/x86/Makefile               | 1 -
 drivers/platform/x86/intel/Kconfig          | 5 +++++
 drivers/platform/x86/intel/Makefile         | 1 +
 drivers/platform/x86/{ => intel}/pmc_atom.c | 0
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename drivers/platform/x86/{ => intel}/pmc_atom.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index aed7570388ef..e6fb3eb70ee7 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1219,8 +1219,3 @@ config INTEL_TELEMETRY
 	  this interface for SoC state monitoring.
 
 endif # X86_PLATFORM_DEVICES
-
-config PMC_ATOM
-       def_bool y
-       depends on PCI
-       select COMMON_CLK
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 1668f7360833..de7f45b8e4f6 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -135,4 +135,3 @@ 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
-obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 7de11636904d..c4d74dff3a14 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -60,4 +60,9 @@ config INTEL_PUNIT_IPC
 	  This driver provides support for Intel P-Unit Mailbox IPC mechanism,
 	  which is used to bridge the communications between kernel and P-Unit.
 
+config PMC_ATOM
+       def_bool y
+       depends on PCI
+       select COMMON_CLK
+
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index a1555a1e421d..8595f8b92f40 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -19,3 +19,4 @@ intel_mrfld_pwrbtn-y			:= mrfld_pwrbtn.o
 obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o
 intel_punit_ipc-y			:= punit_ipc.o
 obj-$(CONFIG_INTEL_PUNIT_IPC)		+= intel_punit_ipc.o
+obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/intel/pmc_atom.c
similarity index 100%
rename from drivers/platform/x86/pmc_atom.c
rename to drivers/platform/x86/intel/pmc_atom.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 08/20] platform/x86: intel_telemetry: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (6 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 07/20] platform/x86: pmc_atom: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 09/20] platform/x86: intel-rst: " Andy Shevchenko
                   ` (12 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel telemetry driver to intel sub-directory to improve readability.

While at it, spell APL fully in the Kconfig.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                      |  2 +-
 drivers/platform/x86/Kconfig                     | 12 ------------
 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    | 11 +++++++++++
 .../telemetry/core.c}                            |  0
 .../telemetry/debugfs.c}                         |  0
 .../telemetry/pltdrv.c}                          |  0
 10 files changed, 30 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_core.c => intel/telemetry/core.c} (100%)
 rename drivers/platform/x86/{intel_telemetry_debugfs.c => intel/telemetry/debugfs.c} (100%)
 rename drivers/platform/x86/{intel_telemetry_pltdrv.c => intel/telemetry/pltdrv.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index eefe4edb1b3d..bb0fcf309cc8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9559,7 +9559,7 @@ M:	"David E. Box" <david.e.box@linux.intel.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
 F:	arch/x86/include/asm/intel_telemetry.h
-F:	drivers/platform/x86/intel_telemetry*
+F:	drivers/platform/x86/intel/telemetry/
 
 INTEL UNCORE FREQUENCY CONTROL
 M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index e6fb3eb70ee7..d12b40ab079d 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1206,16 +1206,4 @@ config INTEL_SCU_IPC_UTIL
 	  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
-	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
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index de7f45b8e4f6..eae2be9b01e5 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -132,6 +132,3 @@ 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 c4d74dff3a14..71f131de5a56 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -21,6 +21,7 @@ source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
 source "drivers/platform/x86/intel/pmc/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
+source "drivers/platform/x86/intel/telemetry/Kconfig"
 
 config INTEL_BXTWC_PMIC_TMU
 	tristate "Intel Broxton Whiskey Cove TMU Driver"
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 8595f8b92f40..c52f6215a310 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_INTEL_CHT_INT33FE)		+= int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
 obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc/
 obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
+obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 
 # Intel PMIC / PMC / P-Unit drivers
 intel_bxtwc_tmu-y			:= bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel/telemetry/Kconfig b/drivers/platform/x86/intel/telemetry/Kconfig
new file mode 100644
index 000000000000..da887bd03731
--- /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 Apollo Lake 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.
diff --git a/drivers/platform/x86/intel/telemetry/Makefile b/drivers/platform/x86/intel/telemetry/Makefile
new file mode 100644
index 000000000000..bfdba5b6c59a
--- /dev/null
+++ b/drivers/platform/x86/intel/telemetry/Makefile
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+intel_telemetry_core-y			:= core.o
+obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_core.o
+intel_telemetry_pltdrv-y		:= pltdrv.o
+obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_pltdrv.o
+intel_telemetry_debugfs-y		:= debugfs.o
+obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_debugfs.o
diff --git a/drivers/platform/x86/intel_telemetry_core.c b/drivers/platform/x86/intel/telemetry/core.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_core.c
rename to drivers/platform/x86/intel/telemetry/core.c
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel/telemetry/debugfs.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_debugfs.c
rename to drivers/platform/x86/intel/telemetry/debugfs.c
diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel/telemetry/pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_pltdrv.c
rename to drivers/platform/x86/intel/telemetry/pltdrv.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 09/20] platform/x86: intel-rst: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (7 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 08/20] platform/x86: intel_telemetry: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 10/20] platform/x86: intel-smartconnect: " Andy Shevchenko
                   ` (11 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel RST driver to intel sub-directory to improve readability
and rename it from intel-rst.c to rst.c.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                      | 12 ------------
 drivers/platform/x86/Makefile                     |  1 -
 drivers/platform/x86/intel/Kconfig                | 12 ++++++++++++
 drivers/platform/x86/intel/Makefile               |  4 ++++
 drivers/platform/x86/{intel-rst.c => intel/rst.c} |  0
 5 files changed, 16 insertions(+), 13 deletions(-)
 rename drivers/platform/x86/{intel-rst.c => intel/rst.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index d12b40ab079d..5d5c4046deb6 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1110,18 +1110,6 @@ config INTEL_IPS
 	  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"
 	depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index eae2be9b01e5..dd07f40a5927 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -120,7 +120,6 @@ 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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 71f131de5a56..e4faa7db6b62 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -66,4 +66,16 @@ config PMC_ATOM
        depends on PCI
        select COMMON_CLK
 
+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.
+
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index c52f6215a310..76afe3ca66b8 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -21,3 +21,7 @@ obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o
 intel_punit_ipc-y			:= punit_ipc.o
 obj-$(CONFIG_INTEL_PUNIT_IPC)		+= intel_punit_ipc.o
 obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
+
+# Intel Uncore drivers
+intel-rst-y				:= rst.o
+obj-$(CONFIG_INTEL_RST)			+= intel-rst.o
diff --git a/drivers/platform/x86/intel-rst.c b/drivers/platform/x86/intel/rst.c
similarity index 100%
rename from drivers/platform/x86/intel-rst.c
rename to drivers/platform/x86/intel/rst.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 10/20] platform/x86: intel-smartconnect: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (8 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 09/20] platform/x86: intel-rst: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 11/20] platform/x86: intel_turbo_max_3: " Andy Shevchenko
                   ` (10 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel Smart Connect driver to intel sub-directory to improve readability
and rename it from intel-smartconnect.c to smartconnect.c.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                       | 14 --------------
 drivers/platform/x86/Makefile                      |  1 -
 drivers/platform/x86/intel/Kconfig                 | 14 ++++++++++++++
 drivers/platform/x86/intel/Makefile                |  2 ++
 .../{intel-smartconnect.c => intel/smartconnect.c} |  0
 5 files changed, 16 insertions(+), 15 deletions(-)
 rename drivers/platform/x86/{intel-smartconnect.c => intel/smartconnect.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 5d5c4046deb6..709f990243b6 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1110,20 +1110,6 @@ config INTEL_IPS
 	  functionality.  If in doubt, say Y here; it will only load on
 	  supported platforms.
 
-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"
 
 config INTEL_TURBO_MAX_3
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index dd07f40a5927..c0d367455c7a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -120,7 +120,6 @@ obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 
 # Intel uncore drivers
 obj-$(CONFIG_INTEL_IPS)				+= intel_ips.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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index e4faa7db6b62..39494a8b6a05 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -78,4 +78,18 @@ config INTEL_RST
 	  firmware will copy the memory contents back to RAM and resume the OS
 	  as usual.
 
+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.
+
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 76afe3ca66b8..a62f593b90fa 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -25,3 +25,5 @@ obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
 # Intel Uncore drivers
 intel-rst-y				:= rst.o
 obj-$(CONFIG_INTEL_RST)			+= intel-rst.o
+intel-smartconnect-y			:= smartconnect.o
+obj-$(CONFIG_INTEL_SMARTCONNECT)	+= intel-smartconnect.o
diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel/smartconnect.c
similarity index 100%
rename from drivers/platform/x86/intel-smartconnect.c
rename to drivers/platform/x86/intel/smartconnect.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 11/20] platform/x86: intel_turbo_max_3: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (9 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 10/20] platform/x86: intel-smartconnect: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 12/20] platform/x86: intel-uncore-frequency: " Andy Shevchenko
                   ` (9 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel Turbo Max 3 driver to intel sub-directory to improve readability
and rename it from intel_turbo_max_3.c to turbo_max_3.c.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                          | 10 ----------
 drivers/platform/x86/Makefile                         |  1 -
 drivers/platform/x86/intel/Kconfig                    | 11 +++++++++++
 drivers/platform/x86/intel/Makefile                   |  2 ++
 .../x86/{intel_turbo_max_3.c => intel/turbo_max_3.c}  |  0
 5 files changed, 13 insertions(+), 11 deletions(-)
 rename drivers/platform/x86/{intel_turbo_max_3.c => intel/turbo_max_3.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 709f990243b6..0c645fcb09c5 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1112,16 +1112,6 @@ config INTEL_IPS
 
 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
-	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 c0d367455c7a..531cdac793d8 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -121,7 +121,6 @@ obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 # Intel uncore drivers
 obj-$(CONFIG_INTEL_IPS)				+= intel_ips.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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 39494a8b6a05..ccaaf93717bd 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -92,4 +92,15 @@ config INTEL_SMARTCONNECT
 	  This driver checks to determine whether the device has Intel Smart
 	  Connect enabled, and if so disables it.
 
+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.
+
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index a62f593b90fa..ffeeecd513d8 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -27,3 +27,5 @@ intel-rst-y				:= rst.o
 obj-$(CONFIG_INTEL_RST)			+= intel-rst.o
 intel-smartconnect-y			:= smartconnect.o
 obj-$(CONFIG_INTEL_SMARTCONNECT)	+= intel-smartconnect.o
+intel_turbo_max_3-y			:= turbo_max_3.o
+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.c
similarity index 100%
rename from drivers/platform/x86/intel_turbo_max_3.c
rename to drivers/platform/x86/intel/turbo_max_3.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 12/20] platform/x86: intel-uncore-frequency: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (10 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 11/20] platform/x86: intel_turbo_max_3: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 13/20] platform/x86: intel_speed_select_if: " Andy Shevchenko
                   ` (8 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel Uncore frequency driver to intel sub-directory to improve
readability and rename it from intel-uncore-frequency.c to
uncore-frequency.c.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                          |  2 +-
 drivers/platform/x86/Kconfig                         | 11 -----------
 drivers/platform/x86/Makefile                        |  1 -
 drivers/platform/x86/intel/Kconfig                   | 12 ++++++++++++
 drivers/platform/x86/intel/Makefile                  |  2 ++
 .../uncore-frequency.c}                              |  0
 6 files changed, 15 insertions(+), 13 deletions(-)
 rename drivers/platform/x86/{intel-uncore-frequency.c => intel/uncore-frequency.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index bb0fcf309cc8..5fe92c8e9214 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9565,7 +9565,7 @@ INTEL UNCORE FREQUENCY CONTROL
 M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
-F:	drivers/platform/x86/intel-uncore-frequency.c
+F:	drivers/platform/x86/intel/uncore-frequency.c
 
 INTEL VIRTUAL BUTTON DRIVER
 M:	AceLan Kao <acelan.kao@canonical.com>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 0c645fcb09c5..138c44d08e93 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1112,17 +1112,6 @@ config INTEL_IPS
 
 source "drivers/platform/x86/intel_speed_select_if/Kconfig"
 
-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.
-
 config INTEL_SCU_IPC
 	bool
 
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 531cdac793d8..fe064b303732 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -121,7 +121,6 @@ obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 # Intel uncore drivers
 obj-$(CONFIG_INTEL_IPS)				+= intel_ips.o
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
-obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
 # Intel PMIC / PMC / P-Unit devices
 obj-$(CONFIG_INTEL_SCU_IPC)		+= intel_scu_ipc.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index ccaaf93717bd..9c682e8c2972 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -103,4 +103,16 @@ config INTEL_TURBO_MAX_3
 	  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
+	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_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index ffeeecd513d8..b16c17b317dc 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -29,3 +29,5 @@ intel-smartconnect-y			:= smartconnect.o
 obj-$(CONFIG_INTEL_SMARTCONNECT)	+= intel-smartconnect.o
 intel_turbo_max_3-y			:= turbo_max_3.o
 obj-$(CONFIG_INTEL_TURBO_MAX_3)		+= intel_turbo_max_3.o
+intel-uncore-frequency-y		:= uncore-frequency.o
+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-frequency.c
similarity index 100%
rename from drivers/platform/x86/intel-uncore-frequency.c
rename to drivers/platform/x86/intel/uncore-frequency.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 13/20] platform/x86: intel_speed_select_if: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (11 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 12/20] platform/x86: intel-uncore-frequency: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 14/20] platform/x86: intel_atomisp2: " Andy Shevchenko
                   ` (7 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel Speed Select interface driver to intel sub-directory to improve
readability and rename it from intel_speed_select_if to speed_select_if.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                                     | 2 +-
 drivers/platform/x86/Kconfig                                    | 2 --
 drivers/platform/x86/Makefile                                   | 1 -
 drivers/platform/x86/intel/Kconfig                              | 1 +
 drivers/platform/x86/intel/Makefile                             | 1 +
 .../{intel_speed_select_if => intel/speed_select_if}/Kconfig    | 0
 .../{intel_speed_select_if => intel/speed_select_if}/Makefile   | 0
 .../speed_select_if}/isst_if_common.c                           | 0
 .../speed_select_if}/isst_if_common.h                           | 0
 .../speed_select_if}/isst_if_mbox_msr.c                         | 0
 .../speed_select_if}/isst_if_mbox_pci.c                         | 0
 .../speed_select_if}/isst_if_mmio.c                             | 0
 12 files changed, 3 insertions(+), 4 deletions(-)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Kconfig (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Makefile (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.c (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.h (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_msr.c (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_pci.c (100%)
 rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mmio.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5fe92c8e9214..cf29f7154889 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9538,7 +9538,7 @@ INTEL SPEED SELECT TECHNOLOGY
 M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
-F:	drivers/platform/x86/intel_speed_select_if/
+F:	drivers/platform/x86/intel/speed_select_if/
 F:	include/uapi/linux/isst_if.h
 F:	tools/power/x86/intel-speed-select/
 
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 138c44d08e93..55820fc60a63 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1110,8 +1110,6 @@ config INTEL_IPS
 	  functionality.  If in doubt, say Y here; it will only load on
 	  supported platforms.
 
-source "drivers/platform/x86/intel_speed_select_if/Kconfig"
-
 config INTEL_SCU_IPC
 	bool
 
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index fe064b303732..1b1f4337a77f 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -120,7 +120,6 @@ obj-$(CONFIG_WIRELESS_HOTKEY)		+= wireless-hotkey.o
 
 # Intel uncore drivers
 obj-$(CONFIG_INTEL_IPS)				+= intel_ips.o
-obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
 
 # Intel PMIC / PMC / P-Unit devices
 obj-$(CONFIG_INTEL_SCU_IPC)		+= intel_scu_ipc.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 9c682e8c2972..0c044b31e822 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -21,6 +21,7 @@ source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
 source "drivers/platform/x86/intel/pmc/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
+source "drivers/platform/x86/intel/speed_select_if/Kconfig"
 source "drivers/platform/x86/intel/telemetry/Kconfig"
 
 config INTEL_BXTWC_PMIC_TMU
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index b16c17b317dc..9858657f3f39 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_INTEL_CHT_INT33FE)		+= int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
 obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc/
 obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
+obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
 obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 
 # Intel PMIC / PMC / P-Unit drivers
diff --git a/drivers/platform/x86/intel_speed_select_if/Kconfig b/drivers/platform/x86/intel/speed_select_if/Kconfig
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/Kconfig
rename to drivers/platform/x86/intel/speed_select_if/Kconfig
diff --git a/drivers/platform/x86/intel_speed_select_if/Makefile b/drivers/platform/x86/intel/speed_select_if/Makefile
similarity index 100%
rename from drivers/platform/x86/intel_speed_select_if/Makefile
rename to drivers/platform/x86/intel/speed_select_if/Makefile
diff --git a/drivers/platform/x86/intel_speed_select_if/isst_if_common.c b/drivers/platform/x86/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/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/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/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/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/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/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/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/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/speed_select_if/isst_if_mmio.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 14/20] platform/x86: intel_atomisp2: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (12 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 13/20] platform/x86: intel_speed_select_if: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 15/20] platform/x86: intel-hid: " Andy Shevchenko
                   ` (6 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel AtomISP v2 drivers to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                   |  4 +-
 drivers/platform/x86/Kconfig                  | 34 ---------------
 drivers/platform/x86/Makefile                 |  2 -
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  1 +
 drivers/platform/x86/intel/atomisp2/Kconfig   | 43 +++++++++++++++++++
 drivers/platform/x86/intel/atomisp2/Makefile  |  9 ++++
 .../atomisp2/led.c}                           |  0
 .../atomisp2/pm.c}                            |  0
 9 files changed, 56 insertions(+), 38 deletions(-)
 create mode 100644 drivers/platform/x86/intel/atomisp2/Kconfig
 create mode 100644 drivers/platform/x86/intel/atomisp2/Makefile
 rename drivers/platform/x86/{intel_atomisp2_led.c => intel/atomisp2/led.c} (100%)
 rename drivers/platform/x86/{intel_atomisp2_pm.c => intel/atomisp2/pm.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index cf29f7154889..429b8b5c5283 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9212,13 +9212,13 @@ INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER
 M:	Hans de Goede <hdegoede@redhat.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
-F:	drivers/platform/x86/intel_atomisp2_pm.c
+F:	drivers/platform/x86/intel/atomisp2/pm.c
 
 INTEL ATOMISP2 LED DRIVER
 M:	Hans de Goede <hdegoede@redhat.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
-F:	drivers/platform/x86/intel_atomisp2_led.c
+F:	drivers/platform/x86/intel/atomisp2/led.c
 
 INTEL BIOS SAR INT1092 DRIVER
 M:	Shravan S <s.shravan@intel.com>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 55820fc60a63..81eaa00983bd 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -668,40 +668,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_ATOMISP2_LED
-	tristate "Intel AtomISP2 camera LED driver"
-	depends on GPIOLIB && LEDS_GPIO
-	help
-	  Many Bay Trail and Cherry Trail devices come with a camera attached
-	  to Intel's Image Signal Processor. Linux currently does not have a
-	  driver for these, so they do not work as a camera. Some of these
-	  camera's have a LED which is controlled through a GPIO.
-
-	  Some of these devices have a firmware issue where the LED gets turned
-	  on at boot. This driver will turn the LED off at boot and also allows
-	  controlling the LED (repurposing it) through the sysfs LED interface.
-
-	  Which GPIO is attached to the LED is usually not described in the
-	  ACPI tables, so this driver contains per-system info about the GPIO
-	  inside the driver, this means that this driver only works on systems
-	  the driver knows about.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_atomisp2_led.
-
-config INTEL_ATOMISP2_PM
-	tristate "Intel AtomISP2 dummy / power-management driver"
-	depends on PCI && IOSF_MBI && PM
-	depends on !INTEL_ATOMISP
-	help
-	  Power-management driver for Intel's Image Signal Processor found on
-	  Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
-	  is to turn the ISP off (put it in D3) to save power and to allow
-	  entering of S0ix modes.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called intel_atomisp2_pm.
-
 config INTEL_HID_EVENT
 	tristate "INTEL HID Event"
 	depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 1b1f4337a77f..6c682114e4fe 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -71,8 +71,6 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 # Intel
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
 
-obj-$(CONFIG_INTEL_ATOMISP2_LED)	+= intel_atomisp2_led.o
-obj-$(CONFIG_INTEL_ATOMISP2_PM)		+= intel_atomisp2_pm.o
 obj-$(CONFIG_INTEL_HID_EVENT)		+= intel-hid.o
 obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.o
 obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 0c044b31e822..e8e1bad38113 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -16,6 +16,7 @@ menuconfig X86_PLATFORM_DRIVERS_INTEL
 
 if X86_PLATFORM_DRIVERS_INTEL
 
+source "drivers/platform/x86/intel/atomisp2/Kconfig"
 source "drivers/platform/x86/intel/int1092/Kconfig"
 source "drivers/platform/x86/intel/int33fe/Kconfig"
 source "drivers/platform/x86/intel/int3472/Kconfig"
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 9858657f3f39..8ce9894e5efe 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -4,6 +4,7 @@
 # Intel x86 Platform-Specific Drivers
 #
 
+obj-$(CONFIG_INTEL_ATOMISP2_PDX86)	+= atomisp2/
 obj-$(CONFIG_INTEL_SAR_INT1092)		+= int1092/
 obj-$(CONFIG_INTEL_CHT_INT33FE)		+= int33fe/
 obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
diff --git a/drivers/platform/x86/intel/atomisp2/Kconfig b/drivers/platform/x86/intel/atomisp2/Kconfig
new file mode 100644
index 000000000000..35dd2be9d2a1
--- /dev/null
+++ b/drivers/platform/x86/intel/atomisp2/Kconfig
@@ -0,0 +1,43 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_ATOMISP2_PDX86
+	bool
+
+config INTEL_ATOMISP2_LED
+	tristate "Intel AtomISP v2 camera LED driver"
+	depends on GPIOLIB && LEDS_GPIO
+	select INTEL_ATOMISP2_PDX86
+	help
+	  Many Bay Trail and Cherry Trail devices come with a camera attached
+	  to Intel's Image Signal Processor. Linux currently does not have a
+	  driver for these, so they do not work as a camera. Some of these
+	  camera's have a LED which is controlled through a GPIO.
+
+	  Some of these devices have a firmware issue where the LED gets turned
+	  on at boot. This driver will turn the LED off at boot and also allows
+	  controlling the LED (repurposing it) through the sysfs LED interface.
+
+	  Which GPIO is attached to the LED is usually not described in the
+	  ACPI tables, so this driver contains per-system info about the GPIO
+	  inside the driver, this means that this driver only works on systems
+	  the driver knows about.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_atomisp2_led.
+
+config INTEL_ATOMISP2_PM
+	tristate "Intel AtomISP v2 dummy / power-management driver"
+	depends on PCI && IOSF_MBI && PM
+	depends on !INTEL_ATOMISP
+	select INTEL_ATOMISP2_PDX86
+	help
+	  Power-management driver for Intel's Image Signal Processor found on
+	  Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
+	  is to turn the ISP off (put it in D3) to save power and to allow
+	  entering of S0ix modes.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called intel_atomisp2_pm.
diff --git a/drivers/platform/x86/intel/atomisp2/Makefile b/drivers/platform/x86/intel/atomisp2/Makefile
new file mode 100644
index 000000000000..96b1e877d1f1
--- /dev/null
+++ b/drivers/platform/x86/intel/atomisp2/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+intel_atomisp2_led-y			:= led.o
+obj-$(CONFIG_INTEL_ATOMISP2_LED)	+= intel_atomisp2_led.o
+intel_atomisp2_pm-y			+= pm.o
+obj-$(CONFIG_INTEL_ATOMISP2_PM)		+= intel_atomisp2_pm.o
diff --git a/drivers/platform/x86/intel_atomisp2_led.c b/drivers/platform/x86/intel/atomisp2/led.c
similarity index 100%
rename from drivers/platform/x86/intel_atomisp2_led.c
rename to drivers/platform/x86/intel/atomisp2/led.c
diff --git a/drivers/platform/x86/intel_atomisp2_pm.c b/drivers/platform/x86/intel/atomisp2/pm.c
similarity index 100%
rename from drivers/platform/x86/intel_atomisp2_pm.c
rename to drivers/platform/x86/intel/atomisp2/pm.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 15/20] platform/x86: intel-hid: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (13 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 14/20] platform/x86: intel_atomisp2: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 16/20] platform/x86: intel_int0002_vgpio: " Andy Shevchenko
                   ` (5 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel HID driver to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                       |  2 +-
 drivers/platform/x86/Kconfig                      | 13 -------------
 drivers/platform/x86/Makefile                     |  1 -
 drivers/platform/x86/intel/Kconfig                | 13 +++++++++++++
 drivers/platform/x86/intel/Makefile               |  4 ++++
 drivers/platform/x86/{intel-hid.c => intel/hid.c} |  2 +-
 6 files changed, 19 insertions(+), 16 deletions(-)
 rename drivers/platform/x86/{intel-hid.c => intel/hid.c} (99%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 429b8b5c5283..5339b210d6a5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9321,7 +9321,7 @@ INTEL HID EVENT DRIVER
 M:	Alex Hung <alex.hung@canonical.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
-F:	drivers/platform/x86/intel-hid.c
+F:	drivers/platform/x86/intel/hid.c
 
 INTEL I/OAT DMA DRIVER
 M:	Dave Jiang <dave.jiang@intel.com>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 81eaa00983bd..79480826f816 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -668,19 +668,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_HID_EVENT
-	tristate "INTEL HID Event"
-	depends on ACPI
-	depends on INPUT
-	depends on I2C
-	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 6c682114e4fe..4294843ead8a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -71,7 +71,6 @@ 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_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 e8e1bad38113..048dfdd02ee7 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -25,6 +25,19 @@ source "drivers/platform/x86/intel/pmt/Kconfig"
 source "drivers/platform/x86/intel/speed_select_if/Kconfig"
 source "drivers/platform/x86/intel/telemetry/Kconfig"
 
+config INTEL_HID_EVENT
+	tristate "Intel HID Event"
+	depends on ACPI
+	depends on INPUT
+	depends on I2C
+	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_BXTWC_PMIC_TMU
 	tristate "Intel Broxton Whiskey Cove TMU Driver"
 	depends on INTEL_SOC_PMIC_BXTWC
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 8ce9894e5efe..e63d03d86e20 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -13,6 +13,10 @@ obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
 obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 
+# Intel input drivers
+intel-hid-y				:= hid.o
+obj-$(CONFIG_INTEL_HID_EVENT)		+= intel-hid.o
+
 # Intel PMIC / PMC / P-Unit drivers
 intel_bxtwc_tmu-y			:= bxtwc_tmu.o
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= intel_bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel/hid.c
similarity index 99%
rename from drivers/platform/x86/intel-hid.c
rename to drivers/platform/x86/intel/hid.c
index 2e4e97a626a5..a33a5826e81a 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel/hid.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/suspend.h>
-#include "dual_accel_detect.h"
+#include "../dual_accel_detect.h"
 
 /* When NOT in tablet mode, VGBS returns with the flag 0x40 */
 #define TABLET_MODE_FLAG BIT(6)
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 16/20] platform/x86: intel_int0002_vgpio: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (14 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 15/20] platform/x86: intel-hid: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 17/20] platform/x86: intel_oaktrail: " Andy Shevchenko
                   ` (4 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel vGPIO (INT0002) driver to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                  | 19 -------------------
 drivers/platform/x86/Makefile                 |  1 -
 drivers/platform/x86/intel/Kconfig            | 19 +++++++++++++++++++
 drivers/platform/x86/intel/Makefile           |  4 ++++
 .../int0002_vgpio.c}                          |  0
 5 files changed, 23 insertions(+), 20 deletions(-)
 rename drivers/platform/x86/{intel_int0002_vgpio.c => intel/int0002_vgpio.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 79480826f816..6bdcf197b550 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -668,25 +668,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_OAKTRAIL
 	tristate "Intel Oaktrail Platform Extras"
 	depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 4294843ead8a..75bcf6fe33b9 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -71,7 +71,6 @@ obj-$(CONFIG_THINKPAD_LMI)	+= think-lmi.o
 # Intel
 obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)		+= intel/
 
-obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.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 048dfdd02ee7..53b2d5858ad0 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -38,6 +38,25 @@ config INTEL_HID_EVENT
 	  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
+	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_BXTWC_PMIC_TMU
 	tristate "Intel Broxton Whiskey Cove TMU Driver"
 	depends on INTEL_SOC_PMIC_BXTWC
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index e63d03d86e20..7fdf35ab70bf 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -17,6 +17,10 @@ obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 intel-hid-y				:= hid.o
 obj-$(CONFIG_INTEL_HID_EVENT)		+= intel-hid.o
 
+# Intel miscellaneous drivers
+intel_int0002_vgpio-y			:= int0002_vgpio.o
+obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.o
+
 # Intel PMIC / PMC / P-Unit drivers
 intel_bxtwc_tmu-y			:= bxtwc_tmu.o
 obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= intel_bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel_int0002_vgpio.c b/drivers/platform/x86/intel/int0002_vgpio.c
similarity index 100%
rename from drivers/platform/x86/intel_int0002_vgpio.c
rename to drivers/platform/x86/intel/int0002_vgpio.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 17/20] platform/x86: intel_oaktrail: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (15 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 16/20] platform/x86: intel_int0002_vgpio: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 18/20] platform/x86: intel-vbtn: " Andy Shevchenko
                   ` (3 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel Oaktrail driver to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                           | 10 ----------
 drivers/platform/x86/Makefile                          |  1 -
 drivers/platform/x86/intel/Kconfig                     | 10 ++++++++++
 drivers/platform/x86/intel/Makefile                    |  2 ++
 .../x86/{intel_oaktrail.c => intel/oaktrail.c}         |  0
 5 files changed, 12 insertions(+), 11 deletions(-)
 rename drivers/platform/x86/{intel_oaktrail.c => intel/oaktrail.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6bdcf197b550..34a57352568e 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -668,16 +668,6 @@ config THINKPAD_LMI
 
 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"
 	depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 75bcf6fe33b9..e88c24dde627 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -71,7 +71,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 53b2d5858ad0..aab516aaf2fe 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -57,6 +57,16 @@ config INTEL_INT0002_VGPIO
 	  To compile this driver as a module, choose M here: the module will
 	  be called intel_int0002_vgpio.
 
+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_BXTWC_PMIC_TMU
 	tristate "Intel Broxton Whiskey Cove TMU Driver"
 	depends on INTEL_SOC_PMIC_BXTWC
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 7fdf35ab70bf..cd254c3e8c37 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -20,6 +20,8 @@ obj-$(CONFIG_INTEL_HID_EVENT)		+= intel-hid.o
 # Intel miscellaneous drivers
 intel_int0002_vgpio-y			:= int0002_vgpio.o
 obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.o
+intel_oaktrail-y			:= oaktrail.o
+obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
 
 # Intel PMIC / PMC / P-Unit drivers
 intel_bxtwc_tmu-y			:= bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel/oaktrail.c
similarity index 100%
rename from drivers/platform/x86/intel_oaktrail.c
rename to drivers/platform/x86/intel/oaktrail.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 18/20] platform/x86: intel-vbtn: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (16 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 17/20] platform/x86: intel_oaktrail: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 19/20] platform/x86: intel-wmi-sbl-fw-update: " Andy Shevchenko
                   ` (2 subsequent siblings)
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel vButton driver to intel sub-directory to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                         |  2 +-
 drivers/platform/x86/Kconfig                        | 13 -------------
 drivers/platform/x86/Makefile                       |  2 --
 drivers/platform/x86/intel/Kconfig                  | 13 +++++++++++++
 drivers/platform/x86/intel/Makefile                 |  2 ++
 drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} (99%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5339b210d6a5..4662d4d4db5d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9571,7 +9571,7 @@ INTEL VIRTUAL BUTTON DRIVER
 M:	AceLan Kao <acelan.kao@canonical.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
-F:	drivers/platform/x86/intel-vbtn.c
+F:	drivers/platform/x86/intel/vbtn.c
 
 INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
 M:	Stanislaw Gruszka <stf_xl@wp.pl>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 34a57352568e..a98f8cafada1 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -668,19 +668,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_VBTN
-	tristate "INTEL VIRTUAL BUTTON"
-	depends on ACPI
-	depends on INPUT
-	depends on I2C
-	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 e88c24dde627..3f9a2db12353 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -71,8 +71,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 aab516aaf2fe..e81276cd2168 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -38,6 +38,19 @@ config INTEL_HID_EVENT
 	  To compile this driver as a module, choose M here: the module will
 	  be called intel_hid.
 
+config INTEL_VBTN
+	tristate "Intel Virtual Button"
+	depends on ACPI
+	depends on INPUT
+	depends on I2C
+	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 INTEL_INT0002_VGPIO
 	tristate "Intel ACPI INT0002 Virtual GPIO driver"
 	depends on GPIOLIB && ACPI && PM_SLEEP
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index cd254c3e8c37..7fb890488e6b 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -16,6 +16,8 @@ obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 # Intel input drivers
 intel-hid-y				:= hid.o
 obj-$(CONFIG_INTEL_HID_EVENT)		+= intel-hid.o
+intel-vbtn-y				:= vbtn.o
+obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
 
 # Intel miscellaneous drivers
 intel_int0002_vgpio-y			:= int0002_vgpio.o
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel/vbtn.c
similarity index 99%
rename from drivers/platform/x86/intel-vbtn.c
rename to drivers/platform/x86/intel/vbtn.c
index 309166431063..15f013af9e62 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel/vbtn.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/suspend.h>
-#include "dual_accel_detect.h"
+#include "../dual_accel_detect.h"
 
 /* Returned when NOT in tablet mode on some HP Stream x360 11 models */
 #define VGBS_TABLET_MODE_FLAG_ALT	0x10
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 19/20] platform/x86: intel-wmi-sbl-fw-update: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (17 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 18/20] platform/x86: intel-vbtn: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 11:04 ` [PATCH v5 20/20] platform/x86: intel-wmi-thunderbolt: " Andy Shevchenko
  2021-08-20 18:38 ` [PATCH v5 00/20] platform/x86: Intel platform driver code movement Hans de Goede
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel WMI Slim Bootloader FW update driver to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                    |  2 +-
 drivers/platform/x86/Kconfig                   | 10 ----------
 drivers/platform/x86/Makefile                  |  1 -
 drivers/platform/x86/intel/Kconfig             |  1 +
 drivers/platform/x86/intel/Makefile            |  1 +
 drivers/platform/x86/intel/wmi/Kconfig         | 18 ++++++++++++++++++
 drivers/platform/x86/intel/wmi/Makefile        |  7 +++++++
 .../wmi/sbl-fw-update.c}                       |  0
 8 files changed, 28 insertions(+), 12 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-sbl-fw-update.c => intel/wmi/sbl-fw-update.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4662d4d4db5d..3ca5102ed811 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9592,7 +9592,7 @@ M:	Jithu Joseph <jithu.joseph@intel.com>
 R:	Maurice Ma <maurice.ma@intel.com>
 S:	Maintained
 W:	https://slimbootloader.github.io/security/firmware-update.html
-F:	drivers/platform/x86/intel-wmi-sbl-fw-update.c
+F:	drivers/platform/x86/intel/wmi/sbl-fw-update.c
 
 INTEL WMI THUNDERBOLT FORCE POWER DRIVER
 L:	Dell.Client.Kernel@dell.com
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a98f8cafada1..7248f20c467a 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -77,16 +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
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 3f9a2db12353..a39986fa7f68 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -10,7 +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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index e81276cd2168..e633482b82df 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -24,6 +24,7 @@ source "drivers/platform/x86/intel/pmc/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
 source "drivers/platform/x86/intel/speed_select_if/Kconfig"
 source "drivers/platform/x86/intel/telemetry/Kconfig"
+source "drivers/platform/x86/intel/wmi/Kconfig"
 
 config INTEL_HID_EVENT
 	tristate "Intel HID Event"
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 7fb890488e6b..f2c902a57763 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc/
 obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
 obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
+obj-$(CONFIG_INTEL_WMI)			+= wmi/
 
 # Intel input drivers
 intel-hid-y				:= hid.o
diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
new file mode 100644
index 000000000000..c5753b1e8f43
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_WMI
+	bool
+
+config INTEL_WMI_SBL_FW_UPDATE
+	tristate "Intel WMI Slim Bootloader firmware update signaling driver"
+	depends on ACPI_WMI
+	select INTEL_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..bf1f118b6839
--- /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
+#
+
+intel-wmi-sbl-fw-update-y				:= sbl-fw-update.o
+obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= intel-wmi-sbl-fw-update.o
diff --git a/drivers/platform/x86/intel-wmi-sbl-fw-update.c b/drivers/platform/x86/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/sbl-fw-update.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* [PATCH v5 20/20] platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (18 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 19/20] platform/x86: intel-wmi-sbl-fw-update: " Andy Shevchenko
@ 2021-08-20 11:04 ` Andy Shevchenko
  2021-08-20 18:38 ` [PATCH v5 00/20] platform/x86: Intel platform driver code movement Hans de Goede
  20 siblings, 0 replies; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-20 11:04 UTC (permalink / raw)
  To: Hans de Goede, Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada,
	linux-kernel, platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

From: Kate Hsuan <hpa@redhat.com>

Move Intel WMI Thunderbolt driver to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                         |  2 +-
 drivers/platform/x86/Kconfig                        | 12 ------------
 drivers/platform/x86/Makefile                       |  1 -
 drivers/platform/x86/intel/wmi/Kconfig              | 13 +++++++++++++
 drivers/platform/x86/intel/wmi/Makefile             |  2 ++
 .../wmi/thunderbolt.c}                              |  0
 6 files changed, 16 insertions(+), 14 deletions(-)
 rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 3ca5102ed811..60ee48c71c83 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9597,7 +9597,7 @@ F:	drivers/platform/x86/intel/wmi/sbl-fw-update.c
 INTEL WMI THUNDERBOLT FORCE POWER DRIVER
 L:	Dell.Client.Kernel@dell.com
 S:	Maintained
-F:	drivers/platform/x86/intel-wmi-thunderbolt.c
+F:	drivers/platform/x86/intel/wmi/thunderbolt.c
 
 INTEL WWAN IOSM DRIVER
 M:	M Chetan Kumar <m.chetan.kumar@intel.com>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 7248f20c467a..38c133ca78a4 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -77,18 +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_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"
        depends on ACPI_WMI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index a39986fa7f68..a4277032c952 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_WMI_BMOF)		+= wmi-bmof.o
 
 # WMI drivers
 obj-$(CONFIG_HUAWEI_WMI)		+= huawei-wmi.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/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
index c5753b1e8f43..8e159f712179 100644
--- a/drivers/platform/x86/intel/wmi/Kconfig
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -16,3 +16,16 @@ config INTEL_WMI_SBL_FW_UPDATE
 
 	  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
+	select INTEL_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.
diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile
index bf1f118b6839..c2d56d25dea0 100644
--- a/drivers/platform/x86/intel/wmi/Makefile
+++ b/drivers/platform/x86/intel/wmi/Makefile
@@ -5,3 +5,5 @@
 
 intel-wmi-sbl-fw-update-y				:= sbl-fw-update.o
 obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)	+= intel-wmi-sbl-fw-update.o
+intel-wmi-thunderbolt-y					:= thunderbolt.o
+obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)	+= intel-wmi-thunderbolt.o
diff --git a/drivers/platform/x86/intel-wmi-thunderbolt.c b/drivers/platform/x86/intel/wmi/thunderbolt.c
similarity index 100%
rename from drivers/platform/x86/intel-wmi-thunderbolt.c
rename to drivers/platform/x86/intel/wmi/thunderbolt.c
-- 
2.32.0


^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v5 07/20] platform/x86: pmc_atom: Move to intel sub-directory
  2021-08-20 11:04 ` [PATCH v5 07/20] platform/x86: pmc_atom: " Andy Shevchenko
@ 2021-08-20 18:18   ` Hans de Goede
  2021-08-23  7:32     ` Andy Shevchenko
  0 siblings, 1 reply; 25+ messages in thread
From: Hans de Goede @ 2021-08-20 18:18 UTC (permalink / raw)
  To: Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada, linux-kernel,
	platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

Hi,

On 8/20/21 1:04 PM, Andy Shevchenko wrote:
> Move Intel Atom PMC driver to intel sub-directory to improve readability.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

This means that pmc_atom will now not be build if X86_PLATFORM_DRIVERS_INTEL
is not set (and PCI is enabled). Which will cause missing pmc_atom_read/_write
symbols in drivers/acpi/acpi_lpss.c. So I have dropped this patch from the
set, while applying the rest.

Note I'm thinking that we should just remove the whole X86_PLATFORM_DRIVERS_INTEL
Kconfig option and in the drivers/platform/x86/Makefile replace:

obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)                += intel/

with:

obj-y                                                   += intel/

This will also allows us to fix the scu issue without needing any
changes to drivers/mfd/Kconfig .

But this can all wait for the 2nd round of renames after 5.15-rc1.

For now I'm moving forward with this v5 series, except with this
patch dropped.

Regards,

Hans








> ---
>  drivers/platform/x86/Kconfig                | 5 -----
>  drivers/platform/x86/Makefile               | 1 -
>  drivers/platform/x86/intel/Kconfig          | 5 +++++
>  drivers/platform/x86/intel/Makefile         | 1 +
>  drivers/platform/x86/{ => intel}/pmc_atom.c | 0
>  5 files changed, 6 insertions(+), 6 deletions(-)
>  rename drivers/platform/x86/{ => intel}/pmc_atom.c (100%)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index aed7570388ef..e6fb3eb70ee7 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1219,8 +1219,3 @@ config INTEL_TELEMETRY
>  	  this interface for SoC state monitoring.
>  
>  endif # X86_PLATFORM_DEVICES
> -
> -config PMC_ATOM
> -       def_bool y
> -       depends on PCI
> -       select COMMON_CLK
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 1668f7360833..de7f45b8e4f6 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -135,4 +135,3 @@ 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
> -obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
> diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
> index 7de11636904d..c4d74dff3a14 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -60,4 +60,9 @@ config INTEL_PUNIT_IPC
>  	  This driver provides support for Intel P-Unit Mailbox IPC mechanism,
>  	  which is used to bridge the communications between kernel and P-Unit.
>  
> +config PMC_ATOM
> +       def_bool y
> +       depends on PCI
> +       select COMMON_CLK
> +
>  endif # X86_PLATFORM_DRIVERS_INTEL
> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
> index a1555a1e421d..8595f8b92f40 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -19,3 +19,4 @@ intel_mrfld_pwrbtn-y			:= mrfld_pwrbtn.o
>  obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o
>  intel_punit_ipc-y			:= punit_ipc.o
>  obj-$(CONFIG_INTEL_PUNIT_IPC)		+= intel_punit_ipc.o
> +obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
> diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/intel/pmc_atom.c
> similarity index 100%
> rename from drivers/platform/x86/pmc_atom.c
> rename to drivers/platform/x86/intel/pmc_atom.c
> 


^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v5 00/20] platform/x86: Intel platform driver code movement
  2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
                   ` (19 preceding siblings ...)
  2021-08-20 11:04 ` [PATCH v5 20/20] platform/x86: intel-wmi-thunderbolt: " Andy Shevchenko
@ 2021-08-20 18:38 ` Hans de Goede
  20 siblings, 0 replies; 25+ messages in thread
From: Hans de Goede @ 2021-08-20 18:38 UTC (permalink / raw)
  To: Andy Shevchenko, Kate Hsuan, Srinivas Pandruvada, linux-kernel,
	platform-driver-x86, Dell.Client.Kernel
  Cc: Mark Gross, Alex Hung, Rajneesh Bhardwaj, David E Box,
	Zha Qipeng, David E. Box, AceLan Kao, Jithu Joseph, Maurice Ma

Hi,

On 8/20/21 1:04 PM, Andy Shevchenko wrote:
> This is v5 of the Intel drivers move on in the source tree.
> v4: https://lore.kernel.org/platform-driver-x86/20210819163735.81803-1-andriy.shevchenko@linux.intel.com/
> v3 has been done by Kate:
> https://lore.kernel.org/platform-driver-x86/20210819033001.20136-1-hpa@redhat.com/
> 
> I have taken the initial set from review-hans branch and removed Hans' SoB
> along with Link, while leaving others' tags.
> 
> Changelog v5:
> - dropped SCU and IPS patches since there are somehow problematic
> - added Intel Atom PMC driver move
> - moved SCU kernel doc fix to be first in the series

Thank you for your patch-series, I've applied the series to my
review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

I've also re-added the pmc-core Alder Lake support patches from:
https://lore.kernel.org/platform-driver-x86/cover.1629091915.git.gayatri.kammela@intel.com/
Now that the pmc rename is in place.

Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.

Regards,

Hans




> 
> Changelog v4:
> - spelled fully the driver names in the commit messages
> - fixed SCU *.ko module names
> - dropped extra prefix in PMC files
> - dropped stray changes within the series
> - removed confusing comments in Makefile and Kconfig files
> - embedded a few of Kconfig improvements here and there (ordering, spelling)
> - split miscellaneous group
> - added a patch to fix kernel doc issue in SCU IPC code
> 
> Andy Shevchenko (2):
>   platform/x86: intel_scu_ipc: Fix doc of
>     intel_scu_ipc_dev_command_with_size()
>   platform/x86: pmc_atom: Move to intel sub-directory
> 
> Kate Hsuan (18):
>   platform/x86: intel_bxtwc_tmu: Move to intel sub-directory
>   platform/x86: intel_chtdc_ti_pwrbtn: Move to intel sub-directory
>   platform/x86: intel_mrfld_pwrbtn: Move to intel sub-directory
>   platform/x86: intel_punit_ipc: Move to intel sub-directory
>   platform/x86: intel_pmc_core: Move to intel sub-directory
>   platform/x86: intel_telemetry: Move to intel sub-directory
>   platform/x86: intel-rst: Move to intel sub-directory
>   platform/x86: intel-smartconnect: Move to intel sub-directory
>   platform/x86: intel_turbo_max_3: Move to intel sub-directory
>   platform/x86: intel-uncore-frequency: Move to intel sub-directory
>   platform/x86: intel_speed_select_if: Move to intel sub-directory
>   platform/x86: intel_atomisp2: Move to intel sub-directory
>   platform/x86: intel-hid: Move to intel sub-directory
>   platform/x86: intel_int0002_vgpio: Move to intel sub-directory
>   platform/x86: intel_oaktrail: Move to intel sub-directory
>   platform/x86: intel-vbtn: Move to intel sub-directory
>   platform/x86: intel-wmi-sbl-fw-update: Move to intel sub-directory
>   platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory
> 
>  MAINTAINERS                                   |  22 +-
>  drivers/platform/x86/Kconfig                  | 236 ------------------
>  drivers/platform/x86/Makefile                 |  23 --
>  drivers/platform/x86/intel/Kconfig            | 152 +++++++++++
>  drivers/platform/x86/intel/Makefile           |  38 +++
>  drivers/platform/x86/intel/atomisp2/Kconfig   |  43 ++++
>  drivers/platform/x86/intel/atomisp2/Makefile  |   9 +
>  .../atomisp2/led.c}                           |   0
>  .../atomisp2/pm.c}                            |   0
>  .../{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c}  |   0
>  .../chtdc_ti_pwrbtn.c}                        |   0
>  .../platform/x86/{intel-hid.c => intel/hid.c} |   2 +-
>  .../int0002_vgpio.c}                          |   0
>  .../mrfld_pwrbtn.c}                           |   0
>  .../{intel_oaktrail.c => intel/oaktrail.c}    |   0
>  drivers/platform/x86/intel/pmc/Kconfig        |  25 ++
>  drivers/platform/x86/intel/pmc/Makefile       |   9 +
>  .../{intel_pmc_core.c => intel/pmc/core.c}    |   2 +-
>  .../{intel_pmc_core.h => intel/pmc/core.h}    |   0
>  .../pmc/pltdrv.c}                             |   0
>  drivers/platform/x86/{ => intel}/pmc_atom.c   |   0
>  .../{intel_punit_ipc.c => intel/punit_ipc.c}  |   0
>  .../platform/x86/{intel-rst.c => intel/rst.c} |   0
>  .../smartconnect.c}                           |   0
>  .../speed_select_if}/Kconfig                  |   0
>  .../speed_select_if}/Makefile                 |   0
>  .../speed_select_if}/isst_if_common.c         |   0
>  .../speed_select_if}/isst_if_common.h         |   0
>  .../speed_select_if}/isst_if_mbox_msr.c       |   0
>  .../speed_select_if}/isst_if_mbox_pci.c       |   0
>  .../speed_select_if}/isst_if_mmio.c           |   0
>  drivers/platform/x86/intel/telemetry/Kconfig  |  16 ++
>  drivers/platform/x86/intel/telemetry/Makefile |  11 +
>  .../telemetry/core.c}                         |   0
>  .../telemetry/debugfs.c}                      |   0
>  .../telemetry/pltdrv.c}                       |   0
>  .../turbo_max_3.c}                            |   0
>  .../uncore-frequency.c}                       |   0
>  .../x86/{intel-vbtn.c => intel/vbtn.c}        |   2 +-
>  drivers/platform/x86/intel/wmi/Kconfig        |  31 +++
>  drivers/platform/x86/intel/wmi/Makefile       |   9 +
>  .../wmi/sbl-fw-update.c}                      |   0
>  .../wmi/thunderbolt.c}                        |   0
>  drivers/platform/x86/intel_scu_ipc.c          |   2 +-
>  44 files changed, 358 insertions(+), 274 deletions(-)
>  create mode 100644 drivers/platform/x86/intel/atomisp2/Kconfig
>  create mode 100644 drivers/platform/x86/intel/atomisp2/Makefile
>  rename drivers/platform/x86/{intel_atomisp2_led.c => intel/atomisp2/led.c} (100%)
>  rename drivers/platform/x86/{intel_atomisp2_pm.c => intel/atomisp2/pm.c} (100%)
>  rename drivers/platform/x86/{intel_bxtwc_tmu.c => intel/bxtwc_tmu.c} (100%)
>  rename drivers/platform/x86/{intel_chtdc_ti_pwrbtn.c => intel/chtdc_ti_pwrbtn.c} (100%)
>  rename drivers/platform/x86/{intel-hid.c => intel/hid.c} (99%)
>  rename drivers/platform/x86/{intel_int0002_vgpio.c => intel/int0002_vgpio.c} (100%)
>  rename drivers/platform/x86/{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c} (100%)
>  rename drivers/platform/x86/{intel_oaktrail.c => intel/oaktrail.c} (100%)
>  create mode 100644 drivers/platform/x86/intel/pmc/Kconfig
>  create mode 100644 drivers/platform/x86/intel/pmc/Makefile
>  rename drivers/platform/x86/{intel_pmc_core.c => intel/pmc/core.c} (99%)
>  rename drivers/platform/x86/{intel_pmc_core.h => intel/pmc/core.h} (100%)
>  rename drivers/platform/x86/{intel_pmc_core_pltdrv.c => intel/pmc/pltdrv.c} (100%)
>  rename drivers/platform/x86/{ => intel}/pmc_atom.c (100%)
>  rename drivers/platform/x86/{intel_punit_ipc.c => intel/punit_ipc.c} (100%)
>  rename drivers/platform/x86/{intel-rst.c => intel/rst.c} (100%)
>  rename drivers/platform/x86/{intel-smartconnect.c => intel/smartconnect.c} (100%)
>  rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Kconfig (100%)
>  rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/Makefile (100%)
>  rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.c (100%)
>  rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_common.h (100%)
>  rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_msr.c (100%)
>  rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mbox_pci.c (100%)
>  rename drivers/platform/x86/{intel_speed_select_if => intel/speed_select_if}/isst_if_mmio.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_core.c => intel/telemetry/core.c} (100%)
>  rename drivers/platform/x86/{intel_telemetry_debugfs.c => intel/telemetry/debugfs.c} (100%)
>  rename drivers/platform/x86/{intel_telemetry_pltdrv.c => intel/telemetry/pltdrv.c} (100%)
>  rename drivers/platform/x86/{intel_turbo_max_3.c => intel/turbo_max_3.c} (100%)
>  rename drivers/platform/x86/{intel-uncore-frequency.c => intel/uncore-frequency.c} (100%)
>  rename drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} (99%)
>  create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
>  create mode 100644 drivers/platform/x86/intel/wmi/Makefile
>  rename drivers/platform/x86/{intel-wmi-sbl-fw-update.c => intel/wmi/sbl-fw-update.c} (100%)
>  rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%)
> 


^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v5 07/20] platform/x86: pmc_atom: Move to intel sub-directory
  2021-08-20 18:18   ` Hans de Goede
@ 2021-08-23  7:32     ` Andy Shevchenko
  2021-08-23  7:35       ` Hans de Goede
  0 siblings, 1 reply; 25+ messages in thread
From: Andy Shevchenko @ 2021-08-23  7:32 UTC (permalink / raw)
  To: Hans de Goede
  Cc: Kate Hsuan, Srinivas Pandruvada, linux-kernel,
	platform-driver-x86, Dell.Client.Kernel, Mark Gross, Alex Hung,
	Rajneesh Bhardwaj, David E Box, Zha Qipeng, David E. Box,
	AceLan Kao, Jithu Joseph, Maurice Ma

On Fri, Aug 20, 2021 at 08:18:17PM +0200, Hans de Goede wrote:
> On 8/20/21 1:04 PM, Andy Shevchenko wrote:
> > Move Intel Atom PMC driver to intel sub-directory to improve readability.
> > 
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> This means that pmc_atom will now not be build if X86_PLATFORM_DRIVERS_INTEL
> is not set (and PCI is enabled). Which will cause missing pmc_atom_read/_write
> symbols in drivers/acpi/acpi_lpss.c. So I have dropped this patch from the
> set, while applying the rest.
> 
> Note I'm thinking that we should just remove the whole X86_PLATFORM_DRIVERS_INTEL
> Kconfig option and in the drivers/platform/x86/Makefile replace:
> 
> obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)                += intel/
> 
> with:
> 
> obj-y                                                   += intel/
> 
> This will also allows us to fix the scu issue without needing any
> changes to drivers/mfd/Kconfig .
> 
> But this can all wait for the 2nd round of renames after 5.15-rc1.
> 
> For now I'm moving forward with this v5 series, except with this
> patch dropped.

Indeed. Thanks for the analysis.

Btw, should we convert Dell subdir to something similar in terms of Kconfig?

-- 
With Best Regards,
Andy Shevchenko



^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PATCH v5 07/20] platform/x86: pmc_atom: Move to intel sub-directory
  2021-08-23  7:32     ` Andy Shevchenko
@ 2021-08-23  7:35       ` Hans de Goede
  0 siblings, 0 replies; 25+ messages in thread
From: Hans de Goede @ 2021-08-23  7:35 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: Kate Hsuan, Srinivas Pandruvada, linux-kernel,
	platform-driver-x86, Dell.Client.Kernel, Mark Gross, Alex Hung,
	Rajneesh Bhardwaj, David E Box, Zha Qipeng, David E. Box,
	AceLan Kao, Jithu Joseph, Maurice Ma

Hi,

On 8/23/21 9:32 AM, Andy Shevchenko wrote:
> On Fri, Aug 20, 2021 at 08:18:17PM +0200, Hans de Goede wrote:
>> On 8/20/21 1:04 PM, Andy Shevchenko wrote:
>>> Move Intel Atom PMC driver to intel sub-directory to improve readability.
>>>
>>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>>
>> This means that pmc_atom will now not be build if X86_PLATFORM_DRIVERS_INTEL
>> is not set (and PCI is enabled). Which will cause missing pmc_atom_read/_write
>> symbols in drivers/acpi/acpi_lpss.c. So I have dropped this patch from the
>> set, while applying the rest.
>>
>> Note I'm thinking that we should just remove the whole X86_PLATFORM_DRIVERS_INTEL
>> Kconfig option and in the drivers/platform/x86/Makefile replace:
>>
>> obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL)                += intel/
>>
>> with:
>>
>> obj-y                                                   += intel/
>>
>> This will also allows us to fix the scu issue without needing any
>> changes to drivers/mfd/Kconfig .
>>
>> But this can all wait for the 2nd round of renames after 5.15-rc1.
>>
>> For now I'm moving forward with this v5 series, except with this
>> patch dropped.
> 
> Indeed. Thanks for the analysis.
> 
> Btw, should we convert Dell subdir to something similar in terms of Kconfig?

I'm not sure, if someone is trying to build a minimal kernel then being able
to say 'N' once for all the Dell drivers make sense. OTOH even someone
building a minimal (x86) config very likely still needs some of the Intel
drivers.

So I think we should just keep the Dell bits as is.

Regards,

Hans





> 


^ permalink raw reply	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2021-08-23  7:35 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-20 11:04 [PATCH v5 00/20] platform/x86: Intel platform driver code movement Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 01/20] platform/x86: intel_scu_ipc: Fix doc of intel_scu_ipc_dev_command_with_size() Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 02/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 03/20] platform/x86: intel_chtdc_ti_pwrbtn: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 04/20] platform/x86: intel_mrfld_pwrbtn: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 05/20] platform/x86: intel_punit_ipc: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 06/20] platform/x86: intel_pmc_core: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 07/20] platform/x86: pmc_atom: " Andy Shevchenko
2021-08-20 18:18   ` Hans de Goede
2021-08-23  7:32     ` Andy Shevchenko
2021-08-23  7:35       ` Hans de Goede
2021-08-20 11:04 ` [PATCH v5 08/20] platform/x86: intel_telemetry: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 09/20] platform/x86: intel-rst: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 10/20] platform/x86: intel-smartconnect: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 11/20] platform/x86: intel_turbo_max_3: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 12/20] platform/x86: intel-uncore-frequency: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 13/20] platform/x86: intel_speed_select_if: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 14/20] platform/x86: intel_atomisp2: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 15/20] platform/x86: intel-hid: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 16/20] platform/x86: intel_int0002_vgpio: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 17/20] platform/x86: intel_oaktrail: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 18/20] platform/x86: intel-vbtn: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 19/20] platform/x86: intel-wmi-sbl-fw-update: " Andy Shevchenko
2021-08-20 11:04 ` [PATCH v5 20/20] platform/x86: intel-wmi-thunderbolt: " Andy Shevchenko
2021-08-20 18:38 ` [PATCH v5 00/20] platform/x86: Intel platform driver code movement Hans de Goede

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).