From nobody Sat Sep 26 14:39:45 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 B75AA45562C; Mon, 31 Aug 2026 14:21:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186066; cv=none; b=RsKyQ87wbyeG5BgZ2jatqqWc0CU3gy0k7EEaiR4m7PQv6ZUuZgUmZaFlhjU5P9sfrRxiz3Et/5iMBnvjzv5+MoAueReP37ntkQVSPVvL0dad3l4e8Lu96akRARjdheljUiHGP4AM3eib5hD7uFrZ+l8FUDANk05qt+SozFsIfH8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186066; c=relaxed/simple; bh=pJmqpcEGREq4W7//BMoI1cMXR4zhI0TzTl2ERbFmqW0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ERimkShtUvSuh1gW1f4giMVqQrFYSTUH42eaRLOrm0hkL1kRk/eY7yMfROfOIFTR+pnlR9VezmwYUhbJ9OURgWv0Ox0qTFwvrknNLXqsOJ6cIQ+3olh9D9U0g6Gke3zDqJhuMrCwq/Vik5E22BkYUwEBGGmcdpThTk7Zp9o+qTM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=IiUx9EKI; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="IiUx9EKI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1788186062; bh=pJmqpcEGREq4W7//BMoI1cMXR4zhI0TzTl2ERbFmqW0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IiUx9EKIpoJF3CvOYfevFqGSwiKVJYCOFG+yz9eHgCL5lQ/aGNDAL0yBfJ9uWCRlV 3cLJIZMVIG5FHceCz89xDqgbqcnagwKILjaPdeZHIRmEyTUjkBnmZX3LjQRc71PAdK +ZL6OFfkWpu9HK8PMggmQFgKMC5tUXXSSBw8wP+2Ki+rEABl1rER+OsZ3S8Z4lfWK4 EcpIgYb6B+7Lbq7yJHMdpBXrb02ZsS1JnzN9zrA96pzO2o3N1vGw1Rsln1nMV3CgMx dEiwNvq89CZ29yT7/bCgNxxca6etZblDAcTM53rvuKKsBawyAFOFwWQ15g1EL30vNR vkFJnq3sQML+w== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id BE2F417E0180; Mon, 31 Aug 2026 16:21:00 +0200 (CEST) From: Detlev Casanova Date: Mon, 31 Aug 2026 10:20:48 -0400 Subject: [PATCH 1/7] arm64: dts: rockchip: Rename rk3066a HDMI audio card 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: quoted-printable Message-Id: <20260831-fix-rockchip-hdmi-audio-names-v1-1-5b155ae05293@collabora.com> References: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> In-Reply-To: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "HDMI" to "RK3066a HDMI" so it identifies the SoC in user-visible ALSA fields (shortname / longname / driver) and no longer collides with the identical "HDMI" string used by rk3288, rk3328, rk356x and rk3576. Fixes: 041f240e4df6c ("ARM: dts: rockchip: add hdmi-sound node to rk3066a") Signed-off-by: Detlev Casanova --- arch/arm/boot/dts/rockchip/rk3066a.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3066a.dtsi b/arch/arm/boot/dts/ro= ckchip/rk3066a.dtsi index 3f6d49459734..12a3cbdfb481 100644 --- a/arch/arm/boot/dts/rockchip/rk3066a.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3066a.dtsi @@ -55,7 +55,7 @@ display-subsystem { =20 hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; - simple-audio-card,name =3D "HDMI"; + simple-audio-card,name =3D "RK3066a HDMI"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <256>; status =3D "disabled"; --=20 2.55.0 From nobody Sat Sep 26 14:39:45 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 E22D44499B6; Mon, 31 Aug 2026 14:21:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186068; cv=none; b=hhgBcepQ++d0zk7Rct8lKlizy/DrPjwQJKW7r3C3DsMjAZzYNXtJm4QrphBx01dXCUagZQq1Cy7M1sbTOrAUFrnA+bynftbiJv6/+rIgmCQPzlVnXcyCnGzRLRYsl2mwsOb/FHCjEW6uAb5c9+qqWJ2+nZwq5pWnQOet3LG5TsM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186068; c=relaxed/simple; bh=FhtiaZ2Qzu9sS1DBggkgNh9n1DpPL5VKV7ZWJoFJtDY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ME/kEZIGxaw7wVuDx9vhrHm5+SrHCM9wNZ4UzL0RUUoPZTWO3sOOpoY3PQqlMvzXzp/RQICRf4MSySU9NV4jujL6jZfT0CksmQYXHfbFWfR07SD7y2KbhNBo5wSFRd0XGxvSkLnz+t9UhznrxS7k8gb/BEmojvX+XFfTHHIRfmU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=H0wWhTgs; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="H0wWhTgs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1788186064; bh=FhtiaZ2Qzu9sS1DBggkgNh9n1DpPL5VKV7ZWJoFJtDY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=H0wWhTgsLb88QkkUHetTPsq3zHZSSM7eJKZgqCdJHIvwhwnpb3gse72alyDDqNN0z muuSdx+6PFaXxsEljeK0aMT9etOyaMOafCt1t5E4HgvjQOSGpOmpQCExjWy7FfJUXJ l0HHoe2KYiG/OqbbC1lK4DKcJ7IXUVIeVsCWpyPsngHycbKG0FVJcGNYTCP5IfRz18 SaQl+NaEI7ovxWXrxSufT1tfZT2Sc5effjIRS45GXVSaxi5kq79SR4uwrQb58RYDmL DsfqFIvMPeuGhCRi4Pu0an42jWayVG14rlu3Wd70+8EGsL6fQKjuzHyFt7CAmGT90/ 37L6en3CDcARg== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id ED1D617E07EF; Mon, 31 Aug 2026 16:21:02 +0200 (CEST) From: Detlev Casanova Date: Mon, 31 Aug 2026 10:20:49 -0400 Subject: [PATCH 2/7] arm64: dts: rockchip: Rename rk3288 HDMI audio card 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: quoted-printable Message-Id: <20260831-fix-rockchip-hdmi-audio-names-v1-2-5b155ae05293@collabora.com> References: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> In-Reply-To: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "HDMI" to "RK3288 HDMI" so it identifies the SoC in user-visible ALSA fields and no longer collides with the identical "HDMI" string used by other Rockchip SoCs. Fixes: 2a91dcd5be9d ("ARM: dts: rockchip: add HDMI audio to rk3288-miqi") Signed-off-by: Detlev Casanova --- arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts b/arch/arm/boot/dts= /rockchip/rk3288-miqi.dts index a5f5c6d38f80..090255244c86 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rockchip/rk3288-miqi.dts @@ -82,7 +82,7 @@ vcc_sys: regulator-vsys { sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; - simple-audio-card,name =3D "HDMI"; + simple-audio-card,name =3D "RK3288 HDMI"; simple-audio-card,mclk-fs =3D <512>; =20 simple-audio-card,codec { --=20 2.55.0 From nobody Sat Sep 26 14:39:45 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 CAEFD45562C; Mon, 31 Aug 2026 14:21:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186070; cv=none; b=TSxD7b78tmdMcCiLHFa2MZJVyzCqVorT41Djx6Pepy3tLyu2tHk9xl0pZBspy0xa8JerE/XNpPLHnT9QNuvvsNidl7q4EqakcoOOBn7QZmyH3GpiC1xrtiEhSkihacnhDA2loPjFtqoFa4+NaA37Ol9mcUbbiSgHVeFmUwTXDS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186070; c=relaxed/simple; bh=DoGowj4v55nBBEq+iip4Zm4WBOyuRaxvLazd1hFH7tA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KL8bD2PNbmRP07Ar9gaGksa8BiUQMK2pjt0iEphDskLnzEsJuJgYcff7oae2RixxOnq3vwaNbpIZrfuuOk3G4yEy2DYu6UmiIZ0l2YTfP64eqDZzM3k5IWL9yJW4vRMct9rccD8BpSwM4Ppo+jb3LnljxsQk7Ot9bXMegfw2Y/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=ioYwR7bF; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="ioYwR7bF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1788186067; bh=DoGowj4v55nBBEq+iip4Zm4WBOyuRaxvLazd1hFH7tA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ioYwR7bFag6lceul3rzKe6/c5ri9r9A1KebKXQ5fVlSIp4ZAcWjaSdBJ1YJF6Zax0 xUJD9APCEG+JEvSB5UKcAsT60HqCWxIWMPgFNP2TVsVRrGOkDUarAVHEm3nL4jfWIN KrBv8LVKmolKJZOdU/BNJ4PI74l12B1FBw8z8lmd6d7BsWJ1jPuImuVSxF+1SJHwbp t4YwQJOHfpuSGsthwTQ4EVS83h73iPVOmwTPNPix6BYofolpFr08No9qc9+UFV/7AV RZC8s7EZKJLPReyjl3vo/AuTUnttQGfl6lCFZ0lFiXBOFcEIeV9CAoSX5TJoHu+5ZB zlQO/qRBasr8g== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 2742C17E0F70; Mon, 31 Aug 2026 16:21:05 +0200 (CEST) From: Detlev Casanova Date: Mon, 31 Aug 2026 10:20:50 -0400 Subject: [PATCH 3/7] arm64: dts: rockchip: Rename rk3328 HDMI audio card 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: quoted-printable Message-Id: <20260831-fix-rockchip-hdmi-audio-names-v1-3-5b155ae05293@collabora.com> References: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> In-Reply-To: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "HDMI" to "RK3328 HDMI" so it identifies the SoC in user-visible ALSA fields and no longer collides with the identical "HDMI" string used by other Rockchip SoCs. Fixes: 29e8976e604f1 ("arm64: dts: rockchip: Add RK3328 audio pipelines") Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts= /rockchip/rk3328.dtsi index 03b7c4313750..26c9f4558ed9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -207,7 +207,7 @@ hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <128>; - simple-audio-card,name =3D "HDMI"; + simple-audio-card,name =3D "RK3328 HDMI"; status =3D "disabled"; =20 simple-audio-card,cpu { --=20 2.55.0 From nobody Sat Sep 26 14:39:45 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 0A85F49CF52; Mon, 31 Aug 2026 14:21:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186072; cv=none; b=LR4QRBUjenSXiGz8D52Px5sDhHiE7bDR0kS6j3IG8B5SUyWRHgzJsOYl0K/Z3pIEY9xEQIfVlumFIY+d1JevDPHaC3S5WA9dFxb30TIRV842cvPr1BsDwgKY4oY/+i6scGA7tnAgLDUxwBUCm/MT/xbxNkgrqe8Wje5yEvC2LS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186072; c=relaxed/simple; bh=BoOMfIFPIGwvljgrOki6vDKw076yvIl6ObzO4+ZHHUc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AcL4AU9h7MurrV7ggm8/Wuqh9zdzpGX0RX/lFfFqedrayZr0zoyhvuwHlTZL2H4hmGkxI2+6e+MPQ4qCHlZy2Y3wiJcMle1bkC2BVorL8UeD6BXFvASkXZ9sINFXzU8sXIae4o76c56Zuetm0aqw4qhKzg2w7r6i8Ta2NxL4kac= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=Rxk9dH0k; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Rxk9dH0k" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1788186069; bh=BoOMfIFPIGwvljgrOki6vDKw076yvIl6ObzO4+ZHHUc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Rxk9dH0kjGkwIRNigXnY1FhwnO2wSMzwnu+c8949x882pZohScVohFGOmoxPa43vV ncrWDtadRtrp8eptHHCY1QknEqHi8IdtZimaS/Twm5qsNtuXzAhEuttxkN3HBgzs3+ KWxRR6EO/GcWjBaQRYUwkwD19nce3NoF+ylHgt8G2vdKGk3zmabzHh9UDseHdIDO0i olDHNwdU4h2wJCjY4AeHjGpeIDzBau1G2WVWWn7l23kLmhyt2UU14oUFEAf/b4xjvQ 0FZ0GUWukPH4vrFK0PFZJo/9zPfK8b75wABx16QHxFenzj14LoV8TLFtAuWVGLI97w 6AN1CdnS3/5pA== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 577DF17E0785; Mon, 31 Aug 2026 16:21:07 +0200 (CEST) From: Detlev Casanova Date: Mon, 31 Aug 2026 10:20:51 -0400 Subject: [PATCH 4/7] arm64: dts: rockchip: Rename rk3399 HDMI audio card 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: quoted-printable Message-Id: <20260831-fix-rockchip-hdmi-audio-names-v1-4-5b155ae05293@collabora.com> References: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> In-Reply-To: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "hdmi-sound" to "RK3399 HDMI" so it identifies the SoC in user-visible ALSA fields and matches the naming scheme used across the rest of the Rockchip family. Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boo= t/dts/rockchip/rk3399-base.dtsi index 49c68fe65de6..c46e58d4af0d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi @@ -2008,7 +2008,7 @@ hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <256>; - simple-audio-card,name =3D "hdmi-sound"; + simple-audio-card,name =3D "RK3399 HDMI"; status =3D "disabled"; =20 simple-audio-card,cpu { --=20 2.55.0 From nobody Sat Sep 26 14:39:45 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 EDB1F49DB8C; Mon, 31 Aug 2026 14:21:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186074; cv=none; b=u5Kf4bHsqZXg6BR6SLowjyz7xO9Ut8A9qMg64ncouio3jHx3t+xFimWpinMFZEblERc72Cb/D89bgmIMCsr0Uyw7vkBOaEjLBCgiDTpiTQDFohzfNzbRGl4uYWxORvxm6Ee6dct2/CBtV7JRJT4KzZhuWHK2j76pRixpQA98nNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186074; c=relaxed/simple; bh=jQGe1PtAhQMRwl2j6h3kMRJF5gC2+JoaZmJbWhESsdo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MMbydIsGbiqNComqDNJZoHnJAofR+NDm2R9W365fQAibchaVgjG5NdT0kfkvcDxd6TwRWVoz95ooVQsDtgM5Qk5NcTpB1kDoS63sKOplV/NQzEsp6kq/C088YosjGYfcLUSp4L1hd4Wl1FKTRMfc977ZXZSbrgJHnKnkuV+yJc8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=R+D8SDzn; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="R+D8SDzn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1788186071; bh=jQGe1PtAhQMRwl2j6h3kMRJF5gC2+JoaZmJbWhESsdo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=R+D8SDznhGpfutLGK1KgkbWaS9Vd703keD2UzF504Lkj0AZcNh5shHfUtJONoE46D 4zsZOUG4uj+OPjMhB0lUFBqufWbsFUBAq5D1+s9YpLBaz51ta64/QFERI4CtU1/Pd7 1sWrZJX8OkA76q9SLyjVsXmIrACPVPYx64ivSsLcPfaxmu/nRnS1YSWJHKvOaeaIaW /12t2LBPcXH0BDYa6Dnq90Ur76K+AFjtEgBzM8aik6dIfw7+0cyyU6l+FMQj28p+iT VPF7CFO4SyueN23s48MHzE5f36lvH5iIE+YNod9eeYoV8Ra6zVEz1OtQwg/9Y/RkIA yLAS1+McJjfcQ== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id 8442A17E0069; Mon, 31 Aug 2026 16:21:09 +0200 (CEST) From: Detlev Casanova Date: Mon, 31 Aug 2026 10:20:52 -0400 Subject: [PATCH 5/7] arm64: dts: rockchip: Rename rk356x HDMI audio card 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: quoted-printable Message-Id: <20260831-fix-rockchip-hdmi-audio-names-v1-5-5b155ae05293@collabora.com> References: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> In-Reply-To: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "HDMI" to "RK356x HDMI" so it identifies the SoC in user-visible ALSA fields and no longer collides with the identical "HDMI" string used by other Rockchip SoCs. Fixes: 697ee8546e241 ("arm64: dts: rockchip: Add HDMI audio nodes to rk356x= ") Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boo= t/dts/rockchip/rk356x-base.dtsi index a5832895bd39..98785c812fc4 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi @@ -150,7 +150,7 @@ scmi_clk: protocol@14 { =20 hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; - simple-audio-card,name =3D "HDMI"; + simple-audio-card,name =3D "RK356x HDMI"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <256>; status =3D "disabled"; --=20 2.55.0 From nobody Sat Sep 26 14:39:45 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 79FD949DBBC; Mon, 31 Aug 2026 14:21:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186076; cv=none; b=BYqoPNGTvuldfSovk0OeZPU4qhxMru8/k6ABUKbLNqYJujClW4t8JLCX0fBy/4Lh5jvCUMpcw9ndcfShbeU4zbQCocChjEhZnQrMLTXBuHcJjOnXND+ze/DImVjB9Tc2j2MI8iD5YfAUGVi0O5MEBRSkylgBwD3CayrbBbmttI0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186076; c=relaxed/simple; bh=nnQom02Ih1qwesbG7H+t6ImlBeovlhLhrwVE7x/9+zc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CphF5S+q74PJb8kQ/Sbq9vi3S1k6q72PBqltzB3MUby62Tz9TvZSnThGtN8E5cZdVP7dn8V0U5VIAgxlHtQGtdCAVJBforTC8rkcEMGzYyPPAGVE5gw7tqAkeC9HKLVCtfOJe9wc8kIi4PRu+sPzw2OoAeFvxL26SxMhIO8UlnY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=E51wLAIN; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="E51wLAIN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1788186073; bh=nnQom02Ih1qwesbG7H+t6ImlBeovlhLhrwVE7x/9+zc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=E51wLAINxykV93UklgsOYS+SQArUDJDgtLX7j6OsAC+kGj20G9ksGp5wCMjbPzRmT PYSoVixzV7v3ONNu860TUsnWT2j1H5pEGIWprHb5qzESpSxKxeUAIrB3z0/3ArM7re wqZB6wA2mDwu6lf0DEz6GKWQ1hKkmV7D5cTGiLdu6WozoZmfktm3BYUlCzOwahmNAh r2cvSoSrfYPKeVphvIlQgmWfTk7xgGLN0rCr38AFlOx+ztPuat+hKly/TD0x2MqJUj E5V11kv2gh9E7B27Pz+asG9tXCKVyWXjgV+2NQXt+iI+dFPnU63pKcMDiUVVEnhDN0 zJ+hdvv1a3MtQ== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id B3FA617E0180; Mon, 31 Aug 2026 16:21:11 +0200 (CEST) From: Detlev Casanova Date: Mon, 31 Aug 2026 10:20:53 -0400 Subject: [PATCH 6/7] arm64: dts: rockchip: Rename rk3576 HDMI audio card 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: quoted-printable Message-Id: <20260831-fix-rockchip-hdmi-audio-names-v1-6-5b155ae05293@collabora.com> References: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> In-Reply-To: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the card from "HDMI" to "RK3576 HDMI" so it identifies the SoC in user-visible ALSA fields and no longer collides with the identical "HDMI" string used by other Rockchip SoCs. Fixes: 7f1561d82e3d3 ("arm64: dts: rockchip: Add RK3576 HDMI audio") Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3576.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3576.dtsi b/arch/arm64/boot/dts= /rockchip/rk3576.dtsi index b0c0d3c8b1b1..ca9cbf035265 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576.dtsi @@ -410,7 +410,7 @@ scmi_clk: protocol@14 { =20 hdmi_sound: hdmi-sound { compatible =3D "simple-audio-card"; - simple-audio-card,name =3D "HDMI"; + simple-audio-card,name =3D "RK3576 HDMI"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <256>; status =3D "disabled"; --=20 2.55.0 From nobody Sat Sep 26 14:39:45 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 93D3649E5E4; Mon, 31 Aug 2026 14:21:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186078; cv=none; b=q/5XPXpq4O7hgkJlmrKERoPxPafJQ/J3IrZtDW98CkyKNLhIjFiGjBSBH3MJqyohTYozNh7d7zge1huxsOWJH5HZWC68J9nEdmmJ7SqjwXflGqkUjiWU4c58Hw2eCB7j6X6WsvA6EIOiwCVQ4puMAFuYykowrpiSifXFdrLcBf4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788186078; c=relaxed/simple; bh=WW3bgWtvchm/ZVcwcd6Is+/46qWg55ayuKIPjH66+G4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X/5AAqgyUtGDTx77Ulh4nLG18sirj9ar0dAiHM8euY9iLvEMmppFIHqaVNqZ2ELw/QmpmwmUKhvTk9hTU7GXFdg2PixYO/zK6LhSTclpC/05/8+8/KuX9fTLgI2ZRzKoeirkwCdaPT6Q29m/jvdsKzQPjXAsTsrL8BA51m2t8vQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=L0UoIPjB; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="L0UoIPjB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1788186075; bh=WW3bgWtvchm/ZVcwcd6Is+/46qWg55ayuKIPjH66+G4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=L0UoIPjBpYbdEuMhT9kraRtVJaCNFwqE5rEmRWPpDiEnrcbvvvBAUrVhJntZwWUqe J3nFscVHYcGsfmnXl5p73eZFMLuVspW6t5EURykGlkRhFqxusYAvuxxSIOhpLKFfsm 0JPfyrkNmHiMsydIBHmDURQHBDgfMHVadYvH8dGCAVSxFP+r8tirEUN4f6cZlqboL2 ZOvF0Q9aGKgTlZXjgp3grs+LuH8l/9/oaJ3BtbQ6RrnJJ6bnn/j0W54qG5ijO2GETV VYRvYpux+MBzUY3OiakZI0WvR2UA7mGZkFoD0mmBQLgB5o8PO1J7PM95ws5QXFzv3g ScfaYtL5Jr4KQ== Received: from [192.168.0.15] (unknown [100.64.0.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id E4E1B17E0829; Mon, 31 Aug 2026 16:21:13 +0200 (CEST) From: Detlev Casanova Date: Mon, 31 Aug 2026 10:20:54 -0400 Subject: [PATCH 7/7] arm64: dts: rockchip: Rename rk3588 HDMI audio cards 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: quoted-printable Message-Id: <20260831-fix-rockchip-hdmi-audio-names-v1-7-5b155ae05293@collabora.com> References: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> In-Reply-To: <20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Johan Jonker , Alex Bee , Christian Hewitt , Robin Murphy , Nicolas Frattaroli , Nicolas Frattaroli , Kuninori Morimoto Cc: kernel@collabora.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Detlev Casanova X-Mailer: b4 0.15.2 Rename the two cards from "hdmi0"/"hdmi1" to "RK3588 HDMI0"/"RK3588 HDMI1" so they identify the SoC in user-visible ALSA fields and match the naming scheme used across the rest of the Rockchip family. Fixes: b8c6c136971c0 ("arm64: dts: rockchip: Add HDMI audio outputs for rk3= 588") Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boo= t/dts/rockchip/rk3588-base.dtsi index 376ad04e0786..7892e18a7835 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -376,7 +376,7 @@ hdmi0_sound: hdmi0-sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <128>; - simple-audio-card,name =3D "hdmi0"; + simple-audio-card,name =3D "RK3588 HDMI0"; status =3D "disabled"; =20 simple-audio-card,codec { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/bo= ot/dts/rockchip/rk3588-extra.dtsi index b251bb129cdb..2bcf30d8a338 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi @@ -11,7 +11,7 @@ hdmi1_sound: hdmi1-sound { compatible =3D "simple-audio-card"; simple-audio-card,format =3D "i2s"; simple-audio-card,mclk-fs =3D <128>; - simple-audio-card,name =3D "hdmi1"; + simple-audio-card,name =3D "RK3588 HDMI1"; status =3D "disabled"; =20 simple-audio-card,codec { --=20 2.55.0