|
@@ -1,164 +1,4 @@
|
|
-From 1c0c81136657ad8656e5d713d0d8282d70413e53 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 1c4d74db08c9..f826489dc69d 100644
|
|
|
|
---- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-@@ -395,6 +395,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.46.0
|
|
|
|
-
|
|
|
|
-From 74e058609a1229cfd478690ae2ad0fbb209ee6ed 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 f826489dc69d..ef59a7b66667 100644
|
|
|
|
---- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-@@ -273,8 +273,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,
|
|
|
|
-@@ -289,6 +289,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,
|
|
|
|
-@@ -398,8 +412,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.46.0
|
|
|
|
-
|
|
|
|
-From 61ed1a703286c45a6f9de31053a8041e7e54cd4d Mon Sep 17 00:00:00 2001
|
|
|
|
-From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
-Date: Sun, 9 Jun 2024 20:05:57 +0200
|
|
|
|
-Subject: [PATCH] platform/surface: aggregator_registry: Add support for
|
|
|
|
- Surface Laptop 6
|
|
|
|
-
|
|
|
|
-Add SAM client device nodes for the Surface Laptop Studio 6 (SL6). The
|
|
|
|
-SL6 is similar to the SL5, with the typical battery/AC, platform
|
|
|
|
-profile, and HID nodes. It also has support for the newly supported fan
|
|
|
|
-interface.
|
|
|
|
-
|
|
|
|
-Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
-Patchset: surface-sam
|
|
|
|
----
|
|
|
|
- .../surface/surface_aggregator_registry.c | 19 +++++++++++++++++++
|
|
|
|
- 1 file changed, 19 insertions(+)
|
|
|
|
-
|
|
|
|
-diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-index ef59a7b66667..a20ccf49731c 100644
|
|
|
|
---- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-@@ -273,6 +273,22 @@ static const struct software_node *ssam_node_group_sl5[] = {
|
|
|
|
- NULL,
|
|
|
|
- };
|
|
|
|
-
|
|
|
|
-+/* Devices for Surface Laptop 6. */
|
|
|
|
-+static const struct software_node *ssam_node_group_sl6[] = {
|
|
|
|
-+ &ssam_node_root,
|
|
|
|
-+ &ssam_node_bat_ac,
|
|
|
|
-+ &ssam_node_bat_main,
|
|
|
|
-+ &ssam_node_tmp_perf_profile_with_fan,
|
|
|
|
-+ &ssam_node_tmp_sensors,
|
|
|
|
-+ &ssam_node_fan_speed,
|
|
|
|
-+ &ssam_node_hid_main_keyboard,
|
|
|
|
-+ &ssam_node_hid_main_touchpad,
|
|
|
|
-+ &ssam_node_hid_main_iid5,
|
|
|
|
-+ &ssam_node_hid_sam_sensors,
|
|
|
|
-+ &ssam_node_hid_sam_ucm_ucsi,
|
|
|
|
-+ NULL,
|
|
|
|
-+};
|
|
|
|
-+
|
|
|
|
- /* Devices for Surface Laptop Studio 1. */
|
|
|
|
- static const struct software_node *ssam_node_group_sls1[] = {
|
|
|
|
- &ssam_node_root,
|
|
|
|
-@@ -403,6 +419,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
|
|
|
- /* Surface Laptop 5 */
|
|
|
|
- { "MSHW0350", (unsigned long)ssam_node_group_sl5 },
|
|
|
|
-
|
|
|
|
-+ /* Surface Laptop 6 */
|
|
|
|
-+ { "MSHW0530", (unsigned long)ssam_node_group_sl6 },
|
|
|
|
-+
|
|
|
|
- /* Surface Laptop Go 1 */
|
|
|
|
- { "MSHW0118", (unsigned long)ssam_node_group_slg1 },
|
|
|
|
-
|
|
|
|
---
|
|
|
|
-2.46.0
|
|
|
|
-
|
|
|
|
-From be2709e2a0ddebba3887d730a2e61b7bec2a06f2 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 3e6733db885b3a91339039897cbf0f3e05cda2a5 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Sat, 30 Dec 2023 18:07:54 +0100
|
|
Date: Sat, 30 Dec 2023 18:07:54 +0100
|
|
Subject: [PATCH] hwmon: Add thermal sensor driver for Surface Aggregator
|
|
Subject: [PATCH] hwmon: Add thermal sensor driver for Surface Aggregator
|
|
@@ -384,9 +224,9 @@ index 000000000000..48c3e826713f
|
|
+MODULE_DESCRIPTION("Thermal sensor subsystem driver for Surface System Aggregator Module");
|
|
+MODULE_DESCRIPTION("Thermal sensor subsystem driver for Surface System Aggregator Module");
|
|
+MODULE_LICENSE("GPL");
|
|
+MODULE_LICENSE("GPL");
|
|
--
|
|
--
|
|
-2.46.0
|
|
|
|
|
|
+2.46.1
|
|
|
|
|
|
-From 15ba0027e4d72f580255f8776ee251c94f81cab1 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 3e4479ac556ff21b45485822edb0980bbb27fdba Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Sat, 30 Dec 2023 18:12:23 +0100
|
|
Date: Sat, 30 Dec 2023 18:12:23 +0100
|
|
Subject: [PATCH] hwmon: surface_temp: Add support for sensor names
|
|
Subject: [PATCH] hwmon: surface_temp: Add support for sensor names
|
|
@@ -579,117 +419,5 @@ index 48c3e826713f..4c08926139db 100644
|
|
"surface_thermal", ssam_temp, &ssam_temp_hwmon_chip_info,
|
|
"surface_thermal", ssam_temp, &ssam_temp_hwmon_chip_info,
|
|
NULL);
|
|
NULL);
|
|
--
|
|
--
|
|
-2.46.0
|
|
|
|
-
|
|
|
|
-From b80e50b1a90e22d3a200b085cac567905e56543c Mon Sep 17 00:00:00 2001
|
|
|
|
-From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
-Date: Mon, 10 Jun 2024 21:47:47 +0200
|
|
|
|
-Subject: [PATCH] platform/surface: aggregator_registry: Add fan and thermal
|
|
|
|
- sensor support for Surface Laptop 5
|
|
|
|
-
|
|
|
|
-Patchset: surface-sam
|
|
|
|
----
|
|
|
|
- drivers/platform/surface/surface_aggregator_registry.c | 4 +++-
|
|
|
|
- 1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
-
|
|
|
|
-diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-index a20ccf49731c..2b20c74bbe6d 100644
|
|
|
|
---- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-@@ -265,7 +265,9 @@ static const struct software_node *ssam_node_group_sl5[] = {
|
|
|
|
- &ssam_node_root,
|
|
|
|
- &ssam_node_bat_ac,
|
|
|
|
- &ssam_node_bat_main,
|
|
|
|
-- &ssam_node_tmp_perf_profile,
|
|
|
|
-+ &ssam_node_tmp_perf_profile_with_fan,
|
|
|
|
-+ &ssam_node_tmp_sensors,
|
|
|
|
-+ &ssam_node_fan_speed,
|
|
|
|
- &ssam_node_hid_main_keyboard,
|
|
|
|
- &ssam_node_hid_main_touchpad,
|
|
|
|
- &ssam_node_hid_main_iid5,
|
|
|
|
---
|
|
|
|
-2.46.0
|
|
|
|
-
|
|
|
|
-From 06973bc3db29f5d009d4de6298e0496490c811ee Mon Sep 17 00:00:00 2001
|
|
|
|
-From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
-Date: Mon, 10 Jun 2024 21:48:02 +0200
|
|
|
|
-Subject: [PATCH] platform/surface: aggregator_registry: Add fan and thermal
|
|
|
|
- sensor support for Surface Laptop Studio 2
|
|
|
|
-
|
|
|
|
-Patchset: surface-sam
|
|
|
|
----
|
|
|
|
- drivers/platform/surface/surface_aggregator_registry.c | 4 +++-
|
|
|
|
- 1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
-
|
|
|
|
-diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-index 2b20c74bbe6d..1e7e7ebeb074 100644
|
|
|
|
---- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-@@ -312,7 +312,9 @@ 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_tmp_perf_profile_with_fan,
|
|
|
|
-+ &ssam_node_tmp_sensors,
|
|
|
|
-+ &ssam_node_fan_speed,
|
|
|
|
- &ssam_node_pos_tablet_switch,
|
|
|
|
- &ssam_node_hid_sam_keyboard,
|
|
|
|
- &ssam_node_hid_sam_penstash,
|
|
|
|
---
|
|
|
|
-2.46.0
|
|
|
|
-
|
|
|
|
-From 01cab9f250e8dc4b6a2e784467487f7eb03e7afe Mon Sep 17 00:00:00 2001
|
|
|
|
-From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
-Date: Fri, 28 Jun 2024 22:31:37 +0200
|
|
|
|
-Subject: [PATCH] platform/surface: aggregator_registry: Add Support for
|
|
|
|
- Surface Pro 10
|
|
|
|
-
|
|
|
|
-Patchset: surface-sam
|
|
|
|
----
|
|
|
|
- .../surface/surface_aggregator_registry.c | 22 +++++++++++++++++++
|
|
|
|
- 1 file changed, 22 insertions(+)
|
|
|
|
-
|
|
|
|
-diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-index 1e7e7ebeb074..ec9eb4d375b9 100644
|
|
|
|
---- a/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-+++ b/drivers/platform/surface/surface_aggregator_registry.c
|
|
|
|
-@@ -377,6 +377,25 @@ static const struct software_node *ssam_node_group_sp9[] = {
|
|
|
|
- NULL,
|
|
|
|
- };
|
|
|
|
-
|
|
|
|
-+/* Devices for Surface Pro 10 */
|
|
|
|
-+static const struct software_node *ssam_node_group_sp10[] = {
|
|
|
|
-+ &ssam_node_root,
|
|
|
|
-+ &ssam_node_hub_kip,
|
|
|
|
-+ &ssam_node_bat_ac,
|
|
|
|
-+ &ssam_node_bat_main,
|
|
|
|
-+ &ssam_node_tmp_perf_profile_with_fan,
|
|
|
|
-+ &ssam_node_tmp_sensors,
|
|
|
|
-+ &ssam_node_fan_speed,
|
|
|
|
-+ &ssam_node_pos_tablet_switch,
|
|
|
|
-+ &ssam_node_hid_kip_keyboard,
|
|
|
|
-+ &ssam_node_hid_kip_penstash,
|
|
|
|
-+ &ssam_node_hid_kip_touchpad,
|
|
|
|
-+ &ssam_node_hid_kip_fwupd,
|
|
|
|
-+ &ssam_node_hid_sam_sensors,
|
|
|
|
-+ &ssam_node_hid_sam_ucm_ucsi,
|
|
|
|
-+ NULL,
|
|
|
|
-+};
|
|
|
|
-+
|
|
|
|
-
|
|
|
|
- /* -- SSAM platform/meta-hub driver. ---------------------------------------- */
|
|
|
|
-
|
|
|
|
-@@ -399,6 +418,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
|
|
|
|
- /* Surface Pro 9 */
|
|
|
|
- { "MSHW0343", (unsigned long)ssam_node_group_sp9 },
|
|
|
|
-
|
|
|
|
-+ /* Surface Pro 10 */
|
|
|
|
-+ { "MSHW0510", (unsigned long)ssam_node_group_sp10 },
|
|
|
|
-+
|
|
|
|
- /* Surface Book 2 */
|
|
|
|
- { "MSHW0107", (unsigned long)ssam_node_group_gen5 },
|
|
|
|
-
|
|
|
|
---
|
|
|
|
-2.46.0
|
|
|
|
|
|
+2.46.1
|
|
|
|
|