104 lines
3.5 KiB
Diff
104 lines
3.5 KiB
Diff
From 4f3ef38898939d32ff2e0532cec074ae59d8bb2f Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Sun, 22 Oct 2023 14:57:11 +0200
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
|
|
Surface Laptop Go 3
|
|
|
|
Add SAM client device nodes for the Surface Laptop Go 3. It seems to use
|
|
the same SAM client devices as the Surface Laptop Go 1 and 2, so re-use
|
|
their node group.
|
|
|
|
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 0fe5be5396525..0d8c8395c5886 100644
|
|
--- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
@@ -367,6 +367,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
|
/* Surface Laptop Go 2 */
|
|
{ "MSHW0290", (unsigned long)ssam_node_group_slg1 },
|
|
|
|
+ /* Surface Laptop Go 3 */
|
|
+ { "MSHW0440", (unsigned long)ssam_node_group_slg1 },
|
|
+
|
|
/* Surface Laptop Studio */
|
|
{ "MSHW0123", (unsigned long)ssam_node_group_sls },
|
|
|
|
--
|
|
2.43.0
|
|
|
|
From f6bcb568ef471629c8dd4c48a8ddf53d5b422788 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Mon, 20 Nov 2023 19:47:00 +0100
|
|
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
|
|
Surface Laptop Studio 2
|
|
|
|
Add SAM client device nodes for the Surface Laptop Studio 2 (SLS2). The
|
|
SLS2 is quite similar to the SLS1, but it does not provide the touchpad
|
|
as a SAM-HID device. Therefore, add a new node group for the SLS2 and
|
|
update the comments accordingly
|
|
|
|
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Patchset: surface-sam
|
|
---
|
|
.../surface/surface_aggregator_registry.c | 25 ++++++++++++++++---
|
|
1 file changed, 21 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
|
index 0d8c8395c5886..530db4db71aba 100644
|
|
--- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
@@ -247,8 +247,8 @@ static const struct software_node *ssam_node_group_sl5[] = {
|
|
NULL,
|
|
};
|
|
|
|
-/* Devices for Surface Laptop Studio. */
|
|
-static const struct software_node *ssam_node_group_sls[] = {
|
|
+/* Devices for Surface Laptop Studio 1. */
|
|
+static const struct software_node *ssam_node_group_sls1[] = {
|
|
&ssam_node_root,
|
|
&ssam_node_bat_ac,
|
|
&ssam_node_bat_main,
|
|
@@ -263,6 +263,20 @@ static const struct software_node *ssam_node_group_sls[] = {
|
|
NULL,
|
|
};
|
|
|
|
+/* Devices for Surface Laptop Studio 2. */
|
|
+static const struct software_node *ssam_node_group_sls2[] = {
|
|
+ &ssam_node_root,
|
|
+ &ssam_node_bat_ac,
|
|
+ &ssam_node_bat_main,
|
|
+ &ssam_node_tmp_pprof,
|
|
+ &ssam_node_pos_tablet_switch,
|
|
+ &ssam_node_hid_sam_keyboard,
|
|
+ &ssam_node_hid_sam_penstash,
|
|
+ &ssam_node_hid_sam_sensors,
|
|
+ &ssam_node_hid_sam_ucm_ucsi,
|
|
+ NULL,
|
|
+};
|
|
+
|
|
/* Devices for Surface Laptop Go. */
|
|
static const struct software_node *ssam_node_group_slg1[] = {
|
|
&ssam_node_root,
|
|
@@ -370,8 +384,11 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
|
/* Surface Laptop Go 3 */
|
|
{ "MSHW0440", (unsigned long)ssam_node_group_slg1 },
|
|
|
|
- /* Surface Laptop Studio */
|
|
- { "MSHW0123", (unsigned long)ssam_node_group_sls },
|
|
+ /* Surface Laptop Studio 1 */
|
|
+ { "MSHW0123", (unsigned long)ssam_node_group_sls1 },
|
|
+
|
|
+ /* Surface Laptop Studio 2 */
|
|
+ { "MSHW0360", (unsigned long)ssam_node_group_sls2 },
|
|
|
|
{ },
|
|
};
|
|
--
|
|
2.43.0
|
|
|