Skip to content

nvmem: apple-spmi: populate the RTC child of a Chapel PMIC - #930

Merged
RyanTheTide merged 1 commit into
aurora-silicon:integration/aurorafrom
AxxzyWasTaken:j616c-chapel-rtc
Nov 6, 2026
Merged

RyanTheTide merged 1 commit into
aurora-silicon:integration/aurorafrom
AxxzyWasTaken:j616c-chapel-rtc

Conversation

@AxxzyWasTaken

@AxxzyWasTaken AxxzyWasTaken commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

apple-pmu-rtc binds to the rtc child of the PMU's SPMI node, but apple-spmi-nvmem only populates children on Baku and Abbey PMICs. J616C (M4 Max) has a Chapel PMU with the Abbey alarm layout, so the node in #914 never became a device, and the machine had no RTC wake alarm.

This populates the children of a Chapel PMIC too.

Testing
On a 32-core J616C, with #914's device tree on a slightly older 7.3 base:

  • rtc1 registers as apple-pmu-rtc with a wakealarm.
  • With a 45-second alarm, s2idle exited on its own after 45 seconds.

The driver also compiles on the current base.

@RyanTheTide

Copy link
Copy Markdown
Contributor

Merge train (MTL, 06/11): can't take this yet. Commit 40fada3 ("nvmem: apple-spmi: populate the RTC child of a Chapel PMIC") has no Signed-off-by: from its author, and a sign-off is a hard requirement here (we can't add one on someone else's behalf). Could you amend with git commit --amend -s (or git rebase --signoff) and force-push the branch? I'll gate it again once it's signed.

apple-pmu-rtc binds to the rtc child of the PMU's SPMI node, but the nvmem
driver only populates children on Baku and Abbey PMICs. J616C's PMU is a
Chapel with the Abbey alarm layout, so the node never became a device and
the machine had no RTC wake alarm.

Populate the children of a Chapel PMIC too.

Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
@AxxzyWasTaken

Copy link
Copy Markdown
Contributor Author

Signed off and force-pushed. No code change.

@RyanTheTide

Copy link
Copy Markdown
Contributor

Merge train (MTR, 06/11): merging, now signed off. This adds one compatible to the populate check, so Baku and Abbey PMICs behave exactly as before. The hardware proof is the author's J616C test: rtc1 registered and a 45 s s2idle wake.

Gates: test merge 2d3579ef = integration/aurora 11eccbe + #1005 #994 #930 #658 #992 #1006 #1007 #1008 #531 (#992 has since landed on its own); base 11eccbe.

  • KUnit: drm/apple 112/113 (1 skip); Rust (asahi, incl. asahi_g17_validation_pages) 200/201 (1 skip); arm64 apple-isp-*, apple-pmc, apple-pmgr-pwrstate and thunderbolt 137/138 (1 skip).
  • W=1 on drm/apple, media/apple/isp, pmdomain/apple, thunderbolt and nvmem/apple-spmi-nvmem: 0 new warnings.
  • dt_binding_check (apple,dcp, apple,dart, apple,t8132-isp, apple,spmi-nvmem, apple,pmc): 0 new.
  • Host tests run-host-tests.py 185/185; apple-dcp selftests 86/86.

Hardware (7.3.0-aurora-mtr1106a, one-shot boots, fleet recipe):

  • J616s (M4 Pro) vs fleet17: 0 kernel errors, 0 AVC, 0 failed units; eDP + DP-2, Wi-Fi, Vulkan G16S. Camera NV12 1080p and 720p, and P010 720p, streamed 30 frames each, with no ISP errors. vkcube OK; glmark2 6617/6738/6683 vs fleet17 6646/6555/6664.
  • Neo (A18 Pro), two boots vs fleet16: 0 kernel errors, 0 AVC, os_uuid pin present; eDP, Wi-Fi, Vulkan G17P. Camera NV12 1080p and 720p, no ISP errors. vkcube OK; glmark2 2718/2729/2726/2725 vs fleet16 2043–2108; 0 GPU faults.
  • Both Macs were restored to their default kernels afterwards.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants