platform/surface: omit duplicate SP11 SAM power supplies - #90
Draft
ooaklee wants to merge 2 commits into
Draft
Conversation
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: 3fc7c52 Signed-off-by: Justin White <kyjus25@gmail.com> Signed-off-by: Leon Silcott <leon@boasi.io>
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: torvalds@0488073 Signed-off-by: Leon Silcott <leon@boasi.io>
ooaklee
added a commit
to ooaklee/linux_ms_dev_kit-sp11
that referenced
this pull request
Sep 1, 2026
Integrate jglathe#90 as the prerequisite for the SP11 platform-profile topic.
ooaklee
added a commit
to ooaklee/linux_ms_dev_kit-sp11
that referenced
this pull request
Sep 1, 2026
Integrate jglathe#91 for combined SP11 testing. Resolve the jglathe#90 prerequisite overlap by retaining the Denali-scoped battery-provider omissions alongside the profile and fan nodes. Signed-off-by: Leon Silcott <leon@boasi.io>
jglathe
force-pushed
the
jg/ubuntu-qcom-x1e-7.2.y
branch
from
September 3, 2026 10:32
87bcf07 to
4943ee7
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Dependency and status
This PR targets
jg/ubuntu-qcom-x1e-7.2.ydirectly and follows the split audio topics in review order:There is no code dependency on #89. The two-commit branch is based directly on the release branch and does not merge #89, any other prerequisite head, the broad
-sp11staging branch, or the correction merged through #81.032e174490d2ede881771cb368e86540b3a8818b688be66e78fd1d04ea49eba86f46d3818f23aec2This PR is a draft until the exact branch has passed the battery/AC and non-SP11 registry checks below.
Containment
ssam_node_group_sp11software-node groupssam_node_bat_mainandssam_node_bat_acqcom-battmgr-batandqcom-battmgr-ac, so Denali keeps one kernel provider for each roleThis follows upstream commit 0488073a6c84, which removes both SAM nodes on Surface Laptop 7 because Qualcomm battmgr otherwise creates duplicate battery and mains power supplies.
Provenance
The first focused commit preserves @kyjus25 (Justin White) as author with his source author date and original
Signed-off-by: Justin White <kyjus25@gmail.com>. Leon Silcott's authorizedSigned-off-by: Leon Silcott <leon@boasi.io>is appended for the rewritten submission.That commit links to the original combined touchscreen-and-battery change 3fc7c5249f4a, keeping Justin's contribution visible. The second commit is authored and signed off by Leon and links to the upstream dual-provider precedent; it does not broaden Justin's authored rewrite.
Validation completed at the exact head
git diff --check 032e174490d2ede881771cb368e86540b3a8818b..688be66e78fd1d04ea49eba86f46d3818f23aec2: passubuntu_x1e_defconfigW=1build ofsurface_aggregator_registry.owith 10 jobs: passHardware checks still required
/sys/class/power_supply/containsqcom-battmgr-batandqcom-battmgr-acbut no DenaliBAT1orADP1qcom-battmgr-ac/onlineand the battery charge state follow it without a second mains interface