Skip to content

Commit

Permalink
platform/surface: Move Surface Pro 3 Button driver to platform/surface
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Chen Yu <yu.c.chen@intel.com>
Link: https://lore.kernel.org/r/20201009141128.683254-6-luzmaximilian@gmail.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  • Loading branch information
Maximilian Luz authored and Hans de Goede committed Oct 27, 2020
1 parent 85f7582 commit 411269b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -11663,7 +11663,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>
Expand Down
6 changes: 6 additions & 0 deletions drivers/platform/surface/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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_PLATFORMS
1 change: 1 addition & 0 deletions drivers/platform/surface/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
6 changes: 0 additions & 6 deletions drivers/platform/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions drivers/platform/x86/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 411269b

Please sign in to comment.