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 03102CCF2C4 for ; Sun, 18 Oct 2026 05:57:50 +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=r5WOTDOeoF/T8akxfCBPXArsiM/VJ5PIwdW2EmkTdhI=; b=4olhLGLPjv6wgY29IqpBcVCuvy 4XVYErFWZqKkwgXzIlaHsEEFIAqYc8VXR4NDbYTegWz822YXOJuR6cyOul5Y09TamkWF9yIWbm7lq 2VCQKXgaPOVmZS5eGfO0BL2iQTowc2+eUN3ggGGAVFfUU9uOOsR5F8Knd1rzIDFZRF99ojk9MdS0f wgTewMsabdZdO8ElxQkbrbLwKR8I1uE3rolLs8s7L6Yjj9nnXd9y6BJHA7558wswZ/zk/mCoztMJd UYeN6WV9z2GXij6b52L1Dlev8HPkW6QitJwxFNAPTT7K4gDMddHJPqeeHTKS3PMmD9fXxFKUecCP/ WberfEyg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xIJtv-00000005bEh-3MBK; Sun, 18 Oct 2026 05:57:43 +0000 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xIJtn-00000005b9u-49Z2 for linux-arm-kernel@lists.infradead.org; Sun, 18 Oct 2026 05:57:42 +0000 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-3ab2cb8d577so1017609a91.1 for ; Sat, 17 Oct 2026 22:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792303055; x=1792907855; 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=r5WOTDOeoF/T8akxfCBPXArsiM/VJ5PIwdW2EmkTdhI=; b=Le/A08l4smTmlv8ihgJa/NV+XOEkW6zlX9G3vT8tWVib0EHrdxdp1Clz7cTqdyTUG6 KGZKPGsTJSg750g+dFSx7MYX19ICEGCtyB+3Kzip3aRNkj5xx1zLV7NROa6vKujIub63 rvaw80tgBzeXQq4opZuJ37xvb0uBbJS7s1TxF5vhrNe655kf77fKW49gBFYnLM3yZaw+ UhvVfHC2SV4Ub9ah00awE9jlSpMo+4e1PCjMuXnIQCOtT8Ont8o0B1mK3kqE67z5CDb9 AHPaR86++9smfDCDQhVMMravUq4w3U9rI1HQyaeOuHzt71c++XsfBonS5OBEequSe4ko Bf/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792303055; x=1792907855; 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=r5WOTDOeoF/T8akxfCBPXArsiM/VJ5PIwdW2EmkTdhI=; b=XoQTbPLy5YLm1yXJSeXe8QYckF7OcXnFe3Nhoz+9dldR973KOZEXU+Cydmt7/Aw+TM NV34Vqg96oip7WsuEpCOugw6Wn7qpeuOFPXdbU7drQn7SQrHxRzd3mv0wzYx9BLZq0Gh bcqNue73K92LDzwrYJ9KutlUMBLDlNsqeIJmWtb0xUHYQMT+qHwP/Z2GOL9MCCj+dHx/ 8CndwtcR5yPA4WyeIz1NCOTPaLCHtFekU+KLJ77lGVF41GZd4iLzP/UrCgBxsoecLF9O Ralj3S1OZVnucbbEKWtTAgu9jG+k9VUrjEpJw16ARAVw+PD9YeKRqyLIVr5Pfh5V+Nmw oJKQ== X-Forwarded-Encrypted: i=1; AKwUvBzt4XOev/iG73z+NrIy5PPnSbuX6PxsUaBIj6StzSkRzUZ2OTivWX50lpyZYm4NhK9U/I2wJMytLrjuFAGuBOK2@lists.infradead.org X-Gm-Message-State: AFq9FYJE7d+4RTXI0+azSCwdMLmVwXf/akYfPug05IHKwZISGLINEvok jLb18hwDslIXsfFc76QvPhROIAkhbqqVqZ6QTsCgqoy8g2dRbbRLw8gI X-Gm-Gg: AYBFou2r5tyYxrtO3t5+iYeO986CQhVuZxa+iWjFCS6/k3VGH2dw2uR1iG5pMLFcDED vvXJ0ktzW6Op0YDOXJq+KuQ2oDfYdrA8U5yTz6dPZ4OfOXMbpmDsct93AhIesLb/zzlLBPBMVU3 7drHBXvJz9L4JOccPIINk5/jbKMnTDCDuuF0RBuYxeDlzp3tAzeQ/niJTkAlLBkrdM8WPI3p9Qu 7sAbW47Y4jYhlMcvz59zeiS2XhRacVk35LZb/FB0VxEaRb3pvnFkpB73zEP9z6BGBfR0qBwu/o5 8m0Ao2swdPv76WL4ZsbeO5W0zSJ8ftIYmlVB8vsJgDNfJ7Jm1ZN3/wcMTv4MH0fpG/ak3SouvAr moasxM0bheuohvtCGwnNUSe+eOvkC396pTuSNk+dt+BhBZcJAu+sU87Lf4sPiw80qy2UPoiRA4S y7Yc8jPQj6LLCh3bfv0FrS85Uv9rY1UhvhwbVnxvwOuzqq0QS0cafCjC54zQ6ufpkzmJOU41Y/H 7/zdVPxp3Y1KH8o7SM4U8twNij+V19NdlmJypDf9k18xc0Nr21bEmMdlsNBoT5QfMGOMFlJRSX1 tv8vdc/oNxr6eJgZMvslEf00Uyu8XmhvabopptlLai/7/Q== X-Received: by 2002:a17:90b:28cb:b0:3a8:c0cd:57fa with SMTP id 98e67ed59e1d1-3aceec709c0mr3956469a91.11.1792303055375; Sat, 17 Oct 2026 22:57:35 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2026 22:57:34 -0700 (PDT) From: James Calligeros Date: Sun, 18 Oct 2026 15:54:13 +1000 Subject: [PATCH v3 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: <20261018-macaudio-v3-19-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=2977; i=jcalligeros99@gmail.com; h=from:subject:message-id; bh=KWfosToe+XDrj81BrY6Ipu7Z1wn2VsvneWja6aQY+S4=; b=owGbwMvMwCV2xczoYuD3ygTG02pJDFlX4vma2hU3a5esWNttoHKVyYa98MeVS8edXolfkz/0i sPBPYy3YyILgxgXg6WYIsuGJiGP2UZsN/tFKvfCzGFlAhkiLdLAAAQsDHy5iXmlRjpGeqbahnqG RjrGOkYMXJwCMNW7fzMyfA1n2z7hzuPv/CJq+7cz/NLqmcXDdMGvarktx+evZ6R5PjAyzCvXrlV jn+7trH3DYkdb7Gtr+wfKHWL/5zqs+pNz7OtpJgA= 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-20261017_225740_165200_BE16AA61 X-CRM114-Status: GOOD ( 11.85 ) 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.56.0