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 7BFB0CCF2C9 for ; Sun, 18 Oct 2026 05:57:40 +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=1yvxglmtuhBhXfKLjLZIKSiQ9S8bwOXsC8jCd3xNlG4=; b=40xx8yK1ElLfUfcg5+rzI8zVd3 xLXOkPgNIuS6nfo2P3hgQpeSoHihFwAQPPPH8tx5r5yRxb5Xwmkup/tjTZZZMYP99AIlzB5tqtCbn zulhq1qrGW/HSADvHGYV9AAdWhej7gxSF7tLyrGPkMMcUPai3neXBwtd2uYkSjZPTxhtbwDq8eeqH iQ5t4I1JzSJ0ScMC6AptyG2lIbSgZPlA7w5tvobeCeCrFXtgh4aQcXjRyGDXlUhWKYExScoPZUG3s 3SYGu+5JSXnlAZ6BmbzdaqrJi4Z/7+QayLoy93Ndsssfa2cDydIOFNDZKgRNjIaBjv/etRLSTrqjK FHHLa88Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xIJtj-00000005b8y-2TJ4; Sun, 18 Oct 2026 05:57:31 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xIJte-00000005b56-2pPF for linux-arm-kernel@lists.infradead.org; Sun, 18 Oct 2026 05:57:29 +0000 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-38d489b6b71so632109a91.0 for ; Sat, 17 Oct 2026 22:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792303046; x=1792907846; 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=1yvxglmtuhBhXfKLjLZIKSiQ9S8bwOXsC8jCd3xNlG4=; b=lX71wUj454Er/m7KVBjTRQVbJEo7dfM458PKgEfBWFFn43JCuyGWPChdpuFGtQQDb1 MI+xXU9/nJW6/mIyR2o00Uy59LS46gzxQSyYj1uIPib8bRntOEO03bQ7syrJMowCj96N Mlgd1Y1QhIgnHAsMqbS+tPx2smbjHIBmGJFuGKZdHRxyXOfSg0LBwUTCS3W9FPPinIc3 ghZM3mBwCWwHXpJi/FVIggvxUSVUFgtMHVRBDhIJ65sAaYDiayNkKfobTVnEcKKLPucD rHSpbLkSC4evSx4TmiaeiPV3Zem7S5e82BolrNnFH34AHEmMi6/n+zmP7GGzbPDxXuAl r8Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792303046; x=1792907846; 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=1yvxglmtuhBhXfKLjLZIKSiQ9S8bwOXsC8jCd3xNlG4=; b=h9DunuIPU0Ljkm/nukIOiEBKyWr39gLSDSBdUj7Uvvn8W8dMyfUXhOT18bYiiRNB2o c8eFtzdkEK5/YovhIR2kjaJDRNESRkDfeFp7hMnF2hUPaZ25WrTv38SfikX+e3WcARdx 9RcpsvTmf0oWfDyD2rmwgXnt+8VN2I0Hg8v0yD1eiD0kNueL1KJoaK8l16qdkvD2Wo4/ /LrcLzdXOHKl67/CbIL6lNvmrHqM3bZ9biwcXQ849OFsMA1zcjcK1RYamG/2Lq4+fEtZ gyS1oqdbZ77VVOSmE1AUZyX+iupzOksvhFE9y/UT07XCANQ8NDwWrY+ipHRNajbKFb3R bcEw== X-Forwarded-Encrypted: i=1; AKwUvByyJTzU23DGgoCYWcNIjRYut1iVPasBfWYPpBc61Qn8eZS7sbTNZvXe3Cmy0Azu4MXkq1Gx44VOfyPhep3jEJck@lists.infradead.org X-Gm-Message-State: AFq9FYLn0Yz5TTyyj2x/agO9cgyEBHlt4ZQFIQ6Zdxg+X/YwUoS+26Xw bFg0tAYDdMkScUYoKBqR0BdFV3l7Vdar8zRWR2JfV79Spqeb60Gy5g4O X-Gm-Gg: AYBFou1nb0zJ0+1gA71dyGQsb6OxC0hy+QlnKbwT+aBz7Lo6roGRYGxxChhv9//mLGE J9IT9t+4VUEnVLfMJaSJAfNF1I/If9n1d6+fPLXMP0gsvf7ABV+D/QTc6yKK08K9DGqh6rE3iRP SjJtP+vk7Nfq3mjH97aR7xurThsOtqCIfaH2UrchRZYUDDEljmEiwwe8BVpOeqUQuVJ3iyPRISf tzohV6r9ORctI60MF8Lx9nk47hQBrXUczDZYY0HyxxTcZYdIFBspPaM0MW79WG0If8BniIgBJJW k0IwxejSufOYwUPKcess1wZ7ORZwMXZ9otpxPONR7yj/iqQ7zA/eWcBmBs9OUxVhP+TL1eUy3Ju B6ettM75r38EOhBP55M91/Zb3Xdd9Gw8DlgLPULu6Xb91S8sShsPyn1iXS/Ex754nDFcZA8qd81 RN8Nu1qPu6cM8YG5/t+O3/bG5Qn3Xc97i5AQZoRhr57g4YgV7QLplTFa0o6bQHlz/UpfQtW6qRf uHR1qyg7ovxHRjXHqgFCrzJDG027Lhekz5VdYkShhvx3fasMYcbHmrs3wTTfV9xQ7VexXVPM2z3 qhjGhW6DF9RvGGTsLiJ+8bWq0BiVcIIDButfChOorApxBw== X-Received: by 2002:a17:90b:4fc2:b0:3ac:a203:e092 with SMTP id 98e67ed59e1d1-3acee27717fmr4020804a91.1.1792303045878; Sat, 17 Oct 2026 22:57:25 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2026 22:57:25 -0700 (PDT) From: James Calligeros Date: Sun, 18 Oct 2026 15:54:12 +1000 Subject: [PATCH v3 18/21] arm64: dts: apple: t600x-j31x: 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-18-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=6066; i=jcalligeros99@gmail.com; h=from:subject:message-id; bh=09ofTA95DIZw5HAVPCEl6zxGgOksuCY56JI8pBRMBoY=; b=owGbwMvMwCV2xczoYuD3ygTG02pJDFlX4vmcKpVmuG+q2P5l1lJvt9vrLucdzXn0IuWERNtLx 5ZbsX0CHRNZGMS4GCzFFFk2NAl5zDZiu9kvUrkXZg4rE8gQaZEGBiBgYeDLTcwrNdIx0jPVNtQz NNIx1jFi4OIUgKnOd2BkWJZX71lcvm8Rn320Wz9bXLY2vyTbP8tvF1L2LZQpSGRawsjQ9babOeL 1wle7ntk2V+3T7/mrf01ta/SyrD1v3OeZPujnBAA= 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_225727_724556_5FD47E2C X-CRM114-Status: GOOD ( 11.75 ) 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 Pro/Max MacBooks integrate 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/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 + .../boot/dts/apple/t600x-j314-j316.dtsi | 135 +++++++++++++++++++++++++ 5 files changed, 155 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6000-j314s.dts b/arch/arm64/boot/dts/apple/t6000-j314s.dts index 1430b91ff1b1..63ae47ea46e6 100644 --- a/arch/arm64/boot/dts/apple/t6000-j314s.dts +++ b/arch/arm64/boot/dts/apple/t6000-j314s.dts @@ -24,3 +24,8 @@ &wifi0 { &bluetooth0 { brcm,board-type = "apple,maldives"; }; + +&sound { + compatible = "apple,j314-macaudio"; + model = "MacBook Pro J314"; +}; diff --git a/arch/arm64/boot/dts/apple/t6000-j316s.dts b/arch/arm64/boot/dts/apple/t6000-j316s.dts index da0cbe7d9673..c8428fbf9244 100644 --- a/arch/arm64/boot/dts/apple/t6000-j316s.dts +++ b/arch/arm64/boot/dts/apple/t6000-j316s.dts @@ -24,3 +24,8 @@ &wifi0 { &bluetooth0 { brcm,board-type = "apple,madagascar"; }; + +&sound { + compatible = "apple,j316-macaudio"; + model = "MacBook Pro J316"; +}; diff --git a/arch/arm64/boot/dts/apple/t6001-j314c.dts b/arch/arm64/boot/dts/apple/t6001-j314c.dts index c37097dcfdb3..05066cbde96b 100644 --- a/arch/arm64/boot/dts/apple/t6001-j314c.dts +++ b/arch/arm64/boot/dts/apple/t6001-j314c.dts @@ -24,3 +24,8 @@ &wifi0 { &bluetooth0 { brcm,board-type = "apple,maldives"; }; + +&sound { + compatible = "apple,j314-macaudio"; + model = "MacBook Pro J314"; +}; diff --git a/arch/arm64/boot/dts/apple/t6001-j316c.dts b/arch/arm64/boot/dts/apple/t6001-j316c.dts index 3bc6e0c3294c..ee0339b61713 100644 --- a/arch/arm64/boot/dts/apple/t6001-j316c.dts +++ b/arch/arm64/boot/dts/apple/t6001-j316c.dts @@ -24,3 +24,8 @@ &wifi0 { &bluetooth0 { brcm,board-type = "apple,madagascar"; }; + +&sound { + compatible = "apple,j316-macaudio"; + model = "MacBook Pro J316"; +}; diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi index caded1636f3d..1f23ae3e4e1a 100644 --- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi @@ -169,6 +169,94 @@ hpm5: usb-pd@3a { }; }; +/* Audio codecs */ +&i2c1 { + status = "okay"; + + speaker_left_woof1: 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>; + sound-name-prefix = "Left Woofer 1"; + ti,imon-slot-no = <0>; + ti,vmon-slot-no = <2>; + }; + + speaker_left_woof2: codec@39 { + compatible = "ti,sn012776"; + reg = <0x39>; + interrupts-extended = <&pinctrl_ap 179 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 178 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Left Woofer 2"; + ti,imon-slot-no = <16>; + ti,vmon-slot-no = <18>; + }; + + speaker_left_tweet: codec@3a { + compatible = "ti,sn012776"; + reg = <0x3a>; + interrupts-extended = <&pinctrl_ap 179 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 178 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Left Tweeter"; + ti,imon-slot-no = <8>; + ti,vmon-slot-no = <10>; + }; +}; + +&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"; + }; +}; + +&i2c3 { + status = "okay"; + + speaker_right_woof1: codec@3b { + compatible = "ti,sn012776"; + reg = <0x3b>; + interrupts-extended = <&pinctrl_ap 179 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 178 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Right Woofer 1"; + ti,imon-slot-no = <4>; + ti,vmon-slot-no = <6>; + }; + + speaker_right_woof2: codec@3c { + compatible = "ti,sn012776"; + reg = <0x3c>; + interrupts-extended = <&pinctrl_ap 179 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 178 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Right Woofer 2"; + ti,imon-slot-no = <20>; + ti,vmon-slot-no = <22>; + }; + + speaker_right_tweet: codec@3d { + compatible = "ti,sn012776"; + reg = <0x3d>; + interrupts-extended = <&pinctrl_ap 179 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 178 GPIO_ACTIVE_HIGH>; + #sound-dai-cells = <0>; + sound-name-prefix = "Right Tweeter"; + ti,imon-slot-no = <12>; + ti,vmon-slot-no = <14>; + }; +}; + &nco_clkref { clock-frequency = <1068000000>; }; @@ -366,6 +454,53 @@ &atcphy3 { status = "disabled"; }; +/ { + sound: sound { + /* Compatible is set for each machine */ + + #address-cells = <1>; + #size-cells = <0>; + + dai-link@0 { + reg = <0>; + + dai-tdm-idle-mode-0 = "zero"; + dai-tdm-idle-mode-3 = "zero"; + dai-tdm-slot-tx-idle-mask-0 = <0xf0f0f0>; + dai-tdm-slot-tx-idle-mask-3 = <0x0f0f0f>; + + link-name = "Speakers"; + + codec { + sound-dai = <&speaker_left_woof1>, + <&speaker_left_tweet>, + <&speaker_left_woof2>, + <&speaker_right_woof1>, + <&speaker_right_tweet>, + <&speaker_right_woof2>; + }; + + 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 "spi1-nvram.dtsi" #include "hwmon-laptop.dtsi" #include "hwmon-fan-dual.dtsi" -- 2.56.0