From: Kate Hsuan <hpa@redhat.com>
To: Hans de Goede <hdegoede@redhat.com>,
Mark Gross <mgross@linux.intel.com>,
Alex Hung <alex.hung@canonical.com>,
Sujith Thomas <sujith.thomas@intel.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>,
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>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Daniel Scally <djrscally@gmail.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 02/20] Move Intel WMI driver of pdx86 to intel/ directory to improve readability.
Date: Tue, 10 Aug 2021 17:58:14 +0800 [thread overview]
Message-ID: <20210810095832.4234-3-hpa@redhat.com> (raw)
In-Reply-To: <20210810095832.4234-1-hpa@redhat.com>
---
drivers/platform/x86/Kconfig | 21 ---------------
drivers/platform/x86/Makefile | 2 --
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 3 ++-
drivers/platform/x86/intel/wmi/Kconfig | 26 +++++++++++++++++++
drivers/platform/x86/intel/wmi/Makefile | 7 +++++
.../{ => intel/wmi}/intel-wmi-sbl-fw-update.c | 0
.../{ => intel/wmi}/intel-wmi-thunderbolt.c | 0
8 files changed, 36 insertions(+), 24 deletions(-)
create mode 100644 drivers/platform/x86/intel/wmi/Kconfig
create mode 100644 drivers/platform/x86/intel/wmi/Makefile
rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-sbl-fw-update.c (100%)
rename drivers/platform/x86/{ => intel/wmi}/intel-wmi-thunderbolt.c (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6765f613ce0e..2e45d5e0d08a 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -77,27 +77,6 @@ config UV_SYSFS
To compile this driver as a module, choose M here: the module will
be called uv_sysfs.
-config INTEL_WMI_SBL_FW_UPDATE
- tristate "Intel WMI Slim Bootloader firmware update signaling driver"
- depends on ACPI_WMI
- help
- Say Y here if you want to be able to use the WMI interface to signal
- Slim Bootloader to trigger update on next reboot.
-
- To compile this driver as a module, choose M here: the module will
- be called intel-wmi-sbl-fw-update.
-
-config INTEL_WMI_THUNDERBOLT
- tristate "Intel WMI thunderbolt force power driver"
- depends on ACPI_WMI
- help
- Say Y here if you want to be able to use the WMI interface on select
- systems to force the power control of Intel Thunderbolt controllers.
- This is useful for updating the firmware when devices are not plugged
- into the controller.
-
- To compile this driver as a module, choose M here: the module will
- be called intel-wmi-thunderbolt.
config MXM_WMI
tristate "WMI support for MXM Laptop Graphics"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 328f4bcf99d0..c184989563c8 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -10,8 +10,6 @@ obj-$(CONFIG_WMI_BMOF) += wmi-bmof.o
# WMI drivers
obj-$(CONFIG_HUAWEI_WMI) += huawei-wmi.o
-obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += intel-wmi-sbl-fw-update.o
-obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o
obj-$(CONFIG_MXM_WMI) += mxm-wmi.o
obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o
obj-$(CONFIG_XIAOMI_WMI) += xiaomi-wmi.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index d2254ab6aad8..d541e63d0d2b 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -20,5 +20,6 @@ source "drivers/platform/x86/intel/int33fe/Kconfig"
source "drivers/platform/x86/intel/int3472/Kconfig"
source "drivers/platform/x86/intel/atomisp2/Kconfig"
source "drivers/platform/x86/intel/hid/Kconfig"
+source "drivers/platform/x86/intel/wmi/Kconfig"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 6f04221456fb..653719491fa9 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -9,4 +9,5 @@ obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
obj-$(CONFIG_INTEL_ATOMISP2_LED) += atomisp2/
obj-$(CONFIG_INTEL_ATOMISP2_PM) += atomisp2/
obj-$(CONFIG_INTEL_HID_EVENT) += hid/
-
+obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += wmi/
+obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += wmi/
diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
new file mode 100644
index 000000000000..5c3e2885e196
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_WMI_THUNDERBOLT
+ tristate "Intel WMI thunderbolt force power driver"
+ depends on ACPI_WMI
+ help
+ Say Y here if you want to be able to use the WMI interface on select
+ systems to force the power control of Intel Thunderbolt controllers.
+ This is useful for updating the firmware when devices are not plugged
+ into the controller.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel-wmi-thunderbolt.
+
+config INTEL_WMI_SBL_FW_UPDATE
+ tristate "Intel WMI Slim Bootloader firmware update signaling driver"
+ depends on ACPI_WMI
+ help
+ Say Y here if you want to be able to use the WMI interface to signal
+ Slim Bootloader to trigger update on next reboot.
+
+ To compile this driver as a module, choose M here: the module will
+ be called intel-wmi-sbl-fw-update.
diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile
new file mode 100644
index 000000000000..7aa3789b0f5c
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += intel-wmi-sbl-fw-update.o
+obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o
\ No newline at end of file
diff --git a/drivers/platform/x86/intel-wmi-sbl-fw-update.c b/drivers/platform/x86/intel/wmi/intel-wmi-sbl-fw-update.c
similarity index 100%
rename from drivers/platform/x86/intel-wmi-sbl-fw-update.c
rename to drivers/platform/x86/intel/wmi/intel-wmi-sbl-fw-update.c
diff --git a/drivers/platform/x86/intel-wmi-thunderbolt.c b/drivers/platform/x86/intel/wmi/intel-wmi-thunderbolt.c
similarity index 100%
rename from drivers/platform/x86/intel-wmi-thunderbolt.c
rename to drivers/platform/x86/intel/wmi/intel-wmi-thunderbolt.c
--
2.31.1
next prev parent reply other threads:[~2021-08-10 9:59 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-10 9:58 [PATCH 00/20] Move Intel platform drivers to intel directory to improve readability Kate Hsuan
2021-08-10 9:58 ` [PATCH 01/20] Move Intel hid of pdx86 " Kate Hsuan
2021-08-10 9:58 ` Kate Hsuan [this message]
2021-08-10 9:58 ` [PATCH 03/20] Move Intel bxtwc driver of pdx86 to intel/ " Kate Hsuan
2021-08-10 9:58 ` [PATCH 04/20] Move Intel chtdc_ti driver of pdx86 " Kate Hsuan
2021-08-10 9:58 ` [PATCH 05/20] Move MRFLD power button driver of pdx86 to intel directory " Kate Hsuan
2021-08-10 9:58 ` [PATCH 06/20] Move Intel PMC core of pdx86 to intel/ " Kate Hsuan
2021-08-10 9:58 ` [PATCH 07/20] Move Intel PMT driver of pdx86 to intel/ " Kate Hsuan
2021-08-10 16:51 ` David E. Box
2021-08-10 9:58 ` [PATCH 08/20] Move Intel P-Unit of pdx86 to intel/ directory " Kate Hsuan
2021-08-10 16:55 ` David E. Box
2021-08-11 5:43 ` Kate Hsuan
2021-08-10 9:58 ` [PATCH 09/20] Move Intel SCU IPC of pdx86 to intel directory to increase readability Kate Hsuan
2021-08-10 10:05 ` Mika Westerberg
2021-08-10 11:43 ` Kate Hsuan
2021-08-10 13:27 ` Andy Shevchenko
2021-08-10 9:58 ` [PATCH 10/20] Move Intel SoC telemetry driver to intel directory to improve readability Kate Hsuan
2021-08-10 9:58 ` [PATCH 11/20] Move Intel IPS driver of pdx86 " Kate Hsuan
2021-08-10 9:58 ` [PATCH 12/20] Move Intel RST driver of pdx86 to intel directory " Kate Hsuan
2021-08-10 9:58 ` [PATCH 13/20] Move Intel smartconnect driver of pdx86 to intel/ " Kate Hsuan
2021-08-10 9:58 ` [PATCH 14/20] Move Intel SST driver " Kate Hsuan
2021-08-10 9:58 ` [PATCH 15/20] Move Intel turbo max 3 " Kate Hsuan
2021-08-10 9:58 ` [PATCH 16/20] Move Intel uncore freq " Kate Hsuan
2021-08-10 9:58 ` [PATCH 17/20] Move Intel int0002 vgpio driver to intel/ directory to inprove readability Kate Hsuan
2021-08-10 9:58 ` [PATCH 18/20] Move Intel thermal driver for menlow platform driver to intel/ directory to improve readability Kate Hsuan
2021-08-14 10:39 ` Daniel Lezcano
2021-08-15 14:08 ` Hans de Goede
2021-08-16 3:11 ` Pandruvada, Srinivas
2021-08-16 7:40 ` Hans de Goede
2021-08-16 7:43 ` Kate Hsuan
2021-08-10 9:58 ` [PATCH 19/20] Move OakTrail driver to the " Kate Hsuan
2021-08-10 9:58 ` [PATCH 20/20] Move Intel virtual botton driver to " Kate Hsuan
2021-08-10 13:23 ` [PATCH 00/20] Move Intel platform drivers to intel " Andy Shevchenko
2021-08-11 12:41 ` Andy Shevchenko
2021-08-10 14:05 ` Hans de Goede
2021-08-11 9:06 ` Kate Hsuan
2021-08-10 17:03 ` David E. Box
2021-08-10 17:28 ` Randy Dunlap
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=20210810095832.4234-3-hpa@redhat.com \
--to=hpa@redhat.com \
--cc=Dell.Client.Kernel@dell.com \
--cc=acelan.kao@canonical.com \
--cc=alex.hung@canonical.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dan.carpenter@oracle.com \
--cc=david.e.box@intel.com \
--cc=djrscally@gmail.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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.