From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6EE3CA5FCE for ; Sun, 4 Oct 2026 06:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=K9eRBqZKtThzspVubPXk6ZwkfjHPkOgXRwJNp+IkXIw=; b=UohMjq8TW5nqMvRJex00go/Btm +A5I4QDZidsy+FdmOJukjQO/noS2wJXeVQfEydJPNL6mcsgj97tWuTlMvaCk4yeeCVShtjyvLnabr xuq7kqybvCEosQCdP0woG7o2L8SmhVFrTRAo9EOW36nuAVkETFa58YvyVZ2NJzw2TJpoJ2Ye0w0ia 3ZnRWoT/vyqJZGNeveM8VxCN/Qpu4xwL4v5wsyKLnlvKmsnENBMuvGYerhdpATlhddoK3XB4z72gw Al7r+avPuVCvqy1Ix3XZx2BoWj2fcmHqX+mTClqZmzkKJhkd9TaU7r/yDhoTzmLlicYGr24QL3khK JJF4N9xQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDFNI-0000000EPCd-1sMy; Sun, 04 Oct 2026 06:07:04 +0000 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDFNF-0000000EP9s-2fxZ for linux-arm-kernel@lists.infradead.org; Sun, 04 Oct 2026 06:07:02 +0000 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-3a782e791daso461385a91.0 for ; Sat, 03 Oct 2026 23:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791094021; x=1791698821; darn=lists.infradead.org; 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=K9eRBqZKtThzspVubPXk6ZwkfjHPkOgXRwJNp+IkXIw=; b=Pv9jcpEppwC5KRaxgPKfcbyww8jGKlkvErXmvh/j5a/LZafbrf4kt7Th6zkTfh9Nu8 JAqaFE+OSmYSrnde0F6VE+aJWUl3rO/ZcpQwhLRKFeHpobfpjIHfoDVnrVQZHOqhBntt hb7VS+aWtu1xk3xZOprGJcgXQRl22e3FERCBjltFgz0D+S6zEyRpku5tzmbhq26WM+j/ NPfi6RLJavtcYQTb3QqW0w7CFQ7wTjyEcggdUv6VLQIejDZeIrkexcBHaRigL1Cwn2im o7oBtbp7btp5VpkoanGjyl7wEjMpGAIAfD/y5CKkgZ28xLDpjUqXxsuoL9NjWvWaZEyA n4wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791094021; x=1791698821; 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=K9eRBqZKtThzspVubPXk6ZwkfjHPkOgXRwJNp+IkXIw=; b=jIjC2J1z2frTUIQB3+MG4/W973T/OU2+fRV4hqthn4exGPKDgkx3Bu9p1QHAqe5oNT ya0J9BEsbYSpqYpLmCyhv2XjTJljitLkKC8l+jVhIRy3AYo0YB/eHXWNyqS7483e31ln ILCwTomuql4BOscEeCVQodzFF4ctMmG0CTGJI9dzbbGChWfaAwzh7QJZgWLG2zU///uH fWCqDleoAZJbO/ELB0fyrb+Xi1q2zXBN6AaR+39HN68CSMVdFq8INM9G2Pe3BZTs8Jp1 fpi3qKS/HA1bLMdodJNfBeCrCy4my/0LGjAXvY48DUF8OqoNpcj3+v7jqe44r63/M2Pq uZGg== X-Forwarded-Encrypted: i=1; AKwUvBwMFPW1xrW+v6R8kMXtPEOiW/TMPeiHG+i3Etgl23Xwhq1i9BuzAgya/1+iH22Vn4KzW2BDqswGsX9XJA7XFRog@lists.infradead.org X-Gm-Message-State: AFq9FYLDbMWJGfxY+Szv3aBuvNt2uHZu+/sIcoyHs8aNiDLYqiPs+Sfi pr9yMwEVCzf/ib+hyet7tjn78qAuNYFnGpyjsW/dXHcLk+MrKY7yYKtx X-Gm-Gg: AYBFou32TMbpnsHwqpb4J+lCZFzLsNdWvdD4/Anec0tMyL31+WWgln724qoBuaV5pc1 rKFNhLvo2FSUqiqbmas8gc/yPJXR2U6yRwuFAMgCCZ0YWqNSHLVbiuAojDsBhxznflSMoJQMrM9 x1d545sQN6f/gMJAIRvB5rljmMDTCaHswTwDiVUoGKrAJkYZAOCCRMUlWS8fzjBK+8LbQ/UgXP0 9mgMsml+hcjKCLu4ddNGtMHsv13vT4E20rYUtnexxbjKcs/BT5SK/EdC+1hsoggp1L5+Qyq/HOh zDTfgJ+BHHMyIk5OBEYr3npLkFnMU//eoZajhOxULVw2FT/xd2vwEUSp+prVuBmz5TICsPv3RXk TOuloiMtAi0rJAm8PJHvSPWzC4UGiEZDmtHm18syqw8Q6zMzUdWV55aHbr/XtzigkTXpjFuxIlH UYRfxPkxbbsAsqGerseyVfw5JEpZetQOHv0x/q5Odc2DqcnBy7WawbRZ56RfiPJf091Q1JYq6ol g9w2nk7CNIoX78Lpq7XIyXWnOdQM0ZOhSo3G+FKnUZ38hFMDtX72sJoI/1MoqE+AtjpMSNejOgJ ej3FJ12rvfYRcnQwSdYe+xaJcgq9+zHC850CwEi/z07CVf8= X-Received: by 2002:a17:90b:3889:b0:3a4:c11d:b78b with SMTP id 98e67ed59e1d1-3a7871846cdmr2805455a91.22.1791094020938; Sat, 03 Oct 2026 23:07:00 -0700 (PDT) Received: from [192.168.2.3] ([2403:581e:d87e:0:fc2d:ed31:e80e:412d]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a78d4a869esm5844094a91.2.2026.10.03.23.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2026 23:07:00 -0700 (PDT) From: James Calligeros Date: Sun, 04 Oct 2026 16:03:46 +1000 Subject: [PATCH v2 19/21] arm64: dts: apple: t600x-j375: Add speaker/headset jack nodes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261004-macaudio-v2-19-7b47ed6335a8@gmail.com> References: <20261004-macaudio-v2-0-7b47ed6335a8@gmail.com> In-Reply-To: <20261004-macaudio-v2-0-7b47ed6335a8@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.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2977; i=jcalligeros99@gmail.com; h=from:subject:message-id; bh=USmIbIxNd8CqGfdxvcD6LlyT9J8+ju7yBuayKmryPMY=; b=owGbwMvMwCV2xczoYuD3ygTG02pJDFkH3+R3zmUMuv0m3bzStIRRUaPBfw7vqY5lc39fP9q69 GiQ0rOlHRNZGMS4GCzFFFk2NAl5zDZiu9kvUrkXZg4rE8gQaZEGBiBgYeDLTcwrNdIx0jPVNtQz NNIx1jFi4OIUgKk2L2VkeLNmctGcwpI73e6/d0ZHPr/JbVZpJrXj04UazzW753Gf6GH4Hyg70+V tm82UkPQJjimL7NavrqsOn8xtLhGybFao409bLgA= X-Developer-Key: i=jcalligeros99@gmail.com; a=openpgp; fpr=B08212489B3206D98F1479BDD43632D151F77960 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261003_230701_709198_48E6AD58 X-CRM114-Status: GOOD ( 11.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The M1 Max/Ultra Mac Studio 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 --- .../arm64/boot/dts/apple/t6001-j375c.dts | 5 ++ .../arm64/boot/dts/apple/t6002-j375d.dts | 5 ++ .../arm64/boot/dts/apple/t600x-j375.dtsi | 65 +++++++++++++++++++++++++ 3 files changed, 75 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6001-j375c.dts b/arch/arm64/boot/dts/apple/t6001-j375c.dts index 08276114c1d8..2e544f43b085 100644 --- a/arch/arm64/boot/dts/apple/t6001-j375c.dts +++ b/arch/arm64/boot/dts/apple/t6001-j375c.dts @@ -25,4 +25,9 @@ &bluetooth0 { brcm,board-type = "apple,okinawa"; }; +&sound { + compatible = "apple,j375-macaudio"; + model = "Mac Studio J375"; +}; + #include "hwmon-fan-dual.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6002-j375d.dts b/arch/arm64/boot/dts/apple/t6002-j375d.dts index e6eb6b6c386d..dfdf90fb1825 100644 --- a/arch/arm64/boot/dts/apple/t6002-j375d.dts +++ b/arch/arm64/boot/dts/apple/t6002-j375d.dts @@ -184,6 +184,11 @@ atcphy5_usb3: endpoint { }; }; +&sound { + compatible = "apple,j375-macaudio"; + model = "Mac Studio J375"; +}; + #include "hwmon-fan-dual.dtsi" /* delete unused USB nodes on die 1 */ diff --git a/arch/arm64/boot/dts/apple/t600x-j375.dtsi b/arch/arm64/boot/dts/apple/t600x-j375.dtsi index 8a1494949e4c..6c34fc86af74 100644 --- a/arch/arm64/boot/dts/apple/t600x-j375.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-j375.dtsi @@ -179,6 +179,34 @@ typec3_connector_ss: endpoint { }; }; +/* Audio codecs */ +&i2c1 { + status = "okay"; + + speaker: codec@38 { + compatible = "ti,sn012776"; + reg = <0x38>; + interrupts-extended = <&pinctrl_ap 179 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 178 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + ti,imon-slot-no = <0>; + ti,vmon-slot-no = <2>; + }; +}; + +&i2c2 { + status = "okay"; + + jack_codec: codec@4b { + compatible = "cirrus,cs42l84"; + reg = <0x4b>; + interrupts-extended = <&pinctrl_ap 180 IRQ_TYPE_LEVEL_LOW>; + reset-gpios = <&pinctrl_nub 4 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Jack"; + }; +}; + /* USB controllers */ &dwc3_0 { ports { @@ -410,4 +438,41 @@ &pcie0_dart_3 { status = "okay"; }; +/ { + sound: sound { + /* Compatible is set for each machine */ + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = <0>; + + link-name = "Speaker"; + + codec { + sound-dai = <&speaker>; + }; + + cpu { + sound-dai = <&mca 0>; + }; + }; + + dai-link@1 { + reg = <1>; + + link-name = "Headphone Jack"; + + codec { + sound-dai = <&jack_codec>; + }; + + cpu { + sound-dai = <&mca 2>; + }; + }; + }; +}; + #include "spi1-nvram.dtsi" -- 2.55.0