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 C9B61C982CC for ; Sun, 20 Sep 2026 04:59:29 +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=OYHqvApWBxaD4bUAOaE882+EY9mUZ0r309+FWLunq88=; b=HRpkZUIkhLnpOT11ySbCUsWOin hxpVxpqLSSy4sQA+U5R6oz+y+N/dZEoCq8TU398pnGv0iMfGG1YrKdfrrgIj39bxxSt5dnhsqQkAC MaCwCUJrLOMJuPtRPkaQCLvI790q9U1hP7iwjY/Uk2B50FnegECdQEhKl1vuA5rqcfq2nUAd39w6t rIXtfEgwvzF1gvhAexiY2RYsJX8rTPGIpFhFSR9ZFkj4wVOnibgbQ4yx8UAo5UgwWShEHQKmgPxzR s4Jiuph/qL/2M1wQxHJNIWThEl+XhcszUO15mKTb22bDpTDVUuAVLGu+Y2z/nkXzetA5n4j6tJ7yz CAxiXkPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x89eC-0000000Guor-2Shq; Sun, 20 Sep 2026 04:59:28 +0000 Received: from mail-pj2-x11.google.com ([2607:f8b0:4864:39::11]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x89e9-0000000GumW-2QtO for linux-mediatek@lists.infradead.org; Sun, 20 Sep 2026 04:59:26 +0000 Received: by mail-pj2-x11.google.com with SMTP id d9443c01a7336-2db1ca06a25so13335815ad.2 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=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=OYHqvApWBxaD4bUAOaE882+EY9mUZ0r309+FWLunq88=; b=eJSQBw36+C2IBBncb2FDNUnQWhK3nSf0cIPcXbxssbU8WTdPS9cxEMe7gam8YHa13u WzVz8myVyDXHAwJgL4PbCPXZpQ5JgUzIRwdNco89mc09E4hA+ndf5JfK4a4CEoZ9KcNw mj8tlJ6bNhGE8VGl1cmHBjBGlaB83J+4G+TwFhAAcSqhZ+vs1UuP46++fV8oKZPDpbjl Fsv7i1CRxYiO19RpDShf7ijZpuILjZuVBPo+nJaN1CjjUkSQ6RrFChlJSeoakE0SbNi0 1I0SGsOHbeSzQF/eCL3Yqq5gwlVz8JvUSRBSfHLRlk3KIQk1diHlLuWomIEiw/xRXE/I gAsw== 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=WOKUh85653Ex46B6e2MEOFcplbbRDiZoZCYP4dCd0YYOf4ER+dWDPt6crvIqLEUeov vQ6VwqE3HNA0d2aaJv5t5fp8sHqBdVoujYkNtVNdhTL8ISntCQLbltz+l0JbUcxWSXOL S7/Nn4vvNlPqkAKh5HjWeBDmud0DewQCULHLFrPm3veGo588OMFgRCrq/KtFILfQnql8 GY5xI1nA7J8ydUFVKhqqf/YHEsRDubKj7dNYml59sk9r+0Sjv2ySZMJ4GwM9lqkjwRqV Ma0e+dVtGJL4EkWeZI6g/1CApx6Jtiq/OTWVnB7sdMaqTPp5wVCfnE1RiCFQeow7+BwZ kqBQ== X-Forwarded-Encrypted: i=1; AKwUvBwASM8w1k5WSFIIh9vCVqRdG8gh107uhJaKHOPxN1Z0hHqqsxyXEsiWibQCpgQB73HyonKHRwuKfLYnMnaJqQ==@lists.infradead.org X-Gm-Message-State: AFuF++meZnj0dm8KZgGrLNFNdYP/H/wOu3UGc9lkXafMxB/ZvLHBzbQf MODTTbWW6VwYT3P4NWaSOXy+Zg801dWAmMlbybUwOBuRI5KTC4j0IHjU X-Gm-Gg: AYBFou1X2bxbmxYExpiYDvCfvqM8rb/vUMDpwI+aZZp3AUmJ5dT9PHMA4KrEyxNxpvB rur1jhAjZ6C81Rh7kmMaVKjD6bOsOL8a5/AfeUaQN+QdTls8kRshAjOb0BRPo3wVKEWn9x6tjCW 7AoYV5qGovUCgAj4rfdXCnDCof24ikupWnHbRpqy+gDR9a9PbjcVQhLvs+Plb/DCOn+6Xzm4VYy VkCTtREMEjeIhHikllnm5Q0wNEeE3QLsfC+HZSxbJ7dMAFpkhY2bLGbxMOxmgzPDrgiyPB/vRa+ V6fVx3ObfPpBHgM6rUNp/f+YzAtovc0ssO7TVzRXiAwxYcAZWJ1mXNYIDjvsAXBo4sc/bt/VWQH cN2h6eyjalLfDWtsP9+RJVNCc7L03Sv15ikTL0TJcPzk/PWn7W1sGO8EeNvZHwv5kaK6XMVM2BQ tc6LOgHNVu8cAUQcBxvJjwtzY2Vd1/KrM89TBNDd6PpLdQfvgeC7XxuI6MDkPLTvAV44iqwQ6Q3 MJ93Nf1xyuibYvJF95UKWiBkn6bZZqdsxucpN7kf93orIk71v4nz8mIjpy28ka+WJUtMYBKp0PO BhYl5ofRd9RyemS9j1sFXVQJMwaJtkz4gZSUXgjfs4sN6Tw= 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260919_215925_647947_7BF5E482 X-CRM114-Status: GOOD ( 10.20 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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