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 34919CA5FE6 for ; Sun, 4 Oct 2026 06:07:04 +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=2gTHNaAHk08EuHF8BtnUIPdq9r0iTuWcCYHd3kETfdw=; b=zAt0G6zHilTUjVXcc02r1zKhL7 lmQmAzg1dbutMeX09p0J7idyY1BOECfjF0mC+FO9UkPim+jtdUZkm1dKrTO/qbbjuoQApNZApibTb wn0mHpB2NJrpEYDQSkawE3fqmg7+Q0DyFWINfmzgE/QxiA5LOD76GgRvdHFQccoX6vL6f+NelXSA5 JlO9NfNBF4492le50xP54F06OQo1b66CH8DVWrISrxOYT4aIE+gP4+cszZLAW5WlEpuugopZZBfl9 rC7zb0s6Xke95dwb7SCnc6D7++F8iUJidephHgCVeqY2HOsR70kWfMYWRAdhdGWRdE3KW5T1BqXME AGJLWfWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDFNC-0000000EP5F-0B8f; Sun, 04 Oct 2026 06:06:58 +0000 Received: from mail-pj2-x0f.google.com ([2607:f8b0:4864:39::f]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xDFN8-0000000EP0U-19yt for linux-arm-kernel@lists.infradead.org; Sun, 04 Oct 2026 06:06:57 +0000 Received: by mail-pj2-x0f.google.com with SMTP id 98e67ed59e1d1-3a4c8262465so595993a91.2 for ; Sat, 03 Oct 2026 23:06:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791094013; x=1791698813; 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=2gTHNaAHk08EuHF8BtnUIPdq9r0iTuWcCYHd3kETfdw=; b=QA4vFOQFe6Xg+ZbvWtKCCmtyib6ZfkJrxJ49Txr+NF73mKxzE+1/ndMLWt2hNUxZxY o9O4wlmQFYA7OW7wygHP7mWWptbRjQ6LKX2W1F7hew2siLHvwVBUtqfDKB0ATYepZcux KizAZa3LCGw5QMu7xXG/yF8GCW686nXQnh5eb93kYZ7V45lO+FNFPZDQG2ar0DXx5lis F9PZDouI7hfUWhYzwlpRiChddYZ88O4gIFyzSjegs/3553ka8e3zWdtyT6e2ke2DL05i +km5XVFf/i9j+iKOufDGSaN8dKf2G0vZGFjQtSQQAakjqfB0+FviBigx6pAX7C/GryxQ UJ2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791094013; x=1791698813; 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=2gTHNaAHk08EuHF8BtnUIPdq9r0iTuWcCYHd3kETfdw=; b=USyggDHIHTP2ABRl7Cls1NhB2d6qoWaTUJIAAyIABWcBkMY71vXGtXuBt+Fknl4zns F8/l5ICvenWeVWRoUGKNI61VeosylI4kia61Kt8T/5QsVzChjaJnpJq2Xb5HvRSi0+du KIqqt+8aRE8ND09FbD/JZXQuMRNHpuquk7V90HylhFT2l82HuUKsN7MEw7VygivtIZao QoYHz92vMrsuatiAAQwywhIOHBZ7YzZasrRUm32i7XmeWCSTi/sNzxo7pyCzHUsiijC9 CQfhSHBm4nOXUGa9XTbhx2+yOO0UyA4BjiYBzkAsBVVz2uMAjaItBJrmzjJcdbXI9W9N NxBA== X-Forwarded-Encrypted: i=1; AKwUvBySnuNh+qxDoexX77amU79lR7N2oAhiZkfl3Dq0bkPViVSv8WeCK161U/TieNacEup0UQhzXwc6riLbsiQHf+rs@lists.infradead.org X-Gm-Message-State: AFq9FYJqUpIZl5ap+a7Hq6ojz4/YHlY4uOwv3iuHoGzEuCYVsDzkZEQI HGRRfh3db12yeP0s8G76yTfyqFwfA34+XYoIe+XmFzuRLGKTdSahqC6t X-Gm-Gg: AYBFou2tkP/hYMlAryqfqSsM42/qkTLlKRZsn0Ppx77pC/9uwckeeFOY1Ba4XFuUefD 0ry4Nr3UeGkSNqJLFIPl8TZj0nGTM8BfoINzkCJQvXWPczA7fN1pSAAB9fX+G8rhdPuntHuVKT9 2mw35ouPeGB3bEMKXkI0tER2UsgBeYWIeS3Ar1qXiEe9fPbOjgaN+79DK32KyYcy/xFb6eu5TS1 mbkKYhqfMAbBr+vGnvtRMS55v//Pn7Bs4UUAm3/QoPIN/9l/D2pICbUodZ30fYlzViwxtI7OIER XnPWf03GRwE0Z2zRHr0kdBblHIUh3FqMQUigoNCgSqYfqwsUdrFxu6nXRMcPoHuIgrH6ga4WTPq GBHDZJZQzNiJNeBQZjPCtngRuKBeYydK0f88p/913e6U7AIXTbQwh35tlbWstKyu4mlIpMolZZk 7S31fMqekX5+ZpsX8j6SPdaGQAVGfhyuCF/smOfa04WpfeVoz5Z1HaYlWii2DRL6yiOAmWmNwJ/ oltNBnYBEpUZlpphTSyvrj5O/nR5bmzV7w+PxdFqmkxCayUjPrPFOXo6pSLClrcCYCN/uV0tcb6 5uGwAI0yw9YdgdnPRLTlprcta5NVF8bc5P5nuFT+A9MHF0o= X-Received: by 2002:a17:90b:57e5:b0:392:ca3b:370a with SMTP id 98e67ed59e1d1-3a6ce3a9724mr6330404a91.2.1791094013365; Sat, 03 Oct 2026 23:06:53 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2026 23:06:52 -0700 (PDT) From: James Calligeros Date: Sun, 04 Oct 2026 16:03:45 +1000 Subject: [PATCH v2 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: <20261004-macaudio-v2-18-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=6066; i=jcalligeros99@gmail.com; h=from:subject:message-id; bh=pTtpr+H362PWKUKN/qsOBwZheCrutrJX6ecEfmW8RLY=; b=owGbwMvMwCV2xczoYuD3ygTG02pJDFkH3+Qty3lx1KO+4+G/s3/3PbbQy+M9drZ3fs2qTfNd7 UIarsSs7pjIwiDGxWAppsiyoUnIY7YR281+kcq9MHNYmUCGSIs0MAABCwNfbmJeqZGOkZ6ptqGe oZGOsY4RAxenAEz1+X5Ghp2lhaKzNpb87WZc0Oo1MVCg41iTTPmM9gtO1bNUIi6zvmX4w1v57+e SvA8LDha7OSlMYlq5osTdeufLA99n/53YWt76mhcA 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_230654_338870_1F026853 X-CRM114-Status: GOOD ( 11.81 ) 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.55.0