Repository navigation
arm64: dts: apple: t8132-j604: enable the speakers - #1888
Conversation
The J604 (MacBook Pro 14-inch, M4) has the J614s's six SN012776 amps, two woofers and a tweeter per side, on the AOP's speaker stream: six playback and twelve sense slots in the J616s frame. Its device tree already describes the amps, their sense slots and the speaker card, all disabled so far. Enable the card and the amps, and bind the J604's speaker link in macaudio. The amps stay at macaudio's safe level until speakersafetyd takes them with the J604 profile (speakersafetyd-aurora-profiles), which starts it for the AppleJ604 card's sense PCM. Assisted-by: LLM Signed-off-by: Friedrich <261542475+aeries0x@users.noreply.github.com>
DjDeveloperr
left a comment
There was a problem hiding this comment.
Reviewed against this tree's speaker-safety rules:
- Kernel side: this enables the card and the amps and sets
enable_speakers, nothing else. macaudio keeps the SN012776 volumes at the lock's ceiling until a protection daemon holds "Speaker Volume Unlock", or a protection engine holds the lease, as on the J614s. With no J604 profile installed, the speakers stay locked, so this fails closed. - Protection: speakersafetyd with the J604 profile from alarm-aurora#311, which is still open. That profile is J504's. The J604's speaker amp configuration in its device tree matches the J504's and J614s's (speaker config, idle masks, DC blocker, brown-out config). The profile's sense channels follow the DT's slot order (LW1, RW1, LW2, RW2, LT, RT).
- Measured on a J604: the daemon reads the V/I sense, with no amp faults in the quiet and the uncapped runs.
On the mux question: following the J614s, with the UCM setting Speaker Playback Mux, is fine.
Approving. macaudio.c has moved since CI ran here (#1856's K116s commit, and now #1884), so I'm updating the branch. It merges once host-tests and dt-checks are green on the new head. The audible path still depends on alarm-aurora#311, which needs its own review.
1f5037a
into
aurora-silicon:integration/aurora
|
A second J604 data point, this time with speakerguardd v2 instead of speakersafetyd. This is the route the speaker team asked the j614s to take, and an Aurora maintainer suggested it to me for the J604 as well. Setup: J604 (Mac16,1, os-fw 26.6.2, system-fw 27.0, aura 1.0.0b13); linux 2129f55 plus the equivalent of this PR plus
On your mux question: with v2, the first switch hit the same PipeWire start problem as the j614s (#1591). The v2 graph opens PipeWire then exits with status 234 and hits its start limit. Selecting Disclosure: an LLM (Claude) did most of the testing on my Mac and drafted this. I listened, reviewed it, and am responsible for it. Assisted-by: LLM |
Enables the internal speakers of the J604 (MacBook Pro 14-inch, M4): the speaker card and the six SN012776 amps in
t8132-j604.dts, andenable_speakersin macaudio's J604 config. The device tree already describes the amps, their sense slots and the card; only thestatus = "disabled"lines and the "not brought up" comments go.Safety on a stock install: macaudio keeps the J604's speaker volumes locked at its safe level until speakersafetyd takes them. speakersafetyd needs the J604 profile and its udev line, which come with
speakersafetyd-aurora-profiles(aurora-silicon/alarm-aurora#311); that PR should be merged and shipped first. Without it the card appears, but the speakers stay at the locked level.Tested on a J604 (Mac16,1, macOS 27.2 stub), this commit on
integration/aurora6df7569, with three test-only commits on top that are not part of this PR (a build without the TAS2770/MAX98357A selects, the AOP client without the low-power input, and a hard -20 dB cap on the speaker volumes); Stage 2 = Aurora's served aura 1.0.0b12.1 + U-Boot aurora11; root with Aurora's speakersafetyd 2.0.1-1.2 and the profile package from the PR above:apple/j604.conf, finds the six speakers onhw:AppleJ604(cold boot); macaudio logs "Speaker volumes unlocked"; amp gain 15 on all six (thespeaker-configlevel aura passes from the ADT); V/I sense on; no amp faults.Userspace routing: like the J614s, the card needs
Speaker Playback Mux= Secondary and the six slots mapped; a J604 UCM file for alsa-ucm-conf-asahi and the J314 tuning in asahi-audio do this (PRs follow this one). In the capped test above the mux was set by hand. macaudio could instead set the mux itself (spk_secondary_only, as for the j8xx/j7xx configs); we followed the J614s. Which do you prefer?Assisted-by: LLM