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 20/20] Move Intel virtual botton driver to intel/ directory to improve readability.
Date: Tue, 10 Aug 2021 17:58:32 +0800 [thread overview]
Message-ID: <20210810095832.4234-21-hpa@redhat.com> (raw)
In-Reply-To: <20210810095832.4234-1-hpa@redhat.com>
Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
drivers/platform/x86/Kconfig | 15 ---------------
drivers/platform/x86/Makefile | 2 --
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 19 +++++++++----------
drivers/platform/x86/intel/vbtn/Kconfig | 16 ++++++++++++++++
drivers/platform/x86/intel/vbtn/Makefile | 6 ++++++
.../x86/{ => intel/vbtn}/intel-vbtn.c | 0
7 files changed, 32 insertions(+), 27 deletions(-)
create mode 100644 drivers/platform/x86/intel/vbtn/Kconfig
create mode 100644 drivers/platform/x86/intel/vbtn/Makefile
rename drivers/platform/x86/{ => intel/vbtn}/intel-vbtn.c (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 2426f8feb41f..a27584b77c52 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -632,21 +632,6 @@ config THINKPAD_LMI
source "drivers/platform/x86/intel/Kconfig"
-
-
-
-config INTEL_VBTN
- tristate "INTEL VIRTUAL BUTTON"
- depends on ACPI
- depends on INPUT
- 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 d3992588408a..a797e3444e63 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -66,8 +66,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 afc0f70c45ac..2f376edab328 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -38,6 +38,7 @@ source "drivers/platform/x86/intel/uncore_freq/Kconfig"
source "drivers/platform/x86/intel/int0002/Kconfig"
source "drivers/platform/x86/intel/menlow/Kconfig"
source "drivers/platform/x86/intel/oaktrail/Kconfig"
+source "drivers/platform/x86/intel/vbtn/Kconfig"
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 6acf5db0e847..5decc9eb1b0e 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -12,8 +12,9 @@ obj-$(CONFIG_INTEL_HID_EVENT) += hid/
obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += wmi/
obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += wmi/
obj-$(CONFIG_INTEL_INT0002_VGPIO) += int0002/
-obj-$(CONFIG_INTEL_MENLOW) += menlow/
+obj-$(CONFIG_INTEL_MENLOW) += menlow/
obj-$(CONFIG_INTEL_OAKTRAIL) += oaktrail/
+obj-$(CONFIG_INTEL_VBTN) += vbtn/
# Intel PMIC / PMC / P-Unit devices
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += bxtwc/
@@ -24,19 +25,17 @@ obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
obj-$(CONFIG_INTEL_PMT_TELEMETRY) += pmt/
obj-$(CONFIG_INTEL_PMT_CRASHLOG) += pmt/
obj-$(CONFIG_INTEL_PUNIT_IPC) += punit/
-obj-$(CONFIG_INTEL_SCU_IPC) += scu/
-obj-$(CONFIG_INTEL_SCU_PCI) += scu/
+obj-$(CONFIG_INTEL_SCU_IPC) += scu/
+obj-$(CONFIG_INTEL_SCU_PCI) += scu/
obj-$(CONFIG_INTEL_SCU_PLATFORM) += scu/
-obj-$(CONFIG_INTEL_SCU_WDT) += scu/
+obj-$(CONFIG_INTEL_SCU_WDT) += scu/
obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += scu/
obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/
# Intel uncore drivers
-obj-$(CONFIG_INTEL_IPS) += ips/
-obj-$(CONFIG_INTEL_RST) += rst/
-obj-$(CONFIG_INTEL_SMARTCONNECT) += smartconnect/
+obj-$(CONFIG_INTEL_IPS) += ips/
+obj-$(CONFIG_INTEL_RST) += rst/
+obj-$(CONFIG_INTEL_SMARTCONNECT) += smartconnect/
obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/
-obj-$(CONFIG_INTEL_TURBO_MAX_3) += turbo_max_3/
+obj-$(CONFIG_INTEL_TURBO_MAX_3) += turbo_max_3/
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += uncore_freq/
-
-
diff --git a/drivers/platform/x86/intel/vbtn/Kconfig b/drivers/platform/x86/intel/vbtn/Kconfig
new file mode 100644
index 000000000000..c5dfd520530d
--- /dev/null
+++ b/drivers/platform/x86/intel/vbtn/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_VBTN
+ tristate "INTEL VIRTUAL BUTTON"
+ depends on ACPI
+ depends on INPUT
+ 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.
diff --git a/drivers/platform/x86/intel/vbtn/Makefile b/drivers/platform/x86/intel/vbtn/Makefile
new file mode 100644
index 000000000000..596833e13a31
--- /dev/null
+++ b/drivers/platform/x86/intel/vbtn/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel/vbtn/intel-vbtn.c
similarity index 100%
rename from drivers/platform/x86/intel-vbtn.c
rename to drivers/platform/x86/intel/vbtn/intel-vbtn.c
--
2.31.1
next prev parent reply other threads:[~2021-08-10 10:02 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 ` [PATCH 02/20] Move Intel WMI driver of pdx86 to intel/ " Kate Hsuan
2021-08-10 9:58 ` [PATCH 03/20] Move Intel bxtwc " 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 ` Kate Hsuan [this message]
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-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=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 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).