Skip to content

Commit 0a25151

Browse files
qzedReillyBrogan
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 Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com> Patchset: surface-sam
1 parent c3fa78a commit 0a25151

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

drivers/platform/surface/surface_aggregator_registry.c

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ static const struct software_node *ssam_node_group_sl5[] = {
247247
NULL,
248248
};
249249

250-
/* Devices for Surface Laptop Studio. */
251-
static const struct software_node *ssam_node_group_sls[] = {
250+
/* Devices for Surface Laptop Studio 1. */
251+
static const struct software_node *ssam_node_group_sls1[] = {
252252
&ssam_node_root,
253253
&ssam_node_bat_ac,
254254
&ssam_node_bat_main,
@@ -263,6 +263,20 @@ static const struct software_node *ssam_node_group_sls[] = {
263263
NULL,
264264
};
265265

266+
/* Devices for Surface Laptop Studio 2. */
267+
static const struct software_node *ssam_node_group_sls2[] = {
268+
&ssam_node_root,
269+
&ssam_node_bat_ac,
270+
&ssam_node_bat_main,
271+
&ssam_node_tmp_pprof,
272+
&ssam_node_pos_tablet_switch,
273+
&ssam_node_hid_sam_keyboard,
274+
&ssam_node_hid_sam_penstash,
275+
&ssam_node_hid_sam_sensors,
276+
&ssam_node_hid_sam_ucm_ucsi,
277+
NULL,
278+
};
279+
266280
/* Devices for Surface Laptop Go. */
267281
static const struct software_node *ssam_node_group_slg1[] = {
268282
&ssam_node_root,
@@ -373,8 +387,11 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
373387
/* Surface Laptop Go 3 */
374388
{ "MSHW0440", (unsigned long)ssam_node_group_slg1 },
375389

376-
/* Surface Laptop Studio */
377-
{ "MSHW0123", (unsigned long)ssam_node_group_sls },
390+
/* Surface Laptop Studio 1 */
391+
{ "MSHW0123", (unsigned long)ssam_node_group_sls1 },
392+
393+
/* Surface Laptop Studio 2 */
394+
{ "MSHW0360", (unsigned long)ssam_node_group_sls2 },
378395

379396
{ },
380397
};

0 commit comments

Comments
 (0)