Repository navigation
ASoC: apple: macaudio: give the J604's tweeters their corner on a grant - #1922
davishann15-commits wants to merge 1 commit into
Conversation
The J604 (MacBook Pro 14-inch, M4) has the J614s's speakers: two woofers and a tweeter per side in the J616s frame. When speakerguardd v2 holds them and declares the crossover, the J614 and J616 configs give the tweeters their device tree playback corner back (tweeter_hpf_granted). The J604's does not, so its tweeters keep the 800 Hz policy floor under v2 as well, which removes the low-frequency thermal pilot from them. Set tweeter_hpf_granted for the J604, as for the J614s. Nothing changes for speakersafetyd, whose unlock never lifts the floor, or for a v2 owner that does not declare the crossover, and every withdrawal restores the floor. Assisted-by: LLM Signed-off-by: Davis Hann <davishann15@gmail.com>
|
Retested on Disclosure: an LLM (Claude) ran these tests on my Mac and drafted this. I did the listening and looking, reviewed it, and am responsible for it. Assisted-by: LLM |
|
Blockers: 1.
I checked the code: HW row: already covered on the J604. Add a regression line from that boot: 0 AVC, 0 failed units, 0 new kernel errors. Assisted-by: LLM (Claude:Opus 5.5) |
Gives the J604's tweeters their device-tree playback corner back while speakerguardd v2 holds the speakers and declares the crossover, as the J614 and J616 configs already do (
tweeter_hpf_granted). It follows #1888, which bound the J604 speakers without it. Without it, the J604's tweeters stay at the 800 Hz floor thatmacaudio_fixup_controls()sets for SN012776 tweeters, even under v2. That removes the low-frequency thermal pilot from them, as the comment ontweeter_hpf_granteddescribes. This changes nothing for speakersafetyd: its unlock never lifts the floor.Testing. On a J604 (Mac16,1, os-fw 26.6.2, system-fw 27.0, aura 1.0.0b13), I tested this end state on linux 2129f55 (alarm-aurora#310's pin) with the equivalent of #1888 plus this line. The amps' values came from the Mac's own ADT; nothing was hardcoded. Userspace was speakerguardd-v2 1.0.0alpha.1-40 and aurora-speaker-upgrade 0.1-0.14, with this Mac's own tuning (AID30, route 1 from the installed macOS):
aurora-speaker-upgrade --check: PASSj604, AID30164e7a0d23003bab(derived, the same as the j614s); voicing within +0.010/-0.102 dB of the 25G83 Audio Unitsspeakerguardd v2 owns the speakers, thenprotection ready: every check holds, granted while a stream plays.Speaker Protection Crossover= on, andLeft/Right Tweeter HPF Corner Frequency=2 Hz, the corner the amps got from the ADT. Without this line they would read800 Hz.I haven't built this exact commit on today's
integration/aurora. The diff is the one line, applied on top of #1888'smacaudio_j604_cfg. I can rebuild and retest on the tip if you want.Assisted-by: LLM