From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f43.google.com (mail-pj2-f43.google.com [74.125.227.171]) (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 0CF673D1CA7 for ; Sun, 20 Sep 2026 04:59:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789880349; cv=none; b=Gl+Hy4+uwvBEFS4nyQBoU/BrXJcM23hnefKEWfBXvaZDZmc/z+x2Sjt8t9+niTWl3cZFf0dfQy50QIX+STKWwjGVbhKTDc3uLg7TS0etPzXEx9XtiFU1DIwhGPaucPUPWMbHqziUNwtFx9l3bmh7CQYCKcHAM59jDiZJ2oIZ3aQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789880349; c=relaxed/simple; bh=exZLW1orbjDOjAe+qhZ0AJwTOY6a9pj0Hwu8KuUxZmI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hA1ffLUwFQP89QZ4R4xFwHgx08qd5Wef1v+6qy+Uu4Jhet6jvsH7iilrH6F2vc99fdxXSyj6rYs8Zc8ztbraaDGvJXPoxrIV3ZgwKmY5x40rB3pyHmQIGmmJ0SjfjyB2iRGCuXJmIQoigQMtlnd9vBGiqpPUSW7MelJDryN+xnw= 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=XUg3MSv1; arc=none smtp.client-ip=74.125.227.171 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="XUg3MSv1" Received: by mail-pj2-f43.google.com with SMTP id d9443c01a7336-2d747ec6188so11907415ad.3 for ; Sat, 19 Sep 2026 21:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789880347; x=1790485147; darn=lists.linux.dev; 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=nxSmsJzbIneEXZndIf7W1mbqPxGSYMwHTFZOXNa27kw=; b=XUg3MSv1G5dsGQPtDg7h9upo9ja7+PbAgux3Pi6VycVJyvnchIbTzZbHhuPHDgnwlu 8l0XgbO9/P63Ju82O4+D0BILcswNieWAD03r/K45+OH3dnNGSDMZserH4cDd6nGgZE4h wDUsZSeoVibVqGBJ9u+dz6wmIrrmC4u2oXlQcbWLlvWFVITg7hE9h5+QwI+E17wXBz6g 0YmPS+AhVRfcYZgleHcYBBvXKHPKz5V8x5SsVY0iXYjRmKHsLANYknAhxnTddmxBU3rd 4CmzBWvDGMhYk+hdWStclBi+ZzgklL2CUYQWasFIozelEdsXYMIvMkR+SBRdjMNFNSXf W3Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789880347; x=1790485147; 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=nxSmsJzbIneEXZndIf7W1mbqPxGSYMwHTFZOXNa27kw=; b=LIsQXsuY2AnaL5iGKqCF7qQMdyFif6YcEy5mVj6rukfR2o/1j6et5btdZZmn6ajsGa E3nb7xT4Ebe2pJ/3v2LuT02LdJ+8HU3llosUTZlb8LGOoL2P8oG9P9Ca4XbOI89Yw9yD qx/5W6a6euACIUUktN3gTXDvDnuw73g0ZytavsATq1VN0yS7RL390VrjeACl9u8p9SO0 udtzphUHLhTiUADFE/VJZ75YaIJwnFoZok3QzLAMyj9nQqZAA/NCOQK5urc0BogZcqP2 nFb5KOM3bEBSdGI0xD5qp0wafRw6TjpKfTVA93tq5d274KTWXa5pQIHgwW70mOaXV/9Z f/ng== X-Gm-Message-State: AFuF++kH3OqTxSuV1qlfSHdLk/HLjG7h5v2WPt+Paf+JOhv7Tfl0Inym nX1wBOPximl4pbnV3PQqdYb+uJ9RVZF/DZRzUJHtlhMuxgdCFAGinGJu X-Gm-Gg: AYBFou0635dCNxLBurnInH+a+6mOX5w+NhmUtaYexQkZkjCieURYgULfX/I6z7oE1nK SlmZCMZHszuxT0Q9UU6ZtDLBgICnGH2NvNkhbFKtzl4Gq26n/srTdxbPr1lDL1mPQW7MvFFKWVh 73dM+2YE436MzZEWvQsWAWElANHkKKrpJb1ClfYXVtgDU8ElNt1w/AsRpmOnpy5Fl4dbNP9GvgC NddwYTdLJixEgZpaXilw0PEDZC7OH2GhHvQt6YkykMIaGB7nuVqZJPLfKszVLPzp29hKko7f/p/ pbwrsgu1NugcfTEW5BnDCT6WqH72mvWJ23cZG6tX4/ugxgDoOW5riKjvp6ZguEni30bvD75+Z5+ YclKYjHxMzNtJP4YSNsdsvokPY4ZJgor5tN209l72AfrlvSQrgUytOzkjC4sUad9bo0E+X0QAJf gB+DOhsKrYqssvtJLbbC5HzKMmcggf97nPvjsIuM9duq5tLz8MCrjfuW/7SXlauVu9dmvXxLaH8 B1rqoqy3tu3M/cyUXdtl76z5O/fUQlnEnMpqTaAeYnZVTSRaZX1/7gzp/zvcWW9IISbpdiVPvCM XtweENr7wkHid8KTPUzrqJOF89b7KC7rIAt6uyNEfn+8T2A= X-Received: by 2002:a17:903:3e2c:b0:2dd:c053:ec72 with SMTP id d9443c01a7336-2ddc054095cmr43098755ad.37.1789880347267; Sat, 19 Sep 2026 21:59:07 -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.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Sep 2026 21:59:06 -0700 (PDT) From: James Calligeros Date: Sun, 20 Sep 2026 14:54:05 +1000 Subject: [PATCH 26/28] arm64: dts: apple: t600x-j375: Add speaker/headset jack nodes Precedence: bulk X-Mailing-List: asahi@lists.linux.dev 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-26-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=2939; i=jcalligeros99@gmail.com; h=from:subject:message-id; bh=exZLW1orbjDOjAe+qhZ0AJwTOY6a9pj0Hwu8KuUxZmI=; b=owGbwMvMwCV2xczoYuD3ygTG02pJDFnr05U5024/rGw+4x47c0Wpg89398uRqpM0UgS0mNaHP 9p+/rBQx0QWBjEuBksxRZYNTUIes43YbvaLVO6FmcPKBDJEWqSBAQhYGPhyE/NKjXSM9Ey1DfUM jXSMdYwYuDgFYKpTBBn+CurZBnuuFVRcb2G+qCRkWnS0haEb70yxdzeuti+XFjSuY/grvDPw3QH pAqdzXnd5RB8xKt4rsBd1iJAN7/PsFHsXqM8DAA== X-Developer-Key: i=jcalligeros99@gmail.com; a=openpgp; fpr=B08212489B3206D98F1479BDD43632D151F77960 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 | 58 +++++++++++++++++++++++++ 3 files changed, 68 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6001-j375c.dts b/arch/arm64/boot/dts/apple/t6001-j375c.dts index 08276114c1d8..bfaafad6f60b 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", "apple,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..2f37784357a8 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", "apple,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..60aa9a870bd9 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", "ti,tas2764"; + 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,34 @@ &pcie0_dart_3 { status = "okay"; }; +/ { + sound: sound { + /* Compatible is set for each machine */ + + dai-link@0 { + link-name = "Speaker"; + + codec { + sound-dai = <&speaker>; + }; + + cpu { + sound-dai = <&mca 0>; + }; + }; + + dai-link@1 { + link-name = "Headphone Jack"; + + codec { + sound-dai = <&jack_codec>; + }; + + cpu { + sound-dai = <&mca 2>; + }; + }; + }; +}; + #include "spi1-nvram.dtsi" -- 2.55.0