[PATCH v2 0/8] arm(64): dts: rockchip: give HDMI sound cards SoC-specific names

[PATCH v2 0/8] arm(64): dts: rockchip: give HDMI sound cards SoC-specific names

[Detlev Casanova]

Hello !

Some Rockchip SoC that exposes HDMI audio through simple-audio-card
currently expose a generic and inconsistent 'simple-audio-card,name':
- HDMI on rk3066a, rk3288, rk3328, rk356x and rk3576
- hdmi-sound on rk3399
- hdmi[01] on rk3588

There is also rockchip,tinker-codec on rk3288.

That string is user-visible and it shows up in aplay -l,
/proc/asound/cards and is what ALSA UCM, WirePlumber and PulseAudio
match on when picking a profile for a card.

As the names are not unique across boards (5 of them use HDMI), any
userspace rule matching on the current name is ambiguous.
alsa-ucm-conf.git has no upstream UCM profile matching "HDMI", 
"hdmi-sound", "hdmi0" or "hdmi1" for Rockchip, precisely
because such a name could match on the wrong hardware.
It also prevents alsa-ucm to hav specific profiles per SoC.

This series renames each card to "RK<SOC> HDMI[N]". The new names:
- are unique inside the Rockchip family and self-describing,
- fit the 16-char ALSA driver field after normalization
  ("RK3588 HDMI1" -> driver "RK3588_HDMI1"),
- give distributions a stable, unambiguous name to match UCM /
  WirePlumber / PulseAudio rules on, which the current names cannot
  provide.

Because no upstream userspace configuration can match on the current
names without misfiring on a different board, this rename does not
regress any known userspace setup and allows reliable matching on the
different SoCs.
The tinker configuration is also not present in userspace tools.
It also gives naming examples for future Rockchip SoC enablement work,
which should avoid naming issues from now on.

As similar rename was already previously accepted in commit 309598fca339
("arm64: dts: rockchip: Use a readable audio card name on NanoPi M5"),
which changed 'simple-audio-card,name' simply for aesthetic reasons.

Detlev.

Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
---
Changes in v2:
- Fixed the ARM commit messages (instead of arm64)
- Also rename rk3288-tinker
- Separate rk3566 and rk3568 instead of using rk356x
- Link to v1: https://patch.msgid.link/20260831-fix-rockchip-hdmi-audio-names-v1-0-5b155ae05293@collabora.com

To: Rob Herring <robh@kernel.org>
To: Krzysztof Kozlowski <krzk+dt@kernel.org>
To: Conor Dooley <conor+dt@kernel.org>
To: Heiko Stuebner <heiko@sntech.de>
To: Johan Jonker <jbx6244@gmail.com>
To: Christian Hewitt <christianshewitt@gmail.com>
To: Alex Bee <knaerzche@gmail.com>
To: David Summers <beagleboard@davidjohnsummers.uk>
To: Robin Murphy <robin.murphy@arm.com>
To: Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
To: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Detlev Casanova <detlev.casanova@collabora.com>
Cc: kernel@collabora.com
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-kernel@vger.kernel.org

---
Detlev Casanova (8):
      ARM: dts: rockchip: Rename rk3066a HDMI audio card
      ARM: dts: rockchip: Rename rk3288-miqi HDMI audio card
      ARM: dts: rockchip: Rename rk3288-tinker HDMI audio card
      arm64: dts: rockchip: Rename rk3328 HDMI audio card
      arm64: dts: rockchip: Rename rk3399 HDMI audio card
      arm64: dts: rockchip: Rename rk3566 and rk3568 HDMI audio cards
      arm64: dts: rockchip: Rename rk3576 HDMI audio card
      arm64: dts: rockchip: Rename rk3588 HDMI audio cards

 arch/arm/boot/dts/rockchip/rk3066a.dtsi        | 2 +-
 arch/arm/boot/dts/rockchip/rk3288-miqi.dts     | 2 +-
 arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi  | 2 +-
 arch/arm64/boot/dts/rockchip/rk3328.dtsi       | 2 +-
 arch/arm64/boot/dts/rockchip/rk3399-base.dtsi  | 2 +-
 arch/arm64/boot/dts/rockchip/rk3566-base.dtsi  | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3568.dtsi       | 4 ++++
 arch/arm64/boot/dts/rockchip/rk356x-base.dtsi  | 1 -
 arch/arm64/boot/dts/rockchip/rk3576.dtsi       | 2 +-
 arch/arm64/boot/dts/rockchip/rk3588-base.dtsi  | 2 +-
 arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 2 +-
 11 files changed, 16 insertions(+), 9 deletions(-)
---
base-commit: 893e11787f78e43b534e252249ac3fff4d1333f8
change-id: 20260831-fix-rockchip-hdmi-audio-names-8c10ad64f58a

Best regards,
--  
Detlev Casanova <detlev.casanova@collabora.com>

[PATCH v2 1/8] ARM: dts: rockchip: Rename rk3066a HDMI audio card

[Detlev Casanova]

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 <detlev.casanova@collabora.com>
---
 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/rockchip/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 {
 
 	hdmi_sound: hdmi-sound {
 		compatible = "simple-audio-card";
-		simple-audio-card,name = "HDMI";
+		simple-audio-card,name = "RK3066a HDMI";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <256>;
 		status = "disabled";

-- 
2.55.0

[PATCH v2 2/8] ARM: dts: rockchip: Rename rk3288-miqi HDMI audio card

[Detlev Casanova]

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 <detlev.casanova@collabora.com>
---
 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 = "simple-audio-card";
 		simple-audio-card,format = "i2s";
-		simple-audio-card,name = "HDMI";
+		simple-audio-card,name = "RK3288 HDMI";
 		simple-audio-card,mclk-fs = <512>;
 
 		simple-audio-card,codec {

-- 
2.55.0

[PATCH v2 3/8] ARM: dts: rockchip: Rename rk3288-tinker HDMI audio card

[Detlev Casanova]

Rename the audio card to "RK3288 HDMI" so it can be identified
user-visible ALSA fields and match the naming scheme used across
the rest of the Rockchip family.

It gets the same name as the rk3288-miqi, making the sound node
identical in both device trees, but won't be moved to rk3288.dtsi as
tinker and miqi are the only rk3288 boards with HDMI sound.

Fixes: e58c5e739d6f ("ARM: dts: rockchip: move shared tinker-board nodes to a common dtsi")
Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
---
 arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
index 7e16022c7d9e..1caf49579ae3 100644
--- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
+++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi
@@ -73,7 +73,7 @@ sdio_pwrseq: sdio-pwrseq {
 	sound {
 		compatible = "simple-audio-card";
 		simple-audio-card,format = "i2s";
-		simple-audio-card,name = "rockchip,tinker-codec";
+		simple-audio-card,name = "RK3288 HDMI";
 		simple-audio-card,mclk-fs = <512>;
 
 		simple-audio-card,codec {

-- 
2.55.0

[PATCH v2 4/8] arm64: dts: rockchip: Rename rk3328 HDMI audio card

[Detlev Casanova]

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 <detlev.casanova@collabora.com>
---
 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 = "simple-audio-card";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <128>;
-		simple-audio-card,name = "HDMI";
+		simple-audio-card,name = "RK3328 HDMI";
 		status = "disabled";
 
 		simple-audio-card,cpu {

-- 
2.55.0

[PATCH v2 5/8] arm64: dts: rockchip: Rename rk3399 HDMI audio card

[Detlev Casanova]

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 <detlev.casanova@collabora.com>
---
 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/boot/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 = "simple-audio-card";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,name = "hdmi-sound";
+		simple-audio-card,name = "RK3399 HDMI";
 		status = "disabled";
 
 		simple-audio-card,cpu {

-- 
2.55.0

[PATCH v2 6/8] arm64: dts: rockchip: Rename rk3566 and rk3568 HDMI audio cards

[Detlev Casanova]

Move the HDMI audio card name for RK3566 and RK3568 to their
corresponding dtsi files so the name can be set to match 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 <detlev.casanova@collabora.com>
---
 arch/arm64/boot/dts/rockchip/rk3566-base.dtsi | 4 ++++
 arch/arm64/boot/dts/rockchip/rk3568.dtsi      | 4 ++++
 arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi
index e56e0b6ba941..0086ff49fee2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi
@@ -6,6 +6,10 @@ / {
 	compatible = "rockchip,rk3566";
 };
 
+&hdmi_sound {
+	simple-audio-card,name = "RK3566 HDMI";
+}
+
 &pipegrf {
 	compatible = "rockchip,rk3566-pipe-grf", "syscon";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
index 3bc653f027f1..efc1edff1e15 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
@@ -382,6 +382,10 @@ &gpu {
 	operating-points-v2 = <&gpu_opp_table>;
 };
 
+&hdmi_sound {
+	simple-audio-card,name = "RK3568 HDMI";
+}
+
 &pipegrf {
 	compatible = "rockchip,rk3568-pipe-grf", "syscon";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
index a5832895bd39..1a4562df20ee 100644
--- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
@@ -150,7 +150,6 @@ scmi_clk: protocol@14 {
 
 	hdmi_sound: hdmi-sound {
 		compatible = "simple-audio-card";
-		simple-audio-card,name = "HDMI";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <256>;
 		status = "disabled";

-- 
2.55.0

[PATCH v2 7/8] arm64: dts: rockchip: Rename rk3576 HDMI audio card

[Detlev Casanova]

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 <detlev.casanova@collabora.com>
---
 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 {
 
 	hdmi_sound: hdmi-sound {
 		compatible = "simple-audio-card";
-		simple-audio-card,name = "HDMI";
+		simple-audio-card,name = "RK3576 HDMI";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <256>;
 		status = "disabled";

-- 
2.55.0

[PATCH v2 8/8] arm64: dts: rockchip: Rename rk3588 HDMI audio cards

[Detlev Casanova]

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 rk3588")
Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
---
 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/boot/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 = "simple-audio-card";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <128>;
-		simple-audio-card,name = "hdmi0";
+		simple-audio-card,name = "RK3588 HDMI0";
 		status = "disabled";
 
 		simple-audio-card,codec {
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/boot/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 = "simple-audio-card";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <128>;
-		simple-audio-card,name = "hdmi1";
+		simple-audio-card,name = "RK3588 HDMI1";
 		status = "disabled";
 
 		simple-audio-card,codec {

-- 
2.55.0

Re: [PATCH v2 4/8] arm64: dts: rockchip: Rename rk3328 HDMI audio card

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Changing the ALSA card name breaks userspace audio configurations (UCM, PulseAudio, PipeWire).
--

commit 7fe8827d3d20fa7fbaa3bf5003d353e243e34147
Author: Detlev Casanova <detlev.casanova@collabora.com>

arm64: dts: rockchip: Rename rk3328 HDMI audio card
    
This commit renames the HDMI audio card in the RK3328 device tree from
"HDMI" to "RK3328 HDMI". This is intended to prevent name collisions in
ALSA fields with other Rockchip SoCs.

> diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> index 03b7c43137506..26c9f4558ed9c 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 = "simple-audio-card";
>  		simple-audio-card,format = "i2s";
>  		simple-audio-card,mclk-fs = <128>;
> -		simple-audio-card,name = "HDMI";
> +		simple-audio-card,name = "RK3328 HDMI";

[Severity: High]
Does changing the ALSA card name break existing userspace audio
configurations?

When the kernel boots with the updated device tree, the ALSA card name is
exposed as "RK3328 HDMI" instead of "HDMI". Existing userspace UCM rules,
PulseAudio, or PipeWire configurations expecting "HDMI" will fail to match
the expected sound card profile, leaving users with broken audio.

While this change resolves a name collision between different Rockchip
boards, altering the user-visible simple-audio-card,name alters the exposed
ALSA card name and constitutes a userspace ABI breakage.

>  		status = "disabled";
>  
>  		simple-audio-card,cpu {

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com?part=4

Re: [PATCH v2 5/8] arm64: dts: rockchip: Rename rk3399 HDMI audio card

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Critical] ALSA card rename causes userspace ABI breakage
--

commit d2106b3a23ffdceb3724e809b448fcb65bba2229
Author: Detlev Casanova <detlev.casanova@collabora.com>

arm64: dts: rockchip: Rename rk3399 HDMI audio card

This commit renames the hdmi-sound ALSA card to "RK3399 HDMI" in the rk3399
base device tree to better match naming conventions.

> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-base.dtsi
> index 49c68fe65de66..c46e58d4af0d4 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 = "simple-audio-card";
>  		simple-audio-card,format = "i2s";
>  		simple-audio-card,mclk-fs = <256>;
> -		simple-audio-card,name = "hdmi-sound";
> +		simple-audio-card,name = "RK3399 HDMI";

[Severity: Critical]
Does renaming the ALSA card cause a userspace ABI regression?

The simple-audio-card,name property defines the ALSA card name exposed to
userspace (e.g., in /proc/asound/cards and sysfs). Userspace audio services
like PulseAudio, PipeWire, ALSA Use Case Manager (UCM), and ALSA state
restoration (alsactl) rely on this exact string to identify the hardware,
load correct routing profiles, and restore saved volume levels.

Renaming it from hdmi-sound to RK3399 HDMI might break this ABI, leading to
broken audio configurations or lost mixer states on kernel upgrade without
proper deprecation.

>  		status = "disabled";
>  
>  		simple-audio-card,cpu {

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com?part=5

Re: [PATCH v2 8/8] arm64: dts: rockchip: Rename rk3588 HDMI audio cards

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Critical] Changing the ALSA card name breaks backwards compatibility with userspace audio configurations.
--

commit 4e7ae2a4eeb352a3c16029392d27511fd5231a87
Author: Detlev Casanova <detlev.casanova@collabora.com>

arm64: dts: rockchip: Rename rk3588 HDMI audio cards

This commit renames the HDMI audio cards in the rk3588 device tree. It updates
the simple audio card names from "hdmi0" and "hdmi1" to include the SoC
identifier, intending to match the naming scheme of the rest of the family.

> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
> index 376ad04e07869..7892e18a7835a 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 = "simple-audio-card";
>  		simple-audio-card,format = "i2s";
>  		simple-audio-card,mclk-fs = <128>;
> -		simple-audio-card,name = "hdmi0";
> +		simple-audio-card,name = "RK3588 HDMI0";

[Severity: Critical]
Does changing the simple-audio-card,name property break backwards
compatibility with existing userspace audio configurations?

Since this property directly sets the ALSA sound card name exposed to
userspace, sound servers (like PulseAudio and PipeWire) or custom user
configurations (such as ALSA UCM profiles and .asoundrc) that match on the
"hdmi0" string might fail to initialize or route the audio correctly after a
kernel upgrade.

> diff --git a/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi
> index b251bb129cdbf..2bcf30d8a338d 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 = "simple-audio-card";
>  		simple-audio-card,format = "i2s";
>  		simple-audio-card,mclk-fs = <128>;
> -		simple-audio-card,name = "hdmi1";
> +		simple-audio-card,name = "RK3588 HDMI1";

[Severity: Critical]
Similarly, could changing this exposed ALSA card name from "hdmi1" to
"RK3588 HDMI1" break existing userspace ABI configurations?

Users running setups configured for the old name may experience broken audio
routing on boot because their sound environments will no longer recognize the
device.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com?part=8

Re: [PATCH v2 6/8] arm64: dts: rockchip: Rename rk3566 and rk3568 HDMI audio cards

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
- [Critical] ALSA sound card name change breaks ABI / backwards compatibility with existing userspace configurations.
- [Low] Missing semicolon at the end of the `&hdmi_sound` node overrides causes a Device Tree Compiler (DTC) syntax error, breaking the build.
--

commit 544b3c713c02b4d695c704bc8f12f60bc89bcc82
Author: Detlev Casanova <detlev.casanova@collabora.com>

arm64: dts: rockchip: Rename rk3566 and rk3568 HDMI audio cards

This patch moves the HDMI audio card name for RK3566 and RK3568 into
their respective dtsi files. It updates the card name to match the SoC,
preventing collisions with the generic HDMI string used by other SoCs.

> diff --git a/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi
> index e56e0b6ba9411..0086ff49fee23 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3566-base.dtsi
> @@ -6,6 +6,10 @@ / {
>  	compatible = "rockchip,rk3566";
>  };
>  
> +&hdmi_sound {
> +	simple-audio-card,name = "RK3566 HDMI";
> +}

[Severity: Low]
Does this missing semicolon cause a Device Tree Compiler (DTC) syntax error?

DTC strictly requires a semicolon after the closing brace of node overrides
at the root level.

Without it, a build failure occurs when dtc encounters the next node token
(&pipegrf) in rk3566-base.dtsi.

> +
>  &pipegrf {
>  	compatible = "rockchip,rk3566-pipe-grf", "syscon";
>  };

[ ... ]

> diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> index 3bc653f027f1f..efc1edff1e15d 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
> @@ -382,6 +382,10 @@ &gpu {
>  	operating-points-v2 = <&gpu_opp_table>;
>  };
>  
> +&hdmi_sound {
> +	simple-audio-card,name = "RK3568 HDMI";
> +}

[Severity: Low]
Is it possible this missing semicolon also causes a syntax error here?

Similar to the rk3566-base.dtsi change, this introduces a fatal syntax error
when building device trees that include rk3568.dtsi.

> +
>  &pipegrf {
>  	compatible = "rockchip,rk3568-pipe-grf", "syscon";
>  };

[ ... ]

> diff --git a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
> index a5832895bd392..1a4562df20ee5 100644
> --- a/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk356x-base.dtsi
> @@ -150,7 +150,6 @@ scmi_clk: protocol@14 {
>  
>  	hdmi_sound: hdmi-sound {
>  		compatible = "simple-audio-card";
> -		simple-audio-card,name = "HDMI";

[Severity: Critical]
Does removing the established ALSA card name introduce a regression for
userspace ABI compatibility?

Changing the ALSA sound card name from HDMI to the SoC-specific strings
breaks existing userspace ALSA UCM profiles, PulseAudio configurations,
and routing rules that match on this exact original string.

>  		simple-audio-card,format = "i2s";
>  		simple-audio-card,mclk-fs = <256>;
>  		status = "disabled";

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260910-fix-rockchip-hdmi-audio-names-v2-0-1396a6168e20@collabora.com?part=6