|
@@ -1,4 +1,4 @@
|
|
|
-From 4aeededdff17f504089c636a70133881becdad5a Mon Sep 17 00:00:00 2001
|
|
|
+From 7e1cb9d4aab83fe74b0e45a3a5d4eb475fb34f73 Mon Sep 17 00:00:00 2001
|
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
Date: Fri, 26 Jul 2019 04:45:10 +0200
|
|
|
Subject: [PATCH 03/12] buttons
|
|
@@ -28,10 +28,10 @@ index d07c1eb15aa6..7d9ae394e597 100644
|
|
|
To compile this driver as a module, choose M here: the
|
|
|
module will be called soc_button_array.
|
|
|
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
|
|
|
-index 55cd6e0b409c..8f21c062c85d 100644
|
|
|
+index 5e59f8e57f8e..6f0133fe1546 100644
|
|
|
--- a/drivers/input/misc/soc_button_array.c
|
|
|
+++ b/drivers/input/misc/soc_button_array.c
|
|
|
-@@ -29,6 +29,11 @@ struct soc_button_info {
|
|
|
+@@ -25,6 +25,11 @@ struct soc_button_info {
|
|
|
bool wakeup;
|
|
|
};
|
|
|
|
|
@@ -43,7 +43,7 @@ index 55cd6e0b409c..8f21c062c85d 100644
|
|
|
/*
|
|
|
* Some of the buttons like volume up/down are auto repeat, while others
|
|
|
* are not. To support both, we register two platform devices, and put
|
|
|
-@@ -91,8 +96,13 @@ soc_button_device_create(struct platform_device *pdev,
|
|
|
+@@ -87,8 +92,13 @@ soc_button_device_create(struct platform_device *pdev,
|
|
|
continue;
|
|
|
|
|
|
gpio = soc_button_lookup_gpio(&pdev->dev, info->acpi_index);
|
|
@@ -191,10 +191,10 @@ index 55cd6e0b409c..8f21c062c85d 100644
|
|
|
};
|
|
|
|
|
|
diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/x86/surfacepro3_button.c
|
|
|
-index 1b491690ce07..96627627060e 100644
|
|
|
+index 47c6d000465a..ec515223f654 100644
|
|
|
--- a/drivers/platform/x86/surfacepro3_button.c
|
|
|
+++ b/drivers/platform/x86/surfacepro3_button.c
|
|
|
-@@ -24,6 +24,12 @@
|
|
|
+@@ -20,6 +20,12 @@
|
|
|
#define SURFACE_BUTTON_OBJ_NAME "VGBI"
|
|
|
#define SURFACE_BUTTON_DEVICE_NAME "Surface Pro 3/4 Buttons"
|
|
|
|
|
@@ -207,7 +207,7 @@ index 1b491690ce07..96627627060e 100644
|
|
|
#define SURFACE_BUTTON_NOTIFY_TABLET_MODE 0xc8
|
|
|
|
|
|
#define SURFACE_BUTTON_NOTIFY_PRESS_POWER 0xc6
|
|
|
-@@ -146,6 +152,44 @@ static int surface_button_resume(struct device *dev)
|
|
|
+@@ -142,6 +148,44 @@ static int surface_button_resume(struct device *dev)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
@@ -252,7 +252,7 @@ index 1b491690ce07..96627627060e 100644
|
|
|
static int surface_button_add(struct acpi_device *device)
|
|
|
{
|
|
|
struct surface_button *button;
|
|
|
-@@ -158,6 +202,9 @@ static int surface_button_add(struct acpi_device *device)
|
|
|
+@@ -154,6 +198,9 @@ static int surface_button_add(struct acpi_device *device)
|
|
|
strlen(SURFACE_BUTTON_OBJ_NAME)))
|
|
|
return -ENODEV;
|
|
|
|