From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: Hans de Goede <hdegoede@redhat.com>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Kate Hsuan <hpa@redhat.com>, Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>, linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com Cc: Mark Gross <mgross@linux.intel.com>, Alex Hung <alex.hung@canonical.com>, Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>, David E Box <david.e.box@intel.com>, Zha Qipeng <qipeng.zha@intel.com>, Mika Westerberg <mika.westerberg@linux.intel.com>, "David E. Box" <david.e.box@linux.intel.com>, AceLan Kao <acelan.kao@canonical.com>, Jithu Joseph <jithu.joseph@intel.com>, Maurice Ma <maurice.ma@intel.com> Subject: [PATCH v4 20/21] platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory Date: Thu, 19 Aug 2021 19:37:34 +0300 [thread overview] Message-ID: <20210819163735.81803-21-andriy.shevchenko@linux.intel.com> (raw) In-Reply-To: <20210819163735.81803-1-andriy.shevchenko@linux.intel.com> 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 ee49f50f317a..cf9b2a501552 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 7bbbc5e2053b..f850ac7a7dec 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 9a4309c93c0d..97194707b9d7 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
next prev parent reply other threads:[~2021-08-19 16:38 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-19 16:37 [PATCH v4 00/21] platform/x86: Intel platform driver code movement Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 01/21] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 02/21] platform/x86: intel_chtdc_ti_pwrbtn: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 03/21] platform/x86: intel_mrfld_pwrbtn: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 04/21] platform/x86: intel_punit_ipc: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 05/21] platform/x86: intel_pmc_core: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 06/21] platform/x86: intel_scu: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 07/21] platform/x86: intel_telemetry: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 08/21] platform/x86: intel_ips: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 09/21] platform/x86: intel-rst: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 10/21] platform/x86: intel-smartconnect: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 11/21] platform/x86: intel_turbo_max_3: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 12/21] platform/x86: intel-uncore-frequency: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 13/21] platform/x86: intel_speed_select_if: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 14/21] platform/x86: intel_atomisp2: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 15/21] platform/x86: intel-hid: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 16/21] platform/x86: intel_int0002_vgpio: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 17/21] platform/x86: intel_oaktrail: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 18/21] platform/x86: intel-vbtn: " Andy Shevchenko 2021-08-19 16:37 ` [PATCH v4 19/21] platform/x86: intel-wmi-sbl-fw-update: " Andy Shevchenko 2021-08-19 16:37 ` Andy Shevchenko [this message] 2021-08-19 16:37 ` [PATCH v4 21/21] platform/x86/intel: scu: Fix doc of intel_scu_ipc_dev_command_with_size() Andy Shevchenko 2021-08-19 17:46 ` [PATCH v4 00/21] platform/x86: Intel platform driver code movement Andy Shevchenko 2021-08-19 18:46 ` Hans de Goede 2021-08-20 10:12 ` Andy Shevchenko 2021-08-20 10:22 ` 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=20210819163735.81803-21-andriy.shevchenko@linux.intel.com \ --to=andriy.shevchenko@linux.intel.com \ --cc=Dell.Client.Kernel@dell.com \ --cc=acelan.kao@canonical.com \ --cc=alex.hung@canonical.com \ --cc=david.e.box@intel.com \ --cc=david.e.box@linux.intel.com \ --cc=hdegoede@redhat.com \ --cc=hpa@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 \ --subject='Re: [PATCH v4 20/21] 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).