platform-driver-x86.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kate Hsuan <hpa@redhat.com>
To: Alex Hung <alex.hung@canonical.com>,
	Hans de Goede <hdegoede@redhat.com>,
	Mark Gross <mgross@linux.intel.com>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
	AceLan Kao <acelan.kao@canonical.com>,
	Jithu Joseph <jithu.joseph@intel.com>,
	Maurice Ma <maurice.ma@intel.com>,
	Sujith Thomas <sujith.thomas@intel.com>,
	Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>,
	Zha Qipeng <qipeng.zha@intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	"David E . Box" <david.e.box@linux.intel.com>,
	linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com
Cc: platform-driver-x86@vger.kernel.org, Kate Hsuan <hpa@redhat.com>
Subject: [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory
Date: Thu, 19 Aug 2021 11:30:01 +0800	[thread overview]
Message-ID: <20210819033001.20136-21-hpa@redhat.com> (raw)
In-Reply-To: <20210819033001.20136-1-hpa@redhat.com>

Move intel-wmi-thunderbolt to intel sub-directory to improve
readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                         | 12 ------------
 drivers/platform/x86/Makefile                        |  2 --
 drivers/platform/x86/intel/Makefile                  |  1 +
 drivers/platform/x86/intel/wmi/Kconfig               | 12 ++++++++++++
 drivers/platform/x86/intel/wmi/Makefile              |  2 ++
 .../wmi/thunderbolt.c}                               |  0
 6 files changed, 15 insertions(+), 14 deletions(-)
 rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 611930985b1d..adecdc0d4748 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 0a6dca068d5a..56cff979428b 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -10,8 +10,6 @@ obj-$(CONFIG_WMI_BMOF)		+= wmi-bmof.o
 
 # WMI drivers
 obj-$(CONFIG_HUAWEI_WMI)		+= huawei-wmi.o
-
-obj-$(CONFIG_INTEL_WMI_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/Makefile b/drivers/platform/x86/intel/Makefile
index 0b27be3b9334..2c1bab610499 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -50,3 +50,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= speed_select_if/
 
 #WMI drivers
 obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE)		+= wmi/
+obj-$(CONFIG_INTEL_WMI_THUNDERBOLT)		+= wmi/
diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
index fc70728e0f1f..0d65fc90f5b1 100644
--- a/drivers/platform/x86/intel/wmi/Kconfig
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -12,3 +12,15 @@ 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
+	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.31.1


  parent reply	other threads:[~2021-08-19  3:32 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-19  3:29 [PATCH v3 00/20] Intel platform driver code movement Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 01/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 02/20] platform/x86: intel_chtdc_ti_pwrbtn: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 03/20] platform/x86: intel_mrfld_pwrbtn: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 04/20] platform/x86: intel_punit_ipc: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 05/20] platform/x86: intel_pmc_core: " Kate Hsuan
2021-08-19  8:37   ` Hans de Goede
2021-08-19 12:05   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 06/20] platform/x86: intel_scu: " Kate Hsuan
2021-08-19  8:48   ` Hans de Goede
2021-08-19 12:08   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 07/20] platform/x86: intel_telemetry: " Kate Hsuan
2021-08-19 12:11   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 08/20] platform/x86: intel_ips: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 09/20] platform/x86: intel-rst: " Kate Hsuan
2021-08-19 12:13   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 10/20] platform/x86: intel-smartconnect: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 11/20] platform/x86: intel_turbo_max_3: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 12/20] platform/x86: intel-uncore-frequency: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 13/20] platform/x86: intel_speed_select_if: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 14/20] platform/x86: intel_atomisp2_led: " Kate Hsuan
2021-08-19  9:08   ` Hans de Goede
2021-08-19  3:29 ` [PATCH v3 15/20] platform/x86: intel-hid: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 16/20] platform/x86: intel_int0002_vgpio: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 17/20] platform/x86: intel_oaktrail: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 18/20] platform/x86: intel-vbtn: " Kate Hsuan
2021-08-19  3:30 ` [PATCH v3 19/20] platform/x86: intel-wmi-sbl-fw-updat: " Kate Hsuan
2021-08-19  3:30 ` Kate Hsuan [this message]
2021-08-19  9:29   ` [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: " Hans de Goede
2021-08-19 10:47 ` [PATCH v3 00/20] Intel platform driver code movement Hans de Goede
2021-08-19 12:03   ` Andy Shevchenko
2021-08-19 12:14     ` Andy Shevchenko
2021-08-19 12:46       ` Andy Shevchenko
2021-08-19 13:31       ` Hans de Goede
2021-08-19 13:34         ` Hans de Goede
2021-08-19 14:01           ` Andy Shevchenko
2021-08-19 14:08             ` Hans de Goede

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210819033001.20136-21-hpa@redhat.com \
    --to=hpa@redhat.com \
    --cc=Dell.Client.Kernel@dell.com \
    --cc=acelan.kao@canonical.com \
    --cc=alex.hung@canonical.com \
    --cc=david.e.box@linux.intel.com \
    --cc=hdegoede@redhat.com \
    --cc=irenic.rajneesh@gmail.com \
    --cc=jithu.joseph@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maurice.ma@intel.com \
    --cc=mgross@linux.intel.com \
    --cc=mika.westerberg@linux.intel.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=qipeng.zha@intel.com \
    --cc=srinivas.pandruvada@linux.intel.com \
    --cc=sujith.thomas@intel.com \
    --subject='Re: [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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