From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA04542EEC4 for ; Sun, 18 Oct 2026 05:57:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792303037; cv=none; b=lvoup92QRQsqRwUT2R1GGiuHHtRcT6xUKfrtu5tDYRubnFc5InclsBmcnAgLdl9ZpzEdDYjYK4hR7u1JsqVKOx44DvdVDD6yWuG0YKb8haIrtULmHny0ofPdLRMOrBLqWvLnXUjRWCAX2bcFc3QWSX9Uyl5D09gmXm5JK1Lowcg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792303037; c=relaxed/simple; bh=Ra2ADqrZxWw8PcYD08Ad73OxCM3L+RBKl//X4m5oIQM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J/YNvkysDWso7+7BP1aMBJzMuo9nkVdG5t/xRd1Uc8vw5vQnThL1ImaDTuEFFgIxjVZ3kTZxyBJhgYUXFQ+X2DpMpETachA/tNm8OQiE7Jm4ELoCZpv+ip0AMheXFGadcQyyldsHwUkucp6a4IYEx23gkDaY+sW/U4ntoBH8ShQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mV/7lo7J; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mV/7lo7J" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-3a4b3ac8fb7so615801a91.0 for ; Sat, 17 Oct 2026 22:57:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792303036; x=1792907836; darn=lists.linux.dev; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=6uj/FtW3Fwh1R62fLY15kbSsO1v6D6kwyz703Fo9gvw=; b=mV/7lo7J4Miov2jdWtFggE+tP3p9TYvs39jd7siENrUqZ8JhDH29PFlZ27scZddB6R aV2JFDjeHwZJJ3D2qhUCajm2Kw6VkqO4PcZJNgk28RI8M84TQWpUGXFzTZhmgJidkx8S dPG/dNTPO4rPrrTGT6CVAWcwgA4OoYwx8ZLIC4KsnRfN48dezz3NwPMpKMbNsG9C2bGT uUiL1jkpl9nHVJusPFOK/z5cUWMjXxLKNeUiVuAEUIh+dhWkmy5zMVgxrp8j1JaC6O0b JN/iuC/mx/zM8A5POF6aS3RLaRSA3M5d0JQmLIh4mcc3qo2gLJUwuZbq2yWutgA9v2Oh kCkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792303036; x=1792907836; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=6uj/FtW3Fwh1R62fLY15kbSsO1v6D6kwyz703Fo9gvw=; b=xVq4macCG39rEfreSS7d5rMAqps+IGyWPoK3hGS5K4hNxsaev20cveWEJzj5Tnlxva c4iGdFK/6k4nfrAmuEJUahxAhgcGzVi68zAtq0Wt9AR81MRFfaQM7ySRYnJPLudY8izd pR6ULRT0va35FX2WoMHtTEK9vyNc2gHRrk/a99M/KOtq06oteWnw9SYDXB9zspxW5KRc KxfAAGE5GDkY5rtaxla+vlRmsgZOUJdem93CjWEsAr0ygNWenqEmcxbCaLj6W+SkJXSX jZ1A3fkreLvG2Gbpf0Ab5ZEgYozwGfygf/KJGA0wijCi0lMOKjPGhm5FWNLniirhDVOO 6+Ng== X-Gm-Message-State: AFq9FYKcqTGu04AYkCzaacWFXkFzFpQ2tCehQfdHVdYFPd+uy6XqcTnA rn1SYShP/LpPjMhycVpuoDJn5IYQefQX9CNj9d/bVwHYOxWD4tMuP8+2 X-Gm-Gg: AYBFou1xJqIsvJ/J36c9MbKyEK0BKGFByWspGy0ZcMNCG6Vs4kwW+kCW31A0FwMRd6g X73JijTohXmcuej9wW5Ka+6J9EcgK8lTmUMAEPHHWWZf9D6Sl+UQkM0DEvmHUcSRHUl5DhzIvSe eAfLqHJx03ZwtJPgGwvLZOr6W+4T3Ogv1Fv19OhA9DfKDF0ZvZzXDMYK/TpoK9Tj/5fhQkPyu9K DPFKEno3kO6Rg1fzQjMX/ak5BbWo6KIl5gMhDhKiQvpE/MsLHU2H0JFXIWHOdnJlcm02Hgsr2NI M1mC1/cvfdF/MsvXNvEB9MDYWtxDbhNJaXrR/RGPSERwy2YbBdZuL2+tN3HiohbqkxD7NeuZPYV l0PKRZ+sl3LX4G+ncVs0zDzZyP16MGPOJWjOUNRhZDj2o/pr3uhQRa9DKYz9APX/JuclfM3ILok kn0WafR2vKrDMrDBEKDSKsKQYf5iStEI4VN62Rra39eELOl7BPHtpjZRn/344dq2RQM9Pbw3DtX Shhm7mkERruJ2Sqhqxfq3o+mPxL4XNgH6ti8hghm5wGzWnmbo8n/ZgGPAv39hsdV+dALVTjvZJY vITQgbhDY4iXsTbs4y5LAB/A3h7P5/ahZuPYYAG/+B1akpI= X-Received: by 2002:a17:90a:fc48:b0:3ac:452b:4a63 with SMTP id 98e67ed59e1d1-3acef51e2a9mr4377352a91.55.1792303036007; Sat, 17 Oct 2026 22:57:16 -0700 (PDT) Received: from [10.0.70.21] ([2403:581e:d87e:0:fc2d:ed31:e80e:412d]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3acd0cde4fdsm5511292a91.4.2026.10.17.22.57.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2026 22:57:15 -0700 (PDT) From: James Calligeros Date: Sun, 18 Oct 2026 15:54:11 +1000 Subject: [PATCH v3 17/21] arm64: dts: apple: t8112-j493: Add speaker/headset jack nodes Precedence: bulk X-Mailing-List: asahi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261018-macaudio-v3-17-abdff7741dea@gmail.com> References: <20261018-macaudio-v3-0-abdff7741dea@gmail.com> In-Reply-To: <20261018-macaudio-v3-0-abdff7741dea@gmail.com> To: David Rhodes , Richard Fitzgerald , =?utf-8?q?Martin_Povi=C5=A1er?= , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , James Calligeros , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Sven Peter , Janne Grunau , Neal Gompa Cc: asahi@lists.linux.dev, linux-sound@vger.kernel.org, patches@opensource.cirrus.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3253; i=jcalligeros99@gmail.com; h=from:subject:message-id; bh=Ra2ADqrZxWw8PcYD08Ad73OxCM3L+RBKl//X4m5oIQM=; b=owGbwMvMwCV2xczoYuD3ygTG02pJDFlX4vm8RPZdtn//cm8/66ZbZ3qkfylJuE6dvH9y69mAU 5EfcvsyOyayMIhxMViKKbJsaBLymG3EdrNfpHIvzBxWJpAh0iINDEDAwsCXm5hXaqRjpGeqbahn aKRjrGPEwMUpAFMt+Inhf1Ziz499nNYf3vmJb0hZXCkrl79m/eGqY8e1N81jnj75WSojwxrLe/Y H4/2tN4qrdy8w23DGfcGM8G8LQ9em3DuTeyj3HQcA X-Developer-Key: i=jcalligeros99@gmail.com; a=openpgp; fpr=B08212489B3206D98F1479BDD43632D151F77960 The M2 MacBook Pro integrates Apple-specific variants of the TI TAS2764 and Cirrus CS42L42. Add these nodes and advertise them to the machine driver via the sound node. Signed-off-by: James Calligeros --- arch/arm64/boot/dts/apple/t8112-j493.dts | 108 +++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t8112-j493.dts b/arch/arm64/boot/dts/apple/t8112-j493.dts index 7cea5c594810..8993775da9ab 100644 --- a/arch/arm64/boot/dts/apple/t8112-j493.dts +++ b/arch/arm64/boot/dts/apple/t8112-j493.dts @@ -147,5 +147,113 @@ touchbar0: touchbar@0 { }; }; +/* Audio codecs */ +&i2c1 { + status = "okay"; + + speaker_left_rear: codec@38 { + compatible = "ti,sn012776"; + reg = <0x38>; + interrupts-extended = <&pinctrl_ap 11 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 88 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Left Rear"; + ti,imon-slot-no = <8>; + ti,vmon-slot-no = <10>; + }; + + speaker_left_front: codec@39 { + compatible = "ti,sn012776"; + reg = <0x39>; + interrupts-extended = <&pinctrl_ap 11 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 88 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Left Front"; + ti,imon-slot-no = <0>; + ti,vmon-slot-no = <2>; + }; +}; + +&i2c3 { + status = "okay"; + + speaker_right_rear: codec@3b { + compatible = "ti,sn012776"; + reg = <0x3b>; + interrupts-extended = <&pinctrl_ap 11 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 88 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Right Rear"; + ti,imon-slot-no = <12>; + ti,vmon-slot-no = <14>; + }; + + speaker_right_front: codec@3c { + compatible = "ti,sn012776"; + reg = <0x3c>; + interrupts-extended = <&pinctrl_ap 11 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 88 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Right Front"; + ti,imon-slot-no = <4>; + ti,vmon-slot-no = <6>; + }; + + jack_codec: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + interrupts-extended = <&pinctrl_ap 149 IRQ_TYPE_LEVEL_LOW>; + reset-gpios = <&pinctrl_nub 12 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Jack"; + }; +}; + +/ { + sound: sound { + compatible = "apple,j493-macaudio", "apple,j293-macaudio"; + model = "MacBook Pro J493"; + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = <0>; + + dai-tdm-idle-mode-0 = "zero"; + dai-tdm-idle-mode-2 = "zero"; + dai-tdm-slot-tx-idle-mask-0 = <0xf0f0>; + dai-tdm-slot-tx-idle-mask-2 = <0x0f0f>; + + link-name = "Speakers"; + + codec { + sound-dai = <&speaker_left_front>, + <&speaker_left_rear>, + <&speaker_right_front>, + <&speaker_right_rear>; + }; + + cpu { + sound-dai = <&mca 0>, <&mca 1>; + }; + }; + + dai-link@1 { + reg = <1>; + + link-name = "Headphone Jack"; + + codec { + sound-dai = <&jack_codec>; + }; + + cpu { + sound-dai = <&mca 2>; + }; + }; + }; +}; + #include "hwmon-laptop.dtsi" #include "hwmon-fan.dtsi" -- 2.56.0