From: Maximilian Luz <luzmaximilian@gmail.com>
To: platform-driver-x86@vger.kernel.org
Cc: "Andy Shevchenko" <andy.shevchenko@gmail.com>,
"Darren Hart" <dvhart@infradead.org>,
"Hans de Goede" <hdegoede@redhat.com>,
"Mark Gross" <mgross@linux.intel.com>,
"Mika Westerberg" <mika.westerberg@linux.intel.com>,
"Gayatri Kammela" <gayatri.kammela@intel.com>,
"Enric Balletbo i Serra" <enric.balletbo@collabora.com>,
"Blaž Hrastnik" <blaz@mxxn.io>,
"Stephen Just" <stephenjust@gmail.com>,
"Dan Carpenter" <dan.carpenter@oracle.com>,
"Benjamin Tissoires" <benjamin.tissoires@redhat.com>,
"Chen Yu" <yu.c.chen@intel.com>,
linux-kernel@vger.kernel.org,
"Maximilian Luz" <luzmaximilian@gmail.com>
Subject: [PATCH v2 5/5] platform/surface: Move Surface Pro 3 Button driver to platform/surface
Date: Mon, 5 Oct 2020 18:03:07 +0200 [thread overview]
Message-ID: <20201005160307.39201-6-luzmaximilian@gmail.com> (raw)
In-Reply-To: <20201005160307.39201-1-luzmaximilian@gmail.com>
Move the Surface Pro 3 Button driver from platform/x86 to the newly
created platform/surface directory.
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
---
MAINTAINERS | 2 +-
drivers/platform/surface/Kconfig | 6 ++++++
drivers/platform/surface/Makefile | 1 +
drivers/platform/{x86 => surface}/surfacepro3_button.c | 0
drivers/platform/x86/Kconfig | 6 ------
drivers/platform/x86/Makefile | 3 ---
6 files changed, 8 insertions(+), 10 deletions(-)
rename drivers/platform/{x86 => surface}/surfacepro3_button.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 21b4b4c975b3..57ea792c0ab1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11536,7 +11536,7 @@ MICROSOFT SURFACE PRO 3 BUTTON DRIVER
M: Chen Yu <yu.c.chen@intel.com>
L: platform-driver-x86@vger.kernel.org
S: Supported
-F: drivers/platform/x86/surfacepro3_button.c
+F: drivers/platform/surface/surfacepro3_button.c
MICROTEK X6 SCANNER
M: Oliver Neukum <oliver@neukum.org>
diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
index 2af26379804c..fcd80e860132 100644
--- a/drivers/platform/surface/Kconfig
+++ b/drivers/platform/surface/Kconfig
@@ -40,4 +40,10 @@ config SURFACE_3_POWER_OPREGION
This driver provides support for ACPI operation
region of the Surface 3 battery platform driver.
+config SURFACE_PRO3_BUTTON
+ tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3/4 tablet"
+ depends on ACPI && INPUT
+ help
+ This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3/4 tablet.
+
endif # SURFACE_PLATFORM
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
index 4940d4db58b2..dcb1df06d57a 100644
--- a/drivers/platform/surface/Makefile
+++ b/drivers/platform/surface/Makefile
@@ -7,3 +7,4 @@
obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
+obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
similarity index 100%
rename from drivers/platform/x86/surfacepro3_button.c
rename to drivers/platform/surface/surfacepro3_button.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 8417ee0178d0..6083f8241b7d 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -870,12 +870,6 @@ config INTEL_VBTN
To compile this driver as a module, choose M here: the module will
be called intel_vbtn.
-config SURFACE_PRO3_BUTTON
- tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3/4 tablet"
- depends on ACPI && INPUT
- help
- This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3/4 tablet.
-
config MSI_LAPTOP
tristate "MSI Laptop Extras"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index ffa31f57d9a2..aeff497e23a5 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -81,9 +81,6 @@ obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o
-# Microsoft
-obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
-
# MSI
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
obj-$(CONFIG_MSI_WMI) += msi-wmi.o
--
2.28.0
next prev parent reply other threads:[~2020-10-05 16:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-05 16:03 [PATCH v2 0/5] platform/surface: Create a platform subdirectory for Microsoft Surface devices Maximilian Luz
2020-10-05 16:03 ` [PATCH v2 1/5] platform: Add Surface platform directory Maximilian Luz
2020-10-05 16:03 ` [PATCH v2 2/5] platform/surface: Move Surface 3 WMI driver to platform/surface Maximilian Luz
2020-10-05 16:03 ` [PATCH v2 3/5] platform/surface: Move Surface 3 Button " Maximilian Luz
2020-10-05 16:03 ` [PATCH v2 4/5] platform/surface: Move Surface 3 Power OpRegion " Maximilian Luz
2020-10-05 16:03 ` Maximilian Luz [this message]
2020-10-08 11:44 ` [PATCH v2 0/5] platform/surface: Create a platform subdirectory for Microsoft Surface devices Hans de Goede
2020-10-08 12:32 ` Maximilian Luz
2020-10-08 13:38 ` Hans de Goede
2020-10-08 14:05 ` Maximilian Luz
2020-10-08 14:20 ` Hans de Goede
2020-10-08 13:52 ` Andy Shevchenko
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=20201005160307.39201-6-luzmaximilian@gmail.com \
--to=luzmaximilian@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=benjamin.tissoires@redhat.com \
--cc=blaz@mxxn.io \
--cc=dan.carpenter@oracle.com \
--cc=dvhart@infradead.org \
--cc=enric.balletbo@collabora.com \
--cc=gayatri.kammela@intel.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mgross@linux.intel.com \
--cc=mika.westerberg@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=stephenjust@gmail.com \
--cc=yu.c.chen@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.