|
@@ -1,4 +1,4 @@
|
|
-From 9405b29ae42eb82fac05cf5374770c7877c8983d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From eeeef3799e00cdb43e97afe46253d327e03d1f09 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 12 Feb 2021 12:54:34 +0100
|
|
Date: Fri, 12 Feb 2021 12:54:34 +0100
|
|
Subject: [PATCH] platform/surface: Set up Surface Aggregator device registry
|
|
Subject: [PATCH] platform/surface: Set up Surface Aggregator device registry
|
|
@@ -396,7 +396,7 @@ index 000000000000..a051d941ad96
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From b7e8b99142fcb05ebe55a3bbcc3fde33ac5d00d9 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 7d2402b381414e11d981c599599e9993453ba51b Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 12 Feb 2021 12:54:35 +0100
|
|
Date: Fri, 12 Feb 2021 12:54:35 +0100
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add base device hub
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add base device hub
|
|
@@ -725,7 +725,7 @@ index a051d941ad96..6c23d75a044c 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From d9885e35bbc7edb1c6994c0a61575729e69af276 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 01363f0731083c6279306c63f882a0124be6632c Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 12 Feb 2021 12:54:36 +0100
|
|
Date: Fri, 12 Feb 2021 12:54:36 +0100
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add battery subsystem
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add battery subsystem
|
|
@@ -814,7 +814,7 @@ index 6c23d75a044c..cde279692842 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 6230e5622832ed611bc7e126ae1f92fcc9462af0 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 921cc8049f2eadd96ae85f2d41b34da93890dcfb Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 12 Feb 2021 12:54:37 +0100
|
|
Date: Fri, 12 Feb 2021 12:54:37 +0100
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add platform profile
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add platform profile
|
|
@@ -916,7 +916,7 @@ index cde279692842..33904613dd4b 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 93f9ceb899724b500023a627c83b81c9c2938824 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 08b2ddde4aa3b052ffab18c68596b451d49ded2a Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 12 Feb 2021 12:54:38 +0100
|
|
Date: Fri, 12 Feb 2021 12:54:38 +0100
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add DTX device
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add DTX device
|
|
@@ -960,7 +960,7 @@ index 33904613dd4b..dc044d06828b 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From f61c2b2e75748a8d040454f7dfd24150b13a4f02 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From ad9841ea14ede24d3428450920db3c59821a9b7a Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 12 Feb 2021 12:54:39 +0100
|
|
Date: Fri, 12 Feb 2021 12:54:39 +0100
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add HID subsystem
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add HID subsystem
|
|
@@ -1056,7 +1056,7 @@ index dc044d06828b..caee90d135c5 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 03394108faca73ad34694b17fe8a2cd43ffa3d75 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 00218b5ed4a839fa2030f84195a4deb9c173cf6c Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Thu, 11 Feb 2021 21:17:03 +0100
|
|
Date: Thu, 11 Feb 2021 21:17:03 +0100
|
|
Subject: [PATCH] platform/surface: Add platform profile driver
|
|
Subject: [PATCH] platform/surface: Add platform profile driver
|
|
@@ -1342,7 +1342,7 @@ index 000000000000..0081b01a5b0f
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From a32b1497c56b5f2944726124a98c607dba62fe85 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 6328c01f491021081fa4e607d1277a4b857515e5 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Thu, 4 Mar 2021 20:05:24 +0100
|
|
Date: Thu, 4 Mar 2021 20:05:24 +0100
|
|
Subject: [PATCH] platform/surface: aggregator: Make SSAM_DEFINE_SYNC_REQUEST_x
|
|
Subject: [PATCH] platform/surface: aggregator: Make SSAM_DEFINE_SYNC_REQUEST_x
|
|
@@ -1721,7 +1721,7 @@ index 02f3e06c0a60..4441ad667c3f 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 860aa64d0b1e7c98202fa951185738edf6660c2e Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 5d28f623f6ea1af6ba9e85b4b1920993909c8fc3 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Mon, 8 Mar 2021 19:48:17 +0100
|
|
Date: Mon, 8 Mar 2021 19:48:17 +0100
|
|
Subject: [PATCH] platform/surface: Add DTX driver
|
|
Subject: [PATCH] platform/surface: Add DTX driver
|
|
@@ -3216,7 +3216,7 @@ index 000000000000..0833aab0d819
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 5e38984fd3f00e0690252ffd9b6fcce1171d1366 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 4482312cd7a3204807c022194849bac10a0b71a6 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Mon, 8 Mar 2021 19:48:18 +0100
|
|
Date: Mon, 8 Mar 2021 19:48:18 +0100
|
|
Subject: [PATCH] platform/surface: dtx: Add support for native SSAM devices
|
|
Subject: [PATCH] platform/surface: dtx: Add support for native SSAM devices
|
|
@@ -3360,7 +3360,7 @@ index 1301fab0ea14..85451eb94d98 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 8c1cfab071bac86333323ff9906f34728c6be6b5 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 0d85ae4fe9b51e78cb3aec098a0f7ef938740bae Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Mon, 8 Mar 2021 19:48:19 +0100
|
|
Date: Mon, 8 Mar 2021 19:48:19 +0100
|
|
Subject: [PATCH] docs: driver-api: Add Surface DTX driver documentation
|
|
Subject: [PATCH] docs: driver-api: Add Surface DTX driver documentation
|
|
@@ -4131,7 +4131,7 @@ index 3917e7363520..da1487d672a8 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 0cd05fd02af8e8910953314a36016ece705d4638 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 5163764ad6233534f1192e016a92601b698e42ab Mon Sep 17 00:00:00 2001
|
|
From: Wei Yongjun <weiyongjun1@huawei.com>
|
|
From: Wei Yongjun <weiyongjun1@huawei.com>
|
|
Date: Tue, 9 Mar 2021 13:15:00 +0000
|
|
Date: Tue, 9 Mar 2021 13:15:00 +0000
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Make symbol
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Make symbol
|
|
@@ -4172,7 +4172,7 @@ index cdb4a95af3e8..86cff5fce3cd 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 1494bdf43e16222acf1d73a9a359f641dc094751 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 149c08f2228d6a076727cc47c2df7ec35eb6dceb Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Tue, 9 Mar 2021 17:25:50 +0100
|
|
Date: Tue, 9 Mar 2021 17:25:50 +0100
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
|
|
@@ -4215,7 +4215,7 @@ index 86cff5fce3cd..eccb9d1007cd 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From dca5149dc5635c66a6a98c170fb51d1b1c0fbe7d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 605b213e8756c7d0499afcbbe3e809bd9482703d Mon Sep 17 00:00:00 2001
|
|
From: kernel test robot <lkp@intel.com>
|
|
From: kernel test robot <lkp@intel.com>
|
|
Date: Fri, 19 Mar 2021 13:19:19 +0800
|
|
Date: Fri, 19 Mar 2021 13:19:19 +0800
|
|
Subject: [PATCH] platform/surface: fix semicolon.cocci warnings
|
|
Subject: [PATCH] platform/surface: fix semicolon.cocci warnings
|
|
@@ -4254,7 +4254,7 @@ index 85451eb94d98..1fedacf74050 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 66be3631a517ddd6484f47f499be3ddde5b8ee6c Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From f13b83611a341a196ef74bde72d9d44997c995f0 Mon Sep 17 00:00:00 2001
|
|
From: Dan Carpenter <dan.carpenter@oracle.com>
|
|
From: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Date: Fri, 26 Mar 2021 15:28:48 +0300
|
|
Date: Fri, 26 Mar 2021 15:28:48 +0300
|
|
Subject: [PATCH] platform/surface: clean up a variable in surface_dtx_read()
|
|
Subject: [PATCH] platform/surface: clean up a variable in surface_dtx_read()
|
|
@@ -4287,7 +4287,7 @@ index 1fedacf74050..63ce587e79e3 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 0cbff8b3b864943237f186ad5fc0ddad1547870a Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 66db7a63aee86176b53d736a5ad14305faa31372 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Tue, 6 Apr 2021 01:12:22 +0200
|
|
Date: Tue, 6 Apr 2021 01:12:22 +0200
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Give devices time to
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Give devices time to
|
|
@@ -4530,7 +4530,7 @@ index eccb9d1007cd..685d37a7add1 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From a9ad064e01d2b09f7cf0b3a0b8458144f671f467 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 8c9dc972aa9e6c3a81fcb4a9fb5d3b56cdaa72cd Mon Sep 17 00:00:00 2001
|
|
From: Barry Song <song.bao.hua@hisilicon.com>
|
|
From: Barry Song <song.bao.hua@hisilicon.com>
|
|
Date: Wed, 3 Mar 2021 11:49:15 +1300
|
|
Date: Wed, 3 Mar 2021 11:49:15 +1300
|
|
Subject: [PATCH] genirq: Add IRQF_NO_AUTOEN for request_irq/nmi()
|
|
Subject: [PATCH] genirq: Add IRQF_NO_AUTOEN for request_irq/nmi()
|
|
@@ -4632,7 +4632,7 @@ index 21ea370fccda..49288e941365 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 28bc28aae45befdb11bffefdb2a526165c613e4e Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 09549164fb369371e866f0ea28c98e75e24bd25a Mon Sep 17 00:00:00 2001
|
|
From: Tian Tao <tiantao6@hisilicon.com>
|
|
From: Tian Tao <tiantao6@hisilicon.com>
|
|
Date: Wed, 7 Apr 2021 15:00:52 +0800
|
|
Date: Wed, 7 Apr 2021 15:00:52 +0800
|
|
Subject: [PATCH] platform/surface: aggregator: move to use request_irq by
|
|
Subject: [PATCH] platform/surface: aggregator: move to use request_irq by
|
|
@@ -4679,7 +4679,7 @@ index 88ec47cae5bf..69e86cd599d3 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 9aa23166e42b48cfbf964ea8ec60f80c779a37b4 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 76258d399e4530578f39c5fb9d6f08d0cbd1d05e Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Wed, 5 May 2021 14:53:45 +0200
|
|
Date: Wed, 5 May 2021 14:53:45 +0200
|
|
Subject: [PATCH] platform/surface: aggregator: Do not mark interrupt as shared
|
|
Subject: [PATCH] platform/surface: aggregator: Do not mark interrupt as shared
|
|
@@ -4713,7 +4713,7 @@ index 69e86cd599d3..8a70df60142c 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From cc34e75d2c6f14b61bf4c19fdce4faef1f618436 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 28d357d824560804480c4b4d945d0bb256b7e4d2 Mon Sep 17 00:00:00 2001
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
|
Date: Fri, 14 May 2021 22:04:36 +0200
|
|
Date: Fri, 14 May 2021 22:04:36 +0200
|
|
Subject: [PATCH] platform/surface: aggregator: avoid clang
|
|
Subject: [PATCH] platform/surface: aggregator: avoid clang
|
|
@@ -4772,7 +4772,7 @@ index 4441ad667c3f..6ff9c58b3e17 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From b551922be9669f52eeea1bffe101a765e2443316 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 37da58d6054cf72308c52daeb98f6790004cd663 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Thu, 13 May 2021 15:44:37 +0200
|
|
Date: Thu, 13 May 2021 15:44:37 +0200
|
|
Subject: [PATCH] platform/surface: dtx: Fix poll function
|
|
Subject: [PATCH] platform/surface: dtx: Fix poll function
|
|
@@ -4825,7 +4825,199 @@ index 63ce587e79e3..5d9b758a99bb 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 674eb0ea55289da5670aa0cb8a742e76dbff5566 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 500a7dbb2db9827a866638d957611605f18e9fba Mon Sep 17 00:00:00 2001
|
|
|
|
+From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
+Date: Sun, 23 May 2021 14:35:37 +0200
|
|
|
|
+Subject: [PATCH] platform/surface: aggregator_registry: Update comments for
|
|
|
|
+ 15" AMD Surface Laptop 4
|
|
|
|
+
|
|
|
|
+The 15" AMD version of the Surface Laptop 4 shares its WSID HID with the
|
|
|
|
+15" AMD version of the Surface Laptop 3. Update the comments
|
|
|
|
+accordingly.
|
|
|
|
+
|
|
|
|
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
+Patchset: surface-sam
|
|
|
|
+---
|
|
|
|
+ drivers/platform/surface/surface_aggregator_registry.c | 4 ++--
|
|
|
|
+ 1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
+
|
|
|
|
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
+index 685d37a7add1..bdc09305aab7 100644
|
|
|
|
+--- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
++++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
+@@ -156,7 +156,7 @@ static const struct software_node *ssam_node_group_sl2[] = {
|
|
|
|
+ NULL,
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+-/* Devices for Surface Laptop 3. */
|
|
|
|
++/* Devices for Surface Laptop 3 and 4. */
|
|
|
|
+ static const struct software_node *ssam_node_group_sl3[] = {
|
|
|
|
+ &ssam_node_root,
|
|
|
|
+ &ssam_node_bat_ac,
|
|
|
|
+@@ -521,7 +521,7 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
|
|
|
+ /* Surface Laptop 3 (13", Intel) */
|
|
|
|
+ { "MSHW0114", (unsigned long)ssam_node_group_sl3 },
|
|
|
|
+
|
|
|
|
+- /* Surface Laptop 3 (15", AMD) */
|
|
|
|
++ /* Surface Laptop 3 (15", AMD) and 4 (15", AMD) */
|
|
|
|
+ { "MSHW0110", (unsigned long)ssam_node_group_sl3 },
|
|
|
|
+
|
|
|
|
+ /* Surface Laptop Go 1 */
|
|
|
|
+--
|
|
|
|
+2.31.1
|
|
|
|
+
|
|
|
|
+From 6ea2f6ce3aef567fcfb28cf85599e0e386099996 Mon Sep 17 00:00:00 2001
|
|
|
|
+From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
+Date: Sun, 23 May 2021 14:36:36 +0200
|
|
|
|
+Subject: [PATCH] platform/surface: aggregator_registry: Add support for 13"
|
|
|
|
+ Intel Surface Laptop 4
|
|
|
|
+
|
|
|
|
+Add support for the 13" Intel version of the Surface Laptop 4.
|
|
|
|
+
|
|
|
|
+Use the existing node group for the Surface Laptop 3 since the 15" AMD
|
|
|
|
+version already shares its WSID HID with its predecessor and there don't
|
|
|
|
+seem to be any significant differences with regards to SAM.
|
|
|
|
+
|
|
|
|
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
+Patchset: surface-sam
|
|
|
|
+---
|
|
|
|
+ drivers/platform/surface/surface_aggregator_registry.c | 3 +++
|
|
|
|
+ 1 file changed, 3 insertions(+)
|
|
|
|
+
|
|
|
|
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
+index bdc09305aab7..ef83461fa536 100644
|
|
|
|
+--- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
++++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
+@@ -524,6 +524,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
|
|
|
+ /* Surface Laptop 3 (15", AMD) and 4 (15", AMD) */
|
|
|
|
+ { "MSHW0110", (unsigned long)ssam_node_group_sl3 },
|
|
|
|
+
|
|
|
|
++ /* Surface Laptop 4 (13", Intel) */
|
|
|
|
++ { "MSHW0250", (unsigned long)ssam_node_group_sl3 },
|
|
|
|
++
|
|
|
|
+ /* Surface Laptop Go 1 */
|
|
|
|
+ { "MSHW0118", (unsigned long)ssam_node_group_slg1 },
|
|
|
|
+
|
|
|
|
+--
|
|
|
|
+2.31.1
|
|
|
|
+
|
|
|
|
+From b50d1092897721641b057a597a18931037a7314d Mon Sep 17 00:00:00 2001
|
|
|
|
+From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
+Date: Sun, 23 May 2021 14:09:42 +0200
|
|
|
|
+Subject: [PATCH] platform/surface: aggregator_registry: Consolidate node
|
|
|
|
+ groups for 5th- and 6th-gen devices
|
|
|
|
+
|
|
|
|
+5th- and 6th-generation Surface devices have all SAM clients defined in
|
|
|
|
+ACPI, except for the platform profile/performance mode which his handled
|
|
|
|
+via the WSID (Windows Surface Integration Device). Thus, the node groups
|
|
|
|
+for those devices are the same and we can just use a single one instead
|
|
|
|
+of re-defining the same one over and over again.
|
|
|
|
+
|
|
|
|
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
+Patchset: surface-sam
|
|
|
|
+---
|
|
|
|
+ .../surface/surface_aggregator_registry.c | 47 +++++--------------
|
|
|
|
+ 1 file changed, 12 insertions(+), 35 deletions(-)
|
|
|
|
+
|
|
|
|
+diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
+index ef83461fa536..4428c4330229 100644
|
|
|
|
+--- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
++++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
+@@ -119,8 +119,13 @@ static const struct software_node ssam_node_hid_base_iid6 = {
|
|
|
|
+ .parent = &ssam_node_hub_base,
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+-/* Devices for Surface Book 2. */
|
|
|
|
+-static const struct software_node *ssam_node_group_sb2[] = {
|
|
|
|
++/*
|
|
|
|
++ * Devices for 5th- and 6th-generations models:
|
|
|
|
++ * - Surface Book 2,
|
|
|
|
++ * - Surface Laptop 1 and 2,
|
|
|
|
++ * - Surface Pro 5 and 6.
|
|
|
|
++ */
|
|
|
|
++static const struct software_node *ssam_node_group_gen5[] = {
|
|
|
|
+ &ssam_node_root,
|
|
|
|
+ &ssam_node_tmp_pprof,
|
|
|
|
+ NULL,
|
|
|
|
+@@ -142,20 +147,6 @@ static const struct software_node *ssam_node_group_sb3[] = {
|
|
|
|
+ NULL,
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+-/* Devices for Surface Laptop 1. */
|
|
|
|
+-static const struct software_node *ssam_node_group_sl1[] = {
|
|
|
|
+- &ssam_node_root,
|
|
|
|
+- &ssam_node_tmp_pprof,
|
|
|
|
+- NULL,
|
|
|
|
+-};
|
|
|
|
+-
|
|
|
|
+-/* Devices for Surface Laptop 2. */
|
|
|
|
+-static const struct software_node *ssam_node_group_sl2[] = {
|
|
|
|
+- &ssam_node_root,
|
|
|
|
+- &ssam_node_tmp_pprof,
|
|
|
|
+- NULL,
|
|
|
|
+-};
|
|
|
|
+-
|
|
|
|
+ /* Devices for Surface Laptop 3 and 4. */
|
|
|
|
+ static const struct software_node *ssam_node_group_sl3[] = {
|
|
|
|
+ &ssam_node_root,
|
|
|
|
+@@ -177,20 +168,6 @@ static const struct software_node *ssam_node_group_slg1[] = {
|
|
|
|
+ NULL,
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+-/* Devices for Surface Pro 5. */
|
|
|
|
+-static const struct software_node *ssam_node_group_sp5[] = {
|
|
|
|
+- &ssam_node_root,
|
|
|
|
+- &ssam_node_tmp_pprof,
|
|
|
|
+- NULL,
|
|
|
|
+-};
|
|
|
|
+-
|
|
|
|
+-/* Devices for Surface Pro 6. */
|
|
|
|
+-static const struct software_node *ssam_node_group_sp6[] = {
|
|
|
|
+- &ssam_node_root,
|
|
|
|
+- &ssam_node_tmp_pprof,
|
|
|
|
+- NULL,
|
|
|
|
+-};
|
|
|
|
+-
|
|
|
|
+ /* Devices for Surface Pro 7 and Surface Pro 7+. */
|
|
|
|
+ static const struct software_node *ssam_node_group_sp7[] = {
|
|
|
|
+ &ssam_node_root,
|
|
|
|
+@@ -495,10 +472,10 @@ static struct ssam_device_driver ssam_base_hub_driver = {
|
|
|
|
+
|
|
|
|
+ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
|
|
|
+ /* Surface Pro 4, 5, and 6 (OMBR < 0x10) */
|
|
|
|
+- { "MSHW0081", (unsigned long)ssam_node_group_sp5 },
|
|
|
|
++ { "MSHW0081", (unsigned long)ssam_node_group_gen5 },
|
|
|
|
+
|
|
|
|
+ /* Surface Pro 6 (OMBR >= 0x10) */
|
|
|
|
+- { "MSHW0111", (unsigned long)ssam_node_group_sp6 },
|
|
|
|
++ { "MSHW0111", (unsigned long)ssam_node_group_gen5 },
|
|
|
|
+
|
|
|
|
+ /* Surface Pro 7 */
|
|
|
|
+ { "MSHW0116", (unsigned long)ssam_node_group_sp7 },
|
|
|
|
+@@ -507,16 +484,16 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
|
|
|
+ { "MSHW0119", (unsigned long)ssam_node_group_sp7 },
|
|
|
|
+
|
|
|
|
+ /* Surface Book 2 */
|
|
|
|
+- { "MSHW0107", (unsigned long)ssam_node_group_sb2 },
|
|
|
|
++ { "MSHW0107", (unsigned long)ssam_node_group_gen5 },
|
|
|
|
+
|
|
|
|
+ /* Surface Book 3 */
|
|
|
|
+ { "MSHW0117", (unsigned long)ssam_node_group_sb3 },
|
|
|
|
+
|
|
|
|
+ /* Surface Laptop 1 */
|
|
|
|
+- { "MSHW0086", (unsigned long)ssam_node_group_sl1 },
|
|
|
|
++ { "MSHW0086", (unsigned long)ssam_node_group_gen5 },
|
|
|
|
+
|
|
|
|
+ /* Surface Laptop 2 */
|
|
|
|
+- { "MSHW0112", (unsigned long)ssam_node_group_sl2 },
|
|
|
|
++ { "MSHW0112", (unsigned long)ssam_node_group_gen5 },
|
|
|
|
+
|
|
|
|
+ /* Surface Laptop 3 (13", Intel) */
|
|
|
|
+ { "MSHW0114", (unsigned long)ssam_node_group_sl3 },
|
|
|
|
+--
|
|
|
|
+2.31.1
|
|
|
|
+
|
|
|
|
+From 4e1e564af4f6786609bf79786b334e9f87caf387 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Wed, 10 Mar 2021 23:53:28 +0100
|
|
Date: Wed, 10 Mar 2021 23:53:28 +0100
|
|
Subject: [PATCH] HID: Add support for Surface Aggregator Module HID transport
|
|
Subject: [PATCH] HID: Add support for Surface Aggregator Module HID transport
|
|
@@ -5572,7 +5764,7 @@ index 000000000000..4b1a7b57e035
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From e15c02a7a035c13197ce9cc2b7e9cc0743951972 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From a7cdf2062e021e62de89568a0d28ecc961b8a476 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Wed, 10 Mar 2021 23:53:29 +0100
|
|
Date: Wed, 10 Mar 2021 23:53:29 +0100
|
|
Subject: [PATCH] HID: surface-hid: Add support for legacy keyboard interface
|
|
Subject: [PATCH] HID: surface-hid: Add support for legacy keyboard interface
|
|
@@ -5943,7 +6135,7 @@ index 000000000000..0635341bc517
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 63be35d078bc6a1560f97d732158b5f8ce3f476a Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From a5c403f4545c903e46a560fb7cebfd78b7c838ec Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 23 Apr 2021 00:51:22 +0200
|
|
Date: Fri, 23 Apr 2021 00:51:22 +0200
|
|
Subject: [PATCH] HID: surface-hid: Fix integer endian conversion
|
|
Subject: [PATCH] HID: surface-hid: Fix integer endian conversion
|
|
@@ -5982,7 +6174,7 @@ index 7b27ec392232..5571e74abe91 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 5526fc8fb5ced772c73b0a55e88d515d52e7fe4c Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From d5a20a55551e94c548dc63342921360891e6b650 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Tue, 6 Apr 2021 01:41:25 +0200
|
|
Date: Tue, 6 Apr 2021 01:41:25 +0200
|
|
Subject: [PATCH] power: supply: Add battery driver for Surface Aggregator
|
|
Subject: [PATCH] power: supply: Add battery driver for Surface Aggregator
|
|
@@ -6964,7 +7156,7 @@ index 000000000000..4116dd839ecd
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From ed1db4e5a46cce7bcab09249fa89f3d59cf7a554 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From a4b5e7c7df7e7ba10825b0739f0b3ef9d3bb9095 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Tue, 6 Apr 2021 01:41:26 +0200
|
|
Date: Tue, 6 Apr 2021 01:41:26 +0200
|
|
Subject: [PATCH] power: supply: Add AC driver for Surface Aggregator Module
|
|
Subject: [PATCH] power: supply: Add AC driver for Surface Aggregator Module
|
|
@@ -7332,7 +7524,7 @@ index 000000000000..c2dd7e604d14
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 0c62c455aa35520f98fb50f55bc00fd72be59317 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From dd421d43695af376a2ed92158aca325ab47e1185 Mon Sep 17 00:00:00 2001
|
|
From: Qiheng Lin <linqiheng@huawei.com>
|
|
From: Qiheng Lin <linqiheng@huawei.com>
|
|
Date: Sat, 10 Apr 2021 12:12:46 +0800
|
|
Date: Sat, 10 Apr 2021 12:12:46 +0800
|
|
Subject: [PATCH] power: supply: surface-battery: Make some symbols static
|
|
Subject: [PATCH] power: supply: surface-battery: Make some symbols static
|
|
@@ -7381,7 +7573,7 @@ index 4116dd839ecd..7efa431a62b2 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 00a1bfd64364c150f8fc8ce1293a084ebf52d3fe Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From d65762467cbd350e791d838e3ae2e62b4d7cce17 Mon Sep 17 00:00:00 2001
|
|
From: Qiheng Lin <linqiheng@huawei.com>
|
|
From: Qiheng Lin <linqiheng@huawei.com>
|
|
Date: Sat, 10 Apr 2021 12:12:49 +0800
|
|
Date: Sat, 10 Apr 2021 12:12:49 +0800
|
|
Subject: [PATCH] power: supply: surface-charger: Make symbol
|
|
Subject: [PATCH] power: supply: surface-charger: Make symbol
|
|
@@ -7420,7 +7612,7 @@ index c2dd7e604d14..81a5b79822c9 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 30d2b20d7b1df31cbf0f4d23745ac8b6adcbb277 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From cceedae03291a2c7679afd4c2e5b2a8cc280bd50 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Tue, 4 May 2021 20:00:46 +0200
|
|
Date: Tue, 4 May 2021 20:00:46 +0200
|
|
Subject: [PATCH] power: supply: surface_battery: Fix battery event handling
|
|
Subject: [PATCH] power: supply: surface_battery: Fix battery event handling
|
|
@@ -7477,7 +7669,7 @@ index 7efa431a62b2..5ec2e6bb2465 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From b549c514ca33ad14d04e071491b889b16e1afdeb Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 093de2bdaf115b190dc6d6afe911effdf38d6f5b Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Tue, 11 May 2021 11:24:21 +0200
|
|
Date: Tue, 11 May 2021 11:24:21 +0200
|
|
Subject: [PATCH] power: supply: surface-charger: Fix type of integer variable
|
|
Subject: [PATCH] power: supply: surface-charger: Fix type of integer variable
|
|
@@ -7509,7 +7701,7 @@ index 81a5b79822c9..a060c36c7766 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 409d23b2885134d02f51bc833a187ff3bc86bb74 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 226ee2ca4edf858e0990af6628d18e26d9e93da7 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Wed, 5 May 2021 18:17:04 +0200
|
|
Date: Wed, 5 May 2021 18:17:04 +0200
|
|
Subject: [PATCH] serial: 8250_dw: Add device HID for new AMD UART controller
|
|
Subject: [PATCH] serial: 8250_dw: Add device HID for new AMD UART controller
|
|
@@ -7555,7 +7747,7 @@ index 9e204f9b799a..a3a0154da567 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 9190a4e6101802dee5445ad798c1b08e8310e517 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 8575c028a5feb9eb7f84b75de3091a03ae999e9c Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Wed, 5 May 2021 18:22:04 +0200
|
|
Date: Wed, 5 May 2021 18:22:04 +0200
|
|
Subject: [PATCH] pinctrl/amd: Add device HID for new AMD GPIO controller
|
|
Subject: [PATCH] pinctrl/amd: Add device HID for new AMD GPIO controller
|
|
@@ -7587,7 +7779,7 @@ index 2d4acf21117c..c5950a3b4e4c 100644
|
|
--
|
|
--
|
|
2.31.1
|
|
2.31.1
|
|
|
|
|
|
-From 587a4dcd042c9783b6656df33c52c94373f41fc7 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From d846c1f3e4ccea11de481d31c82c5731d83975b4 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Mon, 10 May 2021 23:33:17 +0200
|
|
Date: Mon, 10 May 2021 23:33:17 +0200
|
|
Subject: [PATCH] x86/i8259: Work around buggy legacy PIC
|
|
Subject: [PATCH] x86/i8259: Work around buggy legacy PIC
|