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 19/20] platform/x86: intel-wmi-sbl-fw-updat: Move to intel sub-directory
Date: Thu, 19 Aug 2021 11:30:00 +0800 [thread overview]
Message-ID: <20210819033001.20136-20-hpa@redhat.com> (raw)
In-Reply-To: <20210819033001.20136-1-hpa@redhat.com>
Move intel-wmi-sbl-fw-updat to intel sub-directory to improve
readability.
Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
drivers/platform/x86/Kconfig | 10 ----------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 3 +++
drivers/platform/x86/intel/Makefile | 3 +++
drivers/platform/x86/intel/wmi/Kconfig | 14 ++++++++++++++
drivers/platform/x86/intel/wmi/Makefile | 7 +++++++
.../wmi/sbl-fw-update.c} | 0
7 files changed, 28 insertions(+), 11 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/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index b8ce4e6d90dd..611930985b1d 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 d8b193e910bd..0a6dca068d5a 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -10,7 +10,7 @@ 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 3a13f7a6da4d..665146ac65e9 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -177,4 +177,7 @@ config INTEL_UNCORE_FREQ_CONTROL
To compile this driver as a module, choose M here: the module
will be called intel-uncore-frequency.
+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 4211c683315f..0b27be3b9334 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -47,3 +47,6 @@ 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
obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/
+
+#WMI drivers
+obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += wmi/
diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig
new file mode 100644
index 000000000000..fc70728e0f1f
--- /dev/null
+++ b/drivers/platform/x86/intel/wmi/Kconfig
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+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..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.31.1
next prev 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 ` Kate Hsuan [this message]
2021-08-19 3:30 ` [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: " Kate Hsuan
2021-08-19 9:29 ` 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-20-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 \
/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 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).