From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f12.google.com (mail-pj2-f12.google.com [74.125.227.140]) (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 6C51D3D2FE6 for ; Sun, 20 Sep 2026 04:59:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.140 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789880366; cv=none; b=Uteg5omB6DeuBxohEZjM/j7EJqpfTGfrlbZSXkgzhdf930vCnnQg9MCWz/yNBy2BnnDWD10VUfbNPh85FpgR6mGXX8GxqhMbiFPjrAEmtEMTu7D4x3zsGzhdX9CWN8sZbMSmsbXMEwDM3+rAZcoEUf7/bQO2TzTnZbG0YHeGjps= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789880366; c=relaxed/simple; bh=wZ33HmVJ/5Act5G23FfyEoldMO69+O+FCZBZLHA6YUE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B72prYraeYQxl3MadxFktlSglutf1/bBMoRg9p+/7oALax45tAzCJaiHMkLzfQTYsxhnNJU0T48LXUi7rwHzZmPAvfangPTl1eFMTLrK1uzV7Yuyzi0WPH7/myiye1cWQ8v+m14HzJJoHVzDW8Cnm+3U/aLqv6j/KP8P+XDaw40= 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=g7nND1Pj; arc=none smtp.client-ip=74.125.227.140 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="g7nND1Pj" Received: by mail-pj2-f12.google.com with SMTP id d9443c01a7336-2d9004a1ac0so12574635ad.3 for ; Sat, 19 Sep 2026 21:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789880365; x=1790485165; darn=vger.kernel.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=OYHqvApWBxaD4bUAOaE882+EY9mUZ0r309+FWLunq88=; b=g7nND1PjQ9wD9XeWJspCo3QVuJmVc5fe2c7Npa0as0MJt3vkRwy9C4VwnmpHXsgI47 nWfNSIz4XhQdCvOlX2FddeU0HDd5543UtxwRqn8yiwRrovNCK+tkHw377HBkFpP3j/Xa PDztO78pU7GjPN3xFZ7S666QbnBtKR3lAyXKsSlqrorEQ9C6nhcirJ4+1dGxTtyudJVf JZVQz7DCZXx9Rjs9aF9PJCOwxgKzTLpzdjLZD3K1TxSysAD9R8+gXRPpWZDDB5+8jYub ppbe7rtAfNd0Z0TqZvmKArYOOMgOIIiW1rFVe/FHaA1fkz3Po9zKWkSRNIDS4Gmeyo9v me4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789880365; x=1790485165; 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=OYHqvApWBxaD4bUAOaE882+EY9mUZ0r309+FWLunq88=; b=1oc8yJMun7nZacnK7MazRPs29+Yhtwzptzd3KYvZn3Nnx9bOGu4pOaY+WDRdftukjD XLUIDBI16syP74LInw72NOTnIMWX2530f/UnRt5GIuprU9h/HenmtTe42d0UEbtIDZT4 1LCw5krWavj/oExQ6FlxEfy6pnJTp8y+9B5a97fRIXGkztrmFWC8ZVga7jM1aiInTS7/ qPzbebGNvEKV3Wwpxden4Hneb7EiTo1M7cFP5TkGhVwwfr2xY1oXpA3Bjig9Nhc9nYMu MHapCaAZ99lG3rWUEBxnFGlJUOuglWFY/t04Mwc7Xzch/Wjzog87jQ552jrnlWv5XNUi tV6Q== X-Forwarded-Encrypted: i=1; AKwUvBy+lfLHa6xKZnBKYBI5dEp0hyPw2/b5j36P9hG/TloBW82U+D7/7sMdjJYZpMRgJgDpec3C1KMBqe0B+A0=@vger.kernel.org X-Gm-Message-State: AFuF++kdOMYxJP6bCHOXlid0theW6T3F8Pbibgej9d5N4//7ojqVMdoC /a715NH2IFJX4QlgFBqflD6RVREL0ucZVWdgeSvomNa4h7sC4OU3F58a X-Gm-Gg: AYBFou23xibcqZiOy+wvBE9r5bfTxKcw/0pKm6kkxFSHVqRQQgIbPvhdz4l1BXaj1k/ Xev7VwbTKWPLdQoLdIQOoKaSFdgd3jia4S8VPOaBt8ZhvrtE4xFpUSdl+93NL8X6R8UtfAveKpP ezPZmq2zw6FenAeLfgdBvefgA+IV/ZKIp818z6KfKxIpWvT4C+eHhyOr4LWyrgmvS07usIANa7o JcMS/dG5eLG5rjQe/5490AFRNPbWavR3V2xJxJAFq1fBMB1MvUpPGIpcx5dFZOHJV9h6x9xA9dJ YQPJ+SPEI+C2dr9Lzrp1V6JxPQiY7BxFBVZkyRdHQiSrhoU89GzmsZ0bFpFzIDFVpflCmhP9v7S fhmrtX01jZ6VuXr91eshawU3xC4935XU7yUFQNIypW9BgR9mP7tNbJmiK2kOZW8dVA31RLdLxLI t03itDn55KEtl91+wiWBX+ZedKbfGFi5lUoHGPh5lGd98VyWxJYk+gjvh1IfY1KP7QJyrGsqx5V qL9S7GKSzJaiqfUenMIsrHIFEqeOnWQ3ds83HE2Hw9dJ2Rc9RE5rxC9gqRKQqd3UHjMUKafHG86 9N4e2LOFwwIjI1y3IMdYksB7sRwFCEWpWiM4yHWmKkonic4= X-Received: by 2002:a17:902:d4cb:b0:2dd:c053:e0f7 with SMTP id d9443c01a7336-2ddc053e14amr57727015ad.38.1789880364897; Sat, 19 Sep 2026 21:59:24 -0700 (PDT) Received: from [192.168.2.3] ([2403:581e:d87e:0:fc2d:ed31:e80e:412d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ddc17d712dsm16026765ad.64.2026.09.19.21.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Sep 2026 21:59:24 -0700 (PDT) From: James Calligeros Date: Sun, 20 Sep 2026 14:54:07 +1000 Subject: [PATCH 28/28] arm64: dts: apple: t602x-j47x: Add speaker/headset jack nodes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260920-macaudio-v1-28-741cc20a74e5@gmail.com> References: <20260920-macaudio-v1-0-741cc20a74e5@gmail.com> In-Reply-To: <20260920-macaudio-v1-0-741cc20a74e5@gmail.com> To: =?utf-8?q?Martin_Povi=C5=A1er?= , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sven Peter , Janne Grunau , Neal Gompa , David Rhodes , Richard Fitzgerald , Jaroslav Kysela , Takashi Iwai , Ulf Hansson , Amit Kucheria , "Rafael J. Wysocki" , Lars-Peter Clausen , Vinod Koul , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , James Calligeros , James Schulman Cc: asahi@lists.linux.dev, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@opensource.cirrus.com, Takashi Iwai , linux-mediatek@lists.infradead.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2560; i=jcalligeros99@gmail.com; h=from:subject:message-id; bh=wZ33HmVJ/5Act5G23FfyEoldMO69+O+FCZBZLHA6YUE=; b=owGbwMvMwCV2xczoYuD3ygTG02pJDFnr05VFbxtZ2sxO6rz5yvjZ5FtlffdnP/XfybTQ3vFf9 vQgWa01HRNZGMS4GCzFFFk2NAl5zDZiu9kvUrkXZg4rE8gQaZEGBiBgYeDLTcwrNdIx0jPVNtQz NNIx1jFi4OIUgKlebcbIsNF/880JArN/VbEXGrKU3y9d/+feZy3e5XYinUf3PvpbEcvwv3o111H 9zCXse1hj/pyY9fsPb83NyDkbHzH1O+07w70vhgkA X-Developer-Key: i=jcalligeros99@gmail.com; a=openpgp; fpr=B08212489B3206D98F1479BDD43632D151F77960 The M2 Pro/Max/Ultra Mac mini and Mac Studio 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/t6020-j474s.dts | 5 +++++ .../arm64/boot/dts/apple/t6021-j475c.dts | 5 +++++ .../arm64/boot/dts/apple/t6022-j475d.dts | 5 +++++ .../boot/dts/apple/t602x-j474-j475.dtsi | 10 ++++++++++ 4 files changed, 25 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6020-j474s.dts b/arch/arm64/boot/dts/apple/t6020-j474s.dts index e3c2635d84fa..e79315b15f11 100644 --- a/arch/arm64/boot/dts/apple/t6020-j474s.dts +++ b/arch/arm64/boot/dts/apple/t6020-j474s.dts @@ -46,4 +46,9 @@ &pcie0 { <0x300 &pcie0_dart_3 1 1>; }; +&sound { + compatible = "apple,j474-macaudio", "apple,j473-macaudio", "apple,macaudio"; + model = "Mac Studio J473"; +}; + #include "hwmon-mini.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6021-j475c.dts b/arch/arm64/boot/dts/apple/t6021-j475c.dts index 9fe17f1f7f59..8aecd23e0ac3 100644 --- a/arch/arm64/boot/dts/apple/t6021-j475c.dts +++ b/arch/arm64/boot/dts/apple/t6021-j475c.dts @@ -36,4 +36,9 @@ &pcie0_dart_1 { status = "okay"; }; +&sound { + compatible = "apple,j475-macaudio", "apple,j375-macaudio", "apple,macaudio"; + model = "Mac Studio J475"; +}; + #include "hwmon-fan-dual.dtsi" diff --git a/arch/arm64/boot/dts/apple/t6022-j475d.dts b/arch/arm64/boot/dts/apple/t6022-j475d.dts index 32938a3bf96a..91ba7c1d2612 100644 --- a/arch/arm64/boot/dts/apple/t6022-j475d.dts +++ b/arch/arm64/boot/dts/apple/t6022-j475d.dts @@ -73,3 +73,8 @@ &bluetooth0 { compatible = "pci14e4,5f72"; brcm,board-type = "apple,canary"; }; + +&sound { + compatible = "apple,j475-macaudio", "apple,j375-macaudio", "apple,macaudio"; + model = "Mac Studio J475"; +}; diff --git a/arch/arm64/boot/dts/apple/t602x-j474-j475.dtsi b/arch/arm64/boot/dts/apple/t602x-j474-j475.dtsi index 926bb4ab77af..7f1faefcf9bb 100644 --- a/arch/arm64/boot/dts/apple/t602x-j474-j475.dtsi +++ b/arch/arm64/boot/dts/apple/t602x-j474-j475.dtsi @@ -36,3 +36,13 @@ &hpm2 { &hpm3 { interrupts = <44 IRQ_TYPE_LEVEL_LOW>; }; + +&speaker { + interrupts-extended = <&pinctrl_ap 58 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 57 GPIO_ACTIVE_HIGH>; +}; + +&jack_codec { + interrupts-extended = <&pinctrl_ap 59 IRQ_TYPE_LEVEL_LOW>; + reset-gpios = <&pinctrl_nub 8 GPIO_ACTIVE_HIGH>; +}; -- 2.55.0