[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20201005160307.39201-3-luzmaximilian@gmail.com>
Date: Mon, 5 Oct 2020 18:03:04 +0200
From: Maximilian Luz <luzmaximilian@...il.com>
To: platform-driver-x86@...r.kernel.org
Cc: Andy Shevchenko <andy.shevchenko@...il.com>,
Darren Hart <dvhart@...radead.org>,
Hans de Goede <hdegoede@...hat.com>,
Mark Gross <mgross@...ux.intel.com>,
Mika Westerberg <mika.westerberg@...ux.intel.com>,
Gayatri Kammela <gayatri.kammela@...el.com>,
Enric Balletbo i Serra <enric.balletbo@...labora.com>,
Blaž Hrastnik <blaz@...n.io>,
Stephen Just <stephenjust@...il.com>,
Dan Carpenter <dan.carpenter@...cle.com>,
Benjamin Tissoires <benjamin.tissoires@...hat.com>,
Chen Yu <yu.c.chen@...el.com>, linux-kernel@...r.kernel.org,
Maximilian Luz <luzmaximilian@...il.com>
Subject: [PATCH v2 2/5] platform/surface: Move Surface 3 WMI driver to platform/surface
Move the Surface 3 WMI driver from platform/x86 to the newly created
platform/surface directory.
Signed-off-by: Maximilian Luz <luzmaximilian@...il.com>
---
drivers/platform/surface/Kconfig | 12 +++++++++++-
drivers/platform/surface/Makefile | 2 +-
drivers/platform/{x86 => surface}/surface3-wmi.c | 0
drivers/platform/x86/Kconfig | 12 ------------
drivers/platform/x86/Makefile | 1 -
5 files changed, 12 insertions(+), 15 deletions(-)
rename drivers/platform/{x86 => surface}/surface3-wmi.c (100%)
diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
index 806b088ddae2..1566b32a1884 100644
--- a/drivers/platform/surface/Kconfig
+++ b/drivers/platform/surface/Kconfig
@@ -15,6 +15,16 @@ menuconfig SURFACE_PLATFORM
if SURFACE_PLATFORM
-# place Microsoft Surface platform drivers here
+config SURFACE3_WMI
+ tristate "Surface 3 WMI Driver"
+ depends on ACPI_WMI
+ depends on DMI
+ depends on INPUT
+ depends on SPI
+ help
+ Say Y here if you have a Surface 3.
+
+ To compile this driver as a module, choose M here: the module will
+ be called surface3-wmi.
endif # SURFACE_PLATFORM
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
index 11788a44713f..f889d521420f 100644
--- a/drivers/platform/surface/Makefile
+++ b/drivers/platform/surface/Makefile
@@ -4,4 +4,4 @@
# Microsoft Surface Platform-Specific Drivers
#
-# place Microsoft Surface platform drivers here
+obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
diff --git a/drivers/platform/x86/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
similarity index 100%
rename from drivers/platform/x86/surface3-wmi.c
rename to drivers/platform/surface/surface3-wmi.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 0d91d136bc3b..0759913c9846 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -870,18 +870,6 @@ config INTEL_VBTN
To compile this driver as a module, choose M here: the module will
be called intel_vbtn.
-config SURFACE3_WMI
- tristate "Surface 3 WMI Driver"
- depends on ACPI_WMI
- depends on DMI
- depends on INPUT
- depends on SPI
- help
- Say Y here if you have a Surface 3.
-
- To compile this driver as a module, choose M here: the module will
- be called surface3-wmi.
-
config SURFACE_3_BUTTON
tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet"
depends on ACPI && KEYBOARD_GPIO && I2C
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 5f823f7eff45..29563a32b3e3 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -82,7 +82,6 @@ obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o
# Microsoft
-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
--
2.28.0
Powered by blists - more mailing lists