From patchwork Sun May 23 13:45:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Luz X-Patchwork-Id: 12274871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10108C47081 for ; Sun, 23 May 2021 13:46:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E211B611CB for ; Sun, 23 May 2021 13:46:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231766AbhEWNrn (ORCPT ); Sun, 23 May 2021 09:47:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231744AbhEWNrk (ORCPT ); Sun, 23 May 2021 09:47:40 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17991C06138A; Sun, 23 May 2021 06:46:14 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id o127so13531864wmo.4; Sun, 23 May 2021 06:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cNcfLpz0vUxqJWLN0Vstq7hzDU9wT7LpyzkE9U/3cdM=; b=VqY8cA6lR7ksWcc0dBv8VcLJxkOEVSkT/EWfMNeLrLOlCgGZOGeaqasCeGAyZR8id4 IHCJyyzIg7gubPDVWYsjUWgHx8oUGeInKlX6RSNR6J5eKZycD4pgXAS+TLIMcDOkg1dA oiNac74ahE353dBExoTKMybLekklE0Atf9puds3KCJTger9/SdQaX6AfJeHMWNvRW2LK 8pdbC9D86bbHs0o3Pz1N9tbJ2aWEV/Yxo0JT5qwiom9Bdbp+CfyYZin5/Gx0T2Jk2qcF m4jUMXS42Nzv+zmlZEci9ZAyFVAKDLAQbKASWz3gF9xic7d0NW1e+O6v0z2szRLhfXhC paqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cNcfLpz0vUxqJWLN0Vstq7hzDU9wT7LpyzkE9U/3cdM=; b=Rh+6COEA3nwuLicK29zvLRXezyqppAKxLwchaBTwmgOl4n/9uN0oGUQl12+9aECNa0 SyKshA4dI9rqj2j2L3ociebD+HSPVqHX4c+BA0xsIEvWYBLBhxJ3TuWgGcr23bH52FSI 5dloDWjRtVqdkOUropO3E51TrTskpnIyas7yjqbUUoxTEd/eI50sBJHst7Guvr9gl1/C MrTvqOy4rE63xJHHn5cPi6mr5i3G2Xx0eXiwgmNOth1seZfZdwbtEvJhKf8iy3UG+qyU QJY9wj54Ssa32Z5IKdvlrTvAP6mD3ykJ7UXKxhakXzkiWamn/6oKIHQjPcYRkgzpddZe DeLA== X-Gm-Message-State: AOAM530p3ii+cHplgHZpP0pg6L4W3tn7n1DNAg0c7QGzupdoVFDqXjRC svbI/kUa5kxneIMHIzqZb8A= X-Google-Smtp-Source: ABdhPJzaIuJ4pwJinmguVlH5yWVWMlUbuqKOarHFJDkfagP3/mmK/uItDFlKWxmoHeeIjqQDF/1+NQ== X-Received: by 2002:a05:600c:1994:: with SMTP id t20mr15875343wmq.177.1621777572730; Sun, 23 May 2021 06:46:12 -0700 (PDT) Received: from xws.localdomain ([37.58.58.229]) by smtp.gmail.com with ESMTPSA id z188sm5112414wme.38.2021.05.23.06.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 May 2021 06:46:12 -0700 (PDT) From: Maximilian Luz To: Hans de Goede Cc: Mark Gross , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Maximilian Luz Subject: [PATCH 1/3] platform/surface: aggregator_registry: Update comments for 15" AMD Surface Laptop 4 Date: Sun, 23 May 2021 15:45:26 +0200 Message-Id: <20210523134528.798887-2-luzmaximilian@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210523134528.798887-1-luzmaximilian@gmail.com> References: <20210523134528.798887-1-luzmaximilian@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org 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 --- 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 */ From patchwork Sun May 23 13:45:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Luz X-Patchwork-Id: 12274873 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FDCDC47082 for ; Sun, 23 May 2021 13:46:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 602676115C for ; Sun, 23 May 2021 13:46:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231771AbhEWNro (ORCPT ); Sun, 23 May 2021 09:47:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231765AbhEWNrm (ORCPT ); Sun, 23 May 2021 09:47:42 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01D49C061574; Sun, 23 May 2021 06:46:16 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id x8so25719161wrq.9; Sun, 23 May 2021 06:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a6UoVs+M+GXbEK+vfTQ5QS4iJpNuK+tJFLeCY/X2pxU=; b=CjQLdjk2huDsLPFjg7zYP9ydXHuaaWIN3m+Mf1VC/3ElkxcdnQCn//6CKhefrK4KeM pveV03SZ/xQWhJNQfYJs0pedfj7+P/F6JgiJdViY46mm3B765R+RnMlpWsJfehez+ZXt k2dZfpCjKRSbrauUa4egfxpEKy+fmVQHv+iMFwWD0YE/Jjv+bgOYRJpAxqaFoBNssqUA YX/y+KYspszuYaX+Vt3rfUk8hN7nnS9IPcCSTAyA9Jrl/WdNddZQ5vsc3UgBxXSSIJ75 ET7dtCH3q++oWer+leTXCkkp/GjRCdCX3WfW6pxISfT8lvUohSZ2p6mi1I5RFKM4cbN/ raxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a6UoVs+M+GXbEK+vfTQ5QS4iJpNuK+tJFLeCY/X2pxU=; b=FEZ+AG3nYh54q6ullAfcL7WEeYDdYJOqNZ2n9z2GifPmOoms9TRn99kfRVVFTW1ng7 T6y9sKxNNWGu7pQX5hhyBDGQD1ssFxetyUGnH2YEIUEvfFGuq2/6PLhj7dpoRUdU3Ueg Ci+hXgGcCaSC0/D3T2DQt8L9ACRASJagp5pKGJqpjb1ftL8e7sJHlnTsVLyH67E3rFjV q9dQQ0UkMRwZZTrwH4ATbkWVVZby8gr8GussYN4oXSi2J5aqgcRI+LG/8WE6oGoOvfwl ozluB8HrJ9TPNLcus1hy7uKydFpIX61boAaFAaSeFMf+Isry43Nmh+1upVWPUIbHDWYE F59g== X-Gm-Message-State: AOAM532RavpV/rp+K7Tq59h4nmCaRulTIuRrftXbdLC4kPeJ0uf5ZeqF MBacgvJ/xiN6npCetbXsAJ0= X-Google-Smtp-Source: ABdhPJykCZECcHdAWK0Qq4kcIS0ikOR341wSf/g3aKkcGVtGehVMb/PVshyVA+QskWc/xWM3L/eU0Q== X-Received: by 2002:adf:9785:: with SMTP id s5mr2852657wrb.276.1621777574552; Sun, 23 May 2021 06:46:14 -0700 (PDT) Received: from xws.localdomain ([37.58.58.229]) by smtp.gmail.com with ESMTPSA id z188sm5112414wme.38.2021.05.23.06.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 May 2021 06:46:13 -0700 (PDT) From: Maximilian Luz To: Hans de Goede Cc: Mark Gross , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Maximilian Luz Subject: [PATCH 2/3] platform/surface: aggregator_registry: Add support for 13" Intel Surface Laptop 4 Date: Sun, 23 May 2021 15:45:27 +0200 Message-Id: <20210523134528.798887-3-luzmaximilian@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210523134528.798887-1-luzmaximilian@gmail.com> References: <20210523134528.798887-1-luzmaximilian@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org 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 --- 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 }, From patchwork Sun May 23 13:45:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Luz X-Patchwork-Id: 12274875 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67FFFC4707A for ; Sun, 23 May 2021 13:46:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 467336115C for ; Sun, 23 May 2021 13:46:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231788AbhEWNrp (ORCPT ); Sun, 23 May 2021 09:47:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231784AbhEWNrp (ORCPT ); Sun, 23 May 2021 09:47:45 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 278ABC06138A; Sun, 23 May 2021 06:46:17 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id n2so25820527wrm.0; Sun, 23 May 2021 06:46:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fc3G6exJieu9OL4lvjd+2d/FQ/AgmvBVDDkwAj8ehdk=; b=U4H3Fgky50WtLxLLaUenJD9ELdNCml1iPrd9Ef2y7ncNA250IzIQ/Oh+wYcSvNnCpL gLY6rZpLXTyrIvT5jS0KpwkM5McN2uQkpNu2ZHI/Qp/mH1Dp4/Cgwbnhi+GmiGSh/yj5 iK1iCaLK4IdvXYaR2bRwIMu4PVudImb08vmBjaRl23e1LImhttSXj2MkgJa/kfxsEhdo TBMAk90ayJ4trPUAylNCoyblo9W0ScZv1Yd1zf8Hc8YzciMyRgQMwayKV03xP2S1W2b0 VsHJoSsD1HzQm73KXUeV5Vgr/sJg5I0Ly9kHMJXSBedvkBRSk9Z9+SGhYCZM7uzLX1ap gtWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fc3G6exJieu9OL4lvjd+2d/FQ/AgmvBVDDkwAj8ehdk=; b=ZzK1pqoYddGIr0pYYG0W7kMJdTAtMTFjMkseXNFCK2lKGQnATzVDUkvKIpT/yjuFG1 YZ6IF+vGM8dQs9F49cr8LeYHCEseahbft2Xks2tHD7J4yX84wfzKZjtfG+ZoGCqZ9acL O16fRS1/oL7nkuhQadkSsOW4RhNff6KvOSKf8duNra4mIWbXKif8Px6OmvcOVLnNaiQI ksmoMJceExjgoyXTzRq935j+pt78xUD0ZZvaLO4AOr4YRA6zen5AGLV9hrQ+UU5U4gds mR58hM7T3MF33Whe1j6+IW3pNonMU8cG+kt2xfceuEZYEMTDJYIyDsq6cT6kdD3V3GFl 61kg== X-Gm-Message-State: AOAM532wi9XJWXhm4t4du6QWIBHFjM/rA9Nb+ULcWtMqNdsuqOPGW4Ey 4+V4mGlcTkmrHxLzbiBskEM= X-Google-Smtp-Source: ABdhPJyn3eRbyc9jx8EeAu8Lf/hMfcd9sctBYbJoh+P9HAU90yp5Y/d8BOUrt5S5cKixS18nG+E4Uw== X-Received: by 2002:a5d:62d0:: with SMTP id o16mr18579057wrv.164.1621777575779; Sun, 23 May 2021 06:46:15 -0700 (PDT) Received: from xws.localdomain ([37.58.58.229]) by smtp.gmail.com with ESMTPSA id z188sm5112414wme.38.2021.05.23.06.46.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 May 2021 06:46:15 -0700 (PDT) From: Maximilian Luz To: Hans de Goede Cc: Mark Gross , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Maximilian Luz Subject: [PATCH 3/3] platform/surface: aggregator_registry: Consolidate node groups for 5th- and 6th-gen devices Date: Sun, 23 May 2021 15:45:28 +0200 Message-Id: <20210523134528.798887-4-luzmaximilian@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210523134528.798887-1-luzmaximilian@gmail.com> References: <20210523134528.798887-1-luzmaximilian@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org 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 --- .../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 },