From 4770bf2071b2eda4ad3095e19713d3d95b6d51a0 Mon Sep 17 00:00:00 2001 From: Justin White Date: Mon, 24 Aug 2026 17:39:14 -0500 Subject: [PATCH 1/2] platform/surface: registry: omit SP11 SAM battery node Qualcomm battmgr is the authoritative battery provider on the Surface Pro 11. Do not instantiate the primary Surface Aggregator Module battery device in the Denali-specific software-node group, avoiding a duplicate battery provider without adding a machine quirk to the shared driver. Keep the separate SAM AC-adapter node registered. This extracts and narrows the Denali battery fix from the original combined touchscreen and battery commit. Link: https://github.com/ooaklee/linux_ms_dev_kit-sp11/commit/3fc7c5249f4aa9ef70d1f63e82201c8a21b33827 Signed-off-by: Justin White Signed-off-by: Leon Silcott --- drivers/platform/surface/surface_aggregator_registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c index d37a7e4c6b02a6..83e2a8eeeca33d 100644 --- a/drivers/platform/surface/surface_aggregator_registry.c +++ b/drivers/platform/surface/surface_aggregator_registry.c @@ -408,8 +408,8 @@ static const struct software_node *ssam_node_group_sp9_5g[] = { static const struct software_node *ssam_node_group_sp11[] = { &ssam_node_root, &ssam_node_hub_kip, + /* Primary battery data is provided by Qualcomm battmgr. */ &ssam_node_bat_ac, - &ssam_node_bat_main, &ssam_node_tmp_sensors, &ssam_node_hid_kip_keyboard, &ssam_node_hid_kip_penstash, From 688be66e78fd1d04ea49eba86f46d3818f23aec2 Mon Sep 17 00:00:00 2001 From: Leon Silcott Date: Tue, 1 Sep 2026 06:05:14 +0100 Subject: [PATCH 2/2] platform/surface: aggregator_registry: omit SP11 SAM AC node The X1E Qualcomm battery manager registers qcom-battmgr-ac as the authoritative mains supply. Retaining the Surface Aggregator ADP1 node creates a second mains interface for the same Denali power source. Follow the upstream Surface Laptop 7 precedent and omit the SAM AC node from the Denali-only registry group. Keep this correction separate from the Justin White battery-node extraction so its original authorship and sign-off remain intact. Link: https://github.com/torvalds/linux/commit/0488073a6c84571dd3cffe581a4a73a5fceb099d Signed-off-by: Leon Silcott --- drivers/platform/surface/surface_aggregator_registry.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c index 83e2a8eeeca33d..c10c2cb9199990 100644 --- a/drivers/platform/surface/surface_aggregator_registry.c +++ b/drivers/platform/surface/surface_aggregator_registry.c @@ -408,8 +408,6 @@ static const struct software_node *ssam_node_group_sp9_5g[] = { static const struct software_node *ssam_node_group_sp11[] = { &ssam_node_root, &ssam_node_hub_kip, - /* Primary battery data is provided by Qualcomm battmgr. */ - &ssam_node_bat_ac, &ssam_node_tmp_sensors, &ssam_node_hid_kip_keyboard, &ssam_node_hid_kip_penstash,