Skip to content

Commit 28d04b4

Browse files
qzedij-intel
authored andcommitted
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. In addition, it uses the new fan control interface. Signed-off-by: Maximilian Luz <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Ilpo Järvinen <[email protected]> Signed-off-by: Ilpo Järvinen <[email protected]>
1 parent ed23516 commit 28d04b4

File tree

1 file changed

+23
-4
lines changed

1 file changed

+23
-4
lines changed

drivers/platform/surface/surface_aggregator_registry.c

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ static const struct software_node *ssam_node_group_sl5[] = {
273273
NULL,
274274
};
275275

276-
/* Devices for Surface Laptop Studio. */
277-
static const struct software_node *ssam_node_group_sls[] = {
276+
/* Devices for Surface Laptop Studio 1. */
277+
static const struct software_node *ssam_node_group_sls1[] = {
278278
&ssam_node_root,
279279
&ssam_node_bat_ac,
280280
&ssam_node_bat_main,
@@ -289,6 +289,22 @@ static const struct software_node *ssam_node_group_sls[] = {
289289
NULL,
290290
};
291291

292+
/* Devices for Surface Laptop Studio 2. */
293+
static const struct software_node *ssam_node_group_sls2[] = {
294+
&ssam_node_root,
295+
&ssam_node_bat_ac,
296+
&ssam_node_bat_main,
297+
&ssam_node_tmp_perf_profile_with_fan,
298+
&ssam_node_tmp_sensors,
299+
&ssam_node_fan_speed,
300+
&ssam_node_pos_tablet_switch,
301+
&ssam_node_hid_sam_keyboard,
302+
&ssam_node_hid_sam_penstash,
303+
&ssam_node_hid_sam_sensors,
304+
&ssam_node_hid_sam_ucm_ucsi,
305+
NULL,
306+
};
307+
292308
/* Devices for Surface Laptop Go. */
293309
static const struct software_node *ssam_node_group_slg1[] = {
294310
&ssam_node_root,
@@ -401,8 +417,11 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
401417
/* Surface Laptop Go 3 */
402418
{ "MSHW0440", (unsigned long)ssam_node_group_slg1 },
403419

404-
/* Surface Laptop Studio */
405-
{ "MSHW0123", (unsigned long)ssam_node_group_sls },
420+
/* Surface Laptop Studio 1 */
421+
{ "MSHW0123", (unsigned long)ssam_node_group_sls1 },
422+
423+
/* Surface Laptop Studio 2 */
424+
{ "MSHW0360", (unsigned long)ssam_node_group_sls2 },
406425

407426
{ },
408427
};

0 commit comments

Comments
 (0)