From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 505DE28DC4; Wed, 20 May 2026 17:32:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779298377; cv=none; b=VNf6G7dOkG9Q2KJtxhP3prEwrOUFopmm61aRoLkcS2ZUkmj4IctHiSpyp5JOEI0OlMY+4SVzNs09STejZ5H7H2ZdgT8EkxT4TPwpyJw3C1CvJZtnNEXKCOFnjRuPfhSmLtzS2CaPiwoxAJxH3AmCHaN0Isxh4g/23uaiAi0UrzE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779298377; c=relaxed/simple; bh=DPKWLGH3JOvyuD3DWE1mmhpZ0dLyq5WwGxFxMCIwJF8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=elD8TRUlwsvV7ikTn5CPMRYQAs5g9nh2BvFrmli/tW2BFwqPP1XcwPpqxNg4hyRd22aOEll6sjjR5rQYFT+NPDXsfwJRDXOL9m8skfnfwo2W20SeTB9e4M3OIzQCJdIejFxS6EkUhAv8Xm1mEFfRWUhSpsYm5NJB/M0lbM72Xqs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1CCllBTX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1CCllBTX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77A891F000E9; Wed, 20 May 2026 17:32:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779298376; bh=0iz60ej8HJ/QAulIv2z15ljJeSl6CczIrYCOV4cYCzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1CCllBTX+1eyIxECN+6YLH8f3497sFN8Fgjm4Uvd7jUe+k/P4R5P5Z0EwSc2QlVoY i9TuSz0AgwNC/BhnTgIxWZmeh7v4pTTOIQgIxWt7MUzGQGMvGSXp4Z2oXnGtPOhZ5A vQpnVHmu6lF1VEuAUBvDRrLAoGRp97s2/T4XvTbY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Hewitt , Alex Bee , Robin Murphy , Heiko Stuebner , Sasha Levin Subject: [PATCH 6.18 386/957] Revert "arm64: dts: rockchip: add SPDIF audio to Beelink A1" Date: Wed, 20 May 2026 18:14:29 +0200 Message-ID: <20260520162142.899096934@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162134.554764788@linuxfoundation.org> References: <20260520162134.554764788@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Robin Murphy [ Upstream commit 03978cb18059ecd27e3d955508b18cf2a1196142 ] This reverts commit bdc4d388c6452498ab62ef2564589f40e0c8c262. While Beelink A1 mostly follows the high-end RK3328 reference design, it does not in fact have the S/PDIF connector, only HDMI and a 3.5mm jack for the analog audio/TV codecs - the tiny form factor literally doesn't have room to fit more! Cc: Christian Hewitt Cc: Alex Bee Fixes: bdc4d388c645 ("arm64: dts: rockchip: add SPDIF audio to Beelink A1") Signed-off-by: Robin Murphy Link: https://patch.msgid.link/0af77a02c2b0806d4ca72066392a5453fcc89a8f.1767111968.git.robin.murphy@arm.com Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts index 30bdb38f0727a..e810ed146451c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts @@ -58,24 +58,6 @@ ir-receiver { gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>; linux,rc-map-name = "rc-beelink-gs1"; }; - - spdif_dit: spdif-dit { - compatible = "linux,spdif-dit"; - #sound-dai-cells = <0>; - }; - - spdif_sound: spdif-sound { - compatible = "simple-audio-card"; - simple-audio-card,name = "SPDIF"; - - simple-audio-card,cpu { - sound-dai = <&spdif>; - }; - - simple-audio-card,codec { - sound-dai = <&spdif_dit>; - }; - }; }; &analog_sound { @@ -343,11 +325,6 @@ &sdmmc { status = "okay"; }; -&spdif { - pinctrl-0 = <&spdifm0_tx>; - status = "okay"; -}; - &tsadc { rockchip,hw-tshut-mode = <0>; rockchip,hw-tshut-polarity = <0>; -- 2.53.0