From 5ef1b8c620f46abf1f7d2a9e9822121ea2f5c7a7 Mon Sep 17 00:00:00 2001 From: Joshua Warren <816217+joshuaswarren@users.noreply.github.com> Date: Mon, 9 Nov 2026 21:31:50 -0600 Subject: [PATCH] ASoC: apple: t8152-aop-audio: Match the T6050 AOP audio node The binding and the J714c device tree name the AOP audio service "apple,t6050-aop-audio", but the driver matched only t8142 and t8152, so that node never bound. Add a T6050 hardware config. The J714c ADT audio-speaker stream header (DeviceTree.j714cap) has the same layout as J813's with six amplifiers in place of four: 6 speaker slots and 12 sense words (V, I per amplifier), at 16 bits, on slots vsense 0,4,..20 / isense 2,6,..22. J813's header has 4 slots, 8 sense words and vsense 0..12 / isense 2..14. HW_CFG_T8152 (one amplifier, two sense words) would expose the wrong channel counts, so it is not reused. The sense width and the sense realignment are taken from J813's config by analogy; they are not tested on a J714c. Tested: builds as a module with Rust enabled (clang 19, arm64 defconfig plus CONFIG_RUST, CONFIG_SND_SOC_APPLE_T8152_AOP_AUDIO=m); the object carries the apple,t6050-aop-audio match string. Not tested: no J714c boot, no sound. --- sound/soc/apple/t8152_aop_audio.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sound/soc/apple/t8152_aop_audio.rs b/sound/soc/apple/t8152_aop_audio.rs index 81a224f697491..f0080ccb50669 100644 --- a/sound/soc/apple/t8152_aop_audio.rs +++ b/sound/soc/apple/t8152_aop_audio.rs @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only OR MIT -//! Apple T8152 (J873, Mac mini M6) and T8142 (J813, MacBook Air M5) AOP audio +//! Apple T8152 (J873, Mac mini M6), T8142 (J813, MacBook Air M5) and T6050 +//! (J714c, MacBook Pro 14-inch M5 Max) AOP audio //! //! The AOP firmware owns the audio fabric, as on T8140. The ADT //! (/arm-io/iop-audio-controller) names its services; all of them run on the @@ -582,6 +583,17 @@ static HW_CFG_T8142: HwConfig = HwConfig { realign_sense: true, }; +/// J714c: six amplifiers (left and right woofer 1, woofer 2 and tweeter) in +/// 32-bit slots 0-5, their voltage and current sense back as twelve 16-bit +/// slots (V, I per amplifier) on the stream's RX, as on J813. The ADT +/// audio-speaker stream header gives 6 amplifier slots and 12 sense words. +static HW_CFG_T6050: HwConfig = HwConfig { + spkr_channels: 6, + sense_channels: 12, + sense_formats: FMTBIT_S16_LE, + realign_sense: true, +}; + /// # Safety /// /// `substream` must be live and belong to one of this component's links. @@ -1389,6 +1401,7 @@ kernel::of_device_table!( [ (of::DeviceId::new(c_str!("apple,t8142-aop-audio")), &HW_CFG_T8142), (of::DeviceId::new(c_str!("apple,t8152-aop-audio")), &HW_CFG_T8152), + (of::DeviceId::new(c_str!("apple,t6050-aop-audio")), &HW_CFG_T6050), ] );