From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 334F9426438 for ; Sun, 18 Oct 2026 05:57:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792303067; cv=none; b=LvIxKPNdNcBGWegPkSDWNfBI7/K+VNLghkXqKlMzmERD9xDpaMntnakEfohPdqQgv84U+jhKOUGBozzwHFKCNE46FSE7e3UOEtUFoYD9NCktdf4wDU7ZAvGmqrTngy5cW+AZSZgdLVQ+NUufiY2p/iamcYqqZV9846MF+/AHt9M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792303067; c=relaxed/simple; bh=4umqbHnPcmDvTKDGGgoaHBxvCxbbxjsr11wiU95vPB0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=h+H+7OAWFTpwEFksX/cSEjsEyxO7i8xrHmQreSuk/kNK/aH5FEAr3u2qT3Kv/ArM5NH40a7PtRbBiNKtlL46m11qeuejf7QjNbi3zBFsyxifodeFk7iIKp43v+fp0J0lRwuyYfnSgbWDk2BkdvD0P9TP7uUhUhX0K22LuUdQNKc= 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=rp97e0w3; arc=none smtp.client-ip=209.85.216.54 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="rp97e0w3" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-3ab4178ee33so891620a91.3 for ; Sat, 17 Oct 2026 22:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792303064; x=1792907864; 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=IDf0EybxbEMPZU9VxQSFE/nCsO169lfCLx83ijqsYSY=; b=rp97e0w3X4d32rSgyKAGGKFj+0azKL/K7kh3cgSVKu8GVsXI5EjnFoM9kYkIFVYszO 8zIdfJtKsMRz/zqWR1pQCi6tTuzKVFim+Ka1Gqp/qAZ6H+G+jGTWifJaW0NY2T3m/TlP 6RKbiu5BUWjJP0fmzHIfjceUvk4ZHGcTPQILh6hd6AiSqhl7RlpOYQ13iS8yjMpzUYjs rWhMmPWbFCTncCZ181Qrbu8oqBHdLMk8IUcRTY62E0ViBTfdnn5Kv763ubzVaYX7Z0OE 59cYd3u5TWpirwo9AqkJ5TnyOChQMNi1uAoI/zzhm2HpaqGRyGuUkDTD2XbFj4IkeAVS zYoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792303064; x=1792907864; 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=IDf0EybxbEMPZU9VxQSFE/nCsO169lfCLx83ijqsYSY=; b=Npgu1Xk7EBmjFJvR4liK19bh0ACVxA026aONBs7tH2Y9ZMDcOlwvzEhJch3jubto5i YrKXZ7JQ2obhqP9bUN9einY5sUNKXrZ4O4aONUXOxQoisRQFRaNh78NU1GlatHXSMapY J8fFVtussdjl0ZzK7LKZXMuyFtsFLrKAWnLHIWLGfVfwZqz7r+rwiFj3GZSTE7N0kggu qpDtw7ROaAWfqYgi/u3gzDd/F+d6nQzfaqa2PBUYKciC0Hmhbpr04sQMqSEaTq7L4w+w wuHy4P3Ymkzl2HUNbVV3bp/Yqe8q7ZNK0rvHxRsOpIvyT85FNGt58WDa137Lbs6ejxjO SJSQ== X-Forwarded-Encrypted: i=1; AKwUvByyJd5VJEErbRVodY8iwuGoaeYFnVFddaQuT/z6+ufD7l5rr3sMHfcpTksqAVQT2GQUboIwa//1waBF6g==@vger.kernel.org X-Gm-Message-State: AFq9FYJVk/ht/b+QBr0bKqvklfLXhIahW4JaxLiW2KnL5++erDgQzvL5 1uGuVVP21lRB84XH6z0LH8JPifJdnr3QPJTsvClkd6IrRrvH7NhnhozF X-Gm-Gg: AYBFou0ksQiy60PFry9EgsgvIpdHmZOTRkCIIZSiOgR/+CPW5RpO/3FtfHqQ3jctXMJ RYqS0yqyEiw7zBTQ/WlxjCwa1kBzasm72NeSol92Hjl/BQtVRIdo3H5tD3idcudJ0Gq3cPdjWsK 2Ech41kHgfHgahCvx1SiSz/KuO26FYXdUae+Ix33PjxBDS6o9e1n933wfHiubg5vceDToNdV7zy C3VazXjJUiaiBK53nzXVyBOUFoJzBRST2OrDVdjp9r2WhHfA2Kcou043VJdleWs7foJbcVQHq0S N9KIKKJLZFyyJ7aoB/oHUm2ZzHcrnkJ7ixjiU2Rk8VyubsK8sxHyu2uhYIOEPlZcJdcDx2Tqy1y 6aMJi8thlsVhDij7BhGA/Y77bdWkx262S9fMHxTh9M9xnvylPcN7k5aIiCbr6XFRiPtyKxKXaHw ax8i75wkh7dJCaaa+pk0K1MB7kgSzVEiYIem9ke4kFJVQv+eNCTbg/NIKxanpvCjLslPpi1+DGO SdjMQCAvLBOCKEJrY/MEuM0TvsmQycuD6A9JjoF070RwmxnxQeM7toIXXZl2TKXhdyzMFhbVanj zihc8UOEqMJakXh3XRmE8lZmGM+Zuzo7ZYY6qzNGmDToNA== X-Received: by 2002:a17:90b:1d4d:b0:3ac:86a0:5764 with SMTP id 98e67ed59e1d1-3acef5f0687mr3345724a91.64.1792303064515; Sat, 17 Oct 2026 22:57:44 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2026 22:57:44 -0700 (PDT) From: James Calligeros Date: Sun, 18 Oct 2026 15:54:14 +1000 Subject: [PATCH v3 20/21] arm64: dts: apple: t602x-j41x: Add speaker/headset jack nodes Precedence: bulk X-Mailing-List: linux-sound@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: <20261018-macaudio-v3-20-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=3704; i=jcalligeros99@gmail.com; h=from:subject:message-id; bh=4umqbHnPcmDvTKDGGgoaHBxvCxbbxjsr11wiU95vPB0=; b=owGbwMvMwCV2xczoYuD3ygTG02pJDFlX4vl8PtYHuD+eEiw6QW/zjcuLwwLOnjK6MtFAdca+J OFmLv0bHRNZGMS4GCzFFFk2NAl5zDZiu9kvUrkXZg4rE8gQaZEGBiBgYeDLTcwrNdIx0jPVNtQz NNIx1jFi4OIUgKl+ocfwP2qvi6NfdVpUzax1+SV/rKyM/zzf3fDra8ud4yf895leMWP4Z9/W3rb 3QsqbCfUhy1efkTi6uDKdv+Rc04NNLtdCO2LkGQE= X-Developer-Key: i=jcalligeros99@gmail.com; a=openpgp; fpr=B08212489B3206D98F1479BDD43632D151F77960 The M2 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/t6020-j414s.dts | 5 ++++ .../arm64/boot/dts/apple/t6020-j416s.dts | 5 ++++ .../arm64/boot/dts/apple/t6021-j414c.dts | 5 ++++ .../arm64/boot/dts/apple/t6021-j416c.dts | 5 ++++ .../boot/dts/apple/t602x-j414-j416.dtsi | 35 +++++++++++++++++++++++++ 5 files changed, 55 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6020-j414s.dts b/arch/arm64/boot/dts/apple/t6020-j414s.dts index 631c54c5f03d..2df6a39c719d 100644 --- a/arch/arm64/boot/dts/apple/t6020-j414s.dts +++ b/arch/arm64/boot/dts/apple/t6020-j414s.dts @@ -24,3 +24,8 @@ &wifi0 { &bluetooth0 { brcm,board-type = "apple,tokara"; }; + +&sound { + compatible = "apple,j414-macaudio", "apple,j314-macaudio"; + model = "MacBook Pro J414"; +}; diff --git a/arch/arm64/boot/dts/apple/t6020-j416s.dts b/arch/arm64/boot/dts/apple/t6020-j416s.dts index c277ed5889a2..7f3f0d6eee87 100644 --- a/arch/arm64/boot/dts/apple/t6020-j416s.dts +++ b/arch/arm64/boot/dts/apple/t6020-j416s.dts @@ -24,3 +24,8 @@ &wifi0 { &bluetooth0 { brcm,board-type = "apple,amami"; }; + +&sound { + compatible = "apple,j416-macaudio", "apple,j316-macaudio"; + model = "MacBook Pro J416"; +}; diff --git a/arch/arm64/boot/dts/apple/t6021-j414c.dts b/arch/arm64/boot/dts/apple/t6021-j414c.dts index cdcf0740714d..ec4050ec0ecf 100644 --- a/arch/arm64/boot/dts/apple/t6021-j414c.dts +++ b/arch/arm64/boot/dts/apple/t6021-j414c.dts @@ -24,3 +24,8 @@ &wifi0 { &bluetooth0 { brcm,board-type = "apple,tokara"; }; + +&sound { + compatible = "apple,j414-macaudio", "apple,j314-macaudio"; + model = "MacBook Pro J414"; +}; diff --git a/arch/arm64/boot/dts/apple/t6021-j416c.dts b/arch/arm64/boot/dts/apple/t6021-j416c.dts index 6d8146b94170..0037346959a5 100644 --- a/arch/arm64/boot/dts/apple/t6021-j416c.dts +++ b/arch/arm64/boot/dts/apple/t6021-j416c.dts @@ -24,3 +24,8 @@ &wifi0 { &bluetooth0 { brcm,board-type = "apple,amami"; }; + +&sound { + compatible = "apple,j416-macaudio", "apple,j316-macaudio"; + model = "MacBook Pro J416"; +}; diff --git a/arch/arm64/boot/dts/apple/t602x-j414-j416.dtsi b/arch/arm64/boot/dts/apple/t602x-j414-j416.dtsi index 0e806d8ddf81..852fbcd6277a 100644 --- a/arch/arm64/boot/dts/apple/t602x-j414-j416.dtsi +++ b/arch/arm64/boot/dts/apple/t602x-j414-j416.dtsi @@ -43,3 +43,38 @@ &wifi0 { &bluetooth0 { compatible = "pci14e4,5f72"; }; + +&speaker_left_tweet { + interrupts-extended = <&pinctrl_ap 58 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 57 GPIO_ACTIVE_HIGH>; +}; + +&speaker_left_woof1 { + interrupts-extended = <&pinctrl_ap 58 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 57 GPIO_ACTIVE_HIGH>; +}; + +&speaker_left_woof2 { + interrupts-extended = <&pinctrl_ap 58 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 57 GPIO_ACTIVE_HIGH>; +}; + +&speaker_right_tweet { + interrupts-extended = <&pinctrl_ap 58 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 57 GPIO_ACTIVE_HIGH>; +}; + +&speaker_right_woof1 { + interrupts-extended = <&pinctrl_ap 58 IRQ_TYPE_LEVEL_LOW>; + shutdown-gpios = <&pinctrl_ap 57 GPIO_ACTIVE_HIGH>; +}; + +&speaker_right_woof2 { + 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.56.0