From: James Calligeros <jcalligeros99@gmail.com>
To: "Martin Povišer" <povik+lin@cutebit.org>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Sven Peter" <sven@kernel.org>, "Janne Grunau" <j@jannau.net>,
"Neal Gompa" <neal@gompa.dev>,
"David Rhodes" <david.rhodes@cirrus.com>,
"Richard Fitzgerald" <rf@opensource.cirrus.com>,
"Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>, "Ulf Hansson" <ulfh@kernel.org>,
"Amit Kucheria" <amit.kucheria@linaro.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
"Lars-Peter Clausen" <lars@metafoo.de>,
"Vinod Koul" <vkoul@kernel.org>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Shenghao Ding" <shenghao-ding@ti.com>,
"Kevin Lu" <kevin-lu@ti.com>, "Baojun Xu" <baojun.xu@ti.com>,
"Sen Wang" <sen@ti.com>,
"James Calligeros" <jcalligeros99@gmail.com>,
"James Schulman" <james.schulman@cirrus.com>
Cc: asahi@lists.linux.dev, linux-sound@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
patches@opensource.cirrus.com, "Takashi Iwai" <tiwai@suse.de>,
linux-mediatek@lists.infradead.org,
"Martin Povišer" <povik@protonmail.com>,
"Hector Martin" <marcan@marcan.st>,
"Sasha Finkelstein" <k@chaosmail.tech>
Subject: [PATCH 00/28] Add speaker and headset jack support for Apple Silicon Macs
Date: Sun, 20 Sep 2026 14:53:39 +1000 [thread overview]
Message-ID: <20260920-macaudio-v1-0-741cc20a74e5@gmail.com> (raw)
Hi folks,
This series finalises support for the main
audio subsystem on Apple Silicon Macs. It adds a machine driver
called macaudio, which is based on an RFC sent many years ago
by Martin Povišer[1]. The driver uses the DPCM model to dynamically
glue a backend DAI (combination of MCA ports and codecs) to a
frontend PCM. While this theoretically allows us to route any
backend to any frontend, this is not used in practice; the "Primary"
frontend is always used for the headset codec and the "Secondary"
is always used for the speakers.
The audio subsystem on Apple Silicon Macs is rather complicated.
The speaker arrangement is highly variable; some machines have a
single mono woofer while others pull together multiple woofers
and tweeters into a single stereo pair. The driver also exposes
the headset jack's capture PCM. The builtin microphones on equipped
Apple Silicon Macs are not handled by this driver as they are
connected to the Always-On Processor (not actually always on).
Many functions which are handled by firmware on other platforms
must be handled by the kernel or userspace. Most notably, speaker
protection is handled by speakersafetyd[2], a userspace daemon.
The macaudio machine driver facilitates this by exposing a capture
PCM from which the voltage and current across each speaker's voice
coil can be read. Given that there are absolutely no hardware or
firmware level failsafes preventing permanent damage to the fragile
speakers found on these machines, the driver also implements a
failsafe that will mute and lock the kcontrol of every speaker
unless speakersafetyd is running.
This (rather large, sorry) series is split up into logical sections:
1. Devicetree binding for the macaudio driver;
2. Minor ALSA/ASoC fixes required to drive the audio subsystem on
these machines correctly;
3. Minor ALSA/ASoC API additions to facilitate the driver's
integration with speakersafetyd and the insane combinatorics
required to cater for such a wide array of possible setups;
4. The machine driver itself; and
5. Devicetree updates for M1 and M2 series machines.
Adding the required Devicetree updates for M3 series devices would
have bloated this series to an unreasonable size as they are still
missing most prerequisite hardware nodes. They will be added in a
future series.
Regards,
James
[1] https://lore.kernel.org/asahi/20220606191910.16580-1-povik+lin@cutebit.org/
[2] https://github.com/AsahiLinux/speakersafetyd
---
Hector Martin (6):
ASoC: cs42l42: Set a faster digital ramp-up rate
ASoC: apple: mca: Fix PD link double-frees
alsa: pcm: Remove the qos request only if active
ALSA: dmaengine: Always terminate DMA when a PCM is closed
ALSA: control: Add kcontrol callbacks for lock/unlock
ASoC: ops: Export snd_soc_control_matches()
James Calligeros (13):
ASoC: tas2764: Set up V/ISENSE on codec probe
arm64: dts: apple: t8103-j274: Add speaker/headset jack nodes
arm64: dts: apple: t8103-j313: Add speaker/headset jack nodes
arm64: dts: apple: t8103-j293: Add speaker/headset jack nodes
arm64: dts: apple: t8103-j45x: Add headset jack nodes
arm64: dts: apple: t8112-j413: Add speaker/headset jack nodes
arm64: dts: apple: t8112-j415: Add speaker/headset jack nodes
arm64: dts: apple: t8112-j473: Add speaker/headset jack nodes
arm64: dts: apple: t8112-j493: Add speaker/headset jack nodes
arm64: dts: apple: t600x-j31x: Add speaker/headset jack nodes
arm64: dts: apple: t600x-j375: Add speaker/headset jack nodes
arm64: dts: apple: t602x-j41x: Add speaker/headset jack nodes
arm64: dts: apple: t602x-j47x: Add speaker/headset jack nodes
Martin Povišer (9):
dt-bindings: sound: Add Apple Macs sound peripherals
ASoC: cs42l42: Fix typo
ALSA: Support nonatomic dmaengine PCMs
ASoC: ops: Move guts out of snd_soc_limit_volume
ASoC: ops: Accept patterns in snd_soc_limit_volume
ASoC: ops: Introduce 'snd_soc_deactivate_kctl'
ASoC: ops: Introduce 'soc_set_enum_kctl'
ASoC: card: Let 'fixup_controls' return errors
ASoC: apple: Add macaudio machine driver
.../bindings/sound/apple,macaudio.yaml | 235 ++++
.../arm64/boot/dts/apple/t6000-j314s.dts | 5 +
.../arm64/boot/dts/apple/t6000-j316s.dts | 5 +
.../arm64/boot/dts/apple/t6001-j314c.dts | 5 +
.../arm64/boot/dts/apple/t6001-j316c.dts | 5 +
.../arm64/boot/dts/apple/t6001-j375c.dts | 5 +
.../arm64/boot/dts/apple/t6002-j375d.dts | 5 +
.../boot/dts/apple/t600x-j314-j316.dtsi | 128 ++
.../arm64/boot/dts/apple/t600x-j375.dtsi | 58 +
.../arm64/boot/dts/apple/t6020-j414s.dts | 5 +
.../arm64/boot/dts/apple/t6020-j416s.dts | 5 +
.../arm64/boot/dts/apple/t6020-j474s.dts | 5 +
.../arm64/boot/dts/apple/t6021-j414c.dts | 5 +
.../arm64/boot/dts/apple/t6021-j416c.dts | 5 +
.../arm64/boot/dts/apple/t6021-j475c.dts | 5 +
.../arm64/boot/dts/apple/t6022-j475d.dts | 5 +
.../boot/dts/apple/t602x-j414-j416.dtsi | 35 +
.../boot/dts/apple/t602x-j474-j475.dtsi | 10 +
arch/arm64/boot/dts/apple/t8103-j274.dts | 60 +
arch/arm64/boot/dts/apple/t8103-j293.dts | 104 ++
arch/arm64/boot/dts/apple/t8103-j313.dts | 75 ++
arch/arm64/boot/dts/apple/t8103-j456.dts | 33 +
arch/arm64/boot/dts/apple/t8103-j457.dts | 33 +
arch/arm64/boot/dts/apple/t8112-j413.dts | 101 ++
arch/arm64/boot/dts/apple/t8112-j415.dts | 125 ++
arch/arm64/boot/dts/apple/t8112-j473.dts | 55 +
arch/arm64/boot/dts/apple/t8112-j493.dts | 101 ++
include/sound/control.h | 7 +
include/sound/cs42l42.h | 4 +
include/sound/soc-card.h | 2 +-
include/sound/soc.h | 8 +-
sound/core/control.c | 16 +-
sound/core/pcm_dmaengine.c | 37 +-
sound/core/pcm_native.c | 5 +-
sound/soc/apple/Kconfig | 19 +
sound/soc/apple/Makefile | 4 +
sound/soc/apple/macaudio.c | 1729 +++++++++++++++++++++++++
sound/soc/apple/mca.c | 16 +-
sound/soc/codecs/cs42l42.c | 12 +-
sound/soc/codecs/tas2764.c | 61 +-
.../soc/mediatek/mt8188/mt8188-mt6359.c | 4 +-
sound/soc/soc-card.c | 12 +-
sound/soc/soc-core.c | 5 +-
sound/soc/soc-ops.c | 182 ++-
44 files changed, 3268 insertions(+), 73 deletions(-)
---
base-commit: 0e5a521109e0d2fb7ac226bd6301ec1facca1c26
change-id: 20260915-macaudio-33c1c4f304da
Best regards,
--
James Calligeros <jcalligeros99@gmail.com>
next reply other threads:[~2026-09-20 4:55 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-20 4:53 James Calligeros [this message]
2026-09-20 4:53 ` [PATCH 01/28] dt-bindings: sound: Add Apple Macs sound peripherals James Calligeros
2026-09-20 4:53 ` [PATCH 02/28] ASoC: cs42l42: Fix typo James Calligeros
2026-09-20 4:53 ` [PATCH 03/28] ASoC: cs42l42: Set a faster digital ramp-up rate James Calligeros
2026-09-20 4:53 ` [PATCH 04/28] ASoC: apple: mca: Fix PD link double-frees James Calligeros
2026-09-20 4:53 ` [PATCH 05/28] alsa: pcm: Remove the qos request only if active James Calligeros
2026-09-20 4:53 ` [PATCH 06/28] ALSA: dmaengine: Always terminate DMA when a PCM is closed James Calligeros
2026-09-20 4:53 ` [PATCH 07/28] ALSA: Support nonatomic dmaengine PCMs James Calligeros
2026-09-20 4:53 ` [PATCH 08/28] ALSA: control: Add kcontrol callbacks for lock/unlock James Calligeros
2026-09-20 4:53 ` [PATCH 09/28] ASoC: ops: Move guts out of snd_soc_limit_volume James Calligeros
2026-09-20 4:53 ` [PATCH 10/28] ASoC: ops: Accept patterns in snd_soc_limit_volume James Calligeros
2026-09-20 4:53 ` [PATCH 11/28] ASoC: ops: Introduce 'snd_soc_deactivate_kctl' James Calligeros
2026-09-20 4:53 ` [PATCH 12/28] ASoC: ops: Introduce 'soc_set_enum_kctl' James Calligeros
2026-09-20 4:53 ` [PATCH 13/28] ASoC: card: Let 'fixup_controls' return errors James Calligeros
2026-09-20 4:53 ` [PATCH 14/28] ASoC: ops: Export snd_soc_control_matches() James Calligeros
2026-09-20 4:53 ` [PATCH 15/28] ASoC: tas2764: Set up V/ISENSE on codec probe James Calligeros
2026-09-20 4:53 ` [PATCH 16/28] ASoC: apple: Add macaudio machine driver James Calligeros
2026-09-20 4:53 ` [PATCH 17/28] arm64: dts: apple: t8103-j274: Add speaker/headset jack nodes James Calligeros
2026-09-20 4:53 ` [PATCH 18/28] arm64: dts: apple: t8103-j313: " James Calligeros
2026-09-20 4:53 ` [PATCH 19/28] arm64: dts: apple: t8103-j293: " James Calligeros
2026-09-20 4:53 ` [PATCH 20/28] arm64: dts: apple: t8103-j45x: Add headset " James Calligeros
2026-09-20 4:54 ` [PATCH 21/28] arm64: dts: apple: t8112-j413: Add speaker/headset " James Calligeros
2026-09-20 4:54 ` [PATCH 22/28] arm64: dts: apple: t8112-j415: " James Calligeros
2026-09-20 4:54 ` [PATCH 23/28] arm64: dts: apple: t8112-j473: " James Calligeros
2026-09-20 4:54 ` [PATCH 24/28] arm64: dts: apple: t8112-j493: " James Calligeros
2026-09-20 4:54 ` [PATCH 25/28] arm64: dts: apple: t600x-j31x: " James Calligeros
2026-09-20 4:54 ` [PATCH 26/28] arm64: dts: apple: t600x-j375: " James Calligeros
2026-09-20 4:54 ` [PATCH 27/28] arm64: dts: apple: t602x-j41x: " James Calligeros
2026-09-20 4:54 ` [PATCH 28/28] arm64: dts: apple: t602x-j47x: " James Calligeros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260920-macaudio-v1-0-741cc20a74e5@gmail.com \
--to=jcalligeros99@gmail.com \
--cc=amit.kucheria@linaro.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=asahi@lists.linux.dev \
--cc=baojun.xu@ti.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=david.rhodes@cirrus.com \
--cc=devicetree@vger.kernel.org \
--cc=j@jannau.net \
--cc=james.schulman@cirrus.com \
--cc=k@chaosmail.tech \
--cc=kevin-lu@ti.com \
--cc=krzk+dt@kernel.org \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-sound@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=matthias.bgg@gmail.com \
--cc=neal@gompa.dev \
--cc=patches@opensource.cirrus.com \
--cc=perex@perex.cz \
--cc=povik+lin@cutebit.org \
--cc=povik@protonmail.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rf@opensource.cirrus.com \
--cc=robh@kernel.org \
--cc=sen@ti.com \
--cc=shenghao-ding@ti.com \
--cc=sven@kernel.org \
--cc=tiwai@suse.com \
--cc=tiwai@suse.de \
--cc=ulfh@kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®