From c5e85bafa0c26003714d31feacc7bf46d28660f2 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Thu, 1 Jun 2023 11:49:02 +0800 Subject: [PATCH] arm64: dts: rockchip: change dp sound card name on rk3588 platform pulseaudio ucm2 config can not handle the character "," or long name, so change it. Signed-off-by: Caesar Wang Change-Id: Idd25349d3b11e058b391bb5b0c205288ccdb3e74 --- arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-pcie-ep-demo.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-toybrick.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-vehicle.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi index c9cdc0817251..deb40fdea728 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi @@ -107,7 +107,7 @@ dp0_sound: dp0-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp0"; + rockchip,card-name= "rockchip-dp0"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx2>; rockchip,codec = <&dp0 1>; @@ -117,7 +117,7 @@ dp1_sound: dp1-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp1"; + rockchip,card-name= "rockchip-dp1"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx5>; rockchip,codec = <&dp1 1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi index d9f69e07dd70..0301d6f3118d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi @@ -31,7 +31,7 @@ dp0_sound: dp0-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp0"; + rockchip,card-name= "rockchip-dp0"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx2>; rockchip,codec = <&dp0 1>; @@ -41,7 +41,7 @@ dp1_sound: dp1-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp1"; + rockchip,card-name= "rockchip-dp1"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx5>; rockchip,codec = <&dp1 1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-pcie-ep-demo.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-pcie-ep-demo.dtsi index 65ff203aab31..f44fd9e15c00 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-pcie-ep-demo.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-pcie-ep-demo.dtsi @@ -32,7 +32,7 @@ dp0_sound: dp0-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp0"; + rockchip,card-name= "rockchip-dp0"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx2>; rockchip,codec = <&dp0 1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-toybrick.dtsi index ae4131045a07..a76bedcfcdc1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick.dtsi @@ -87,7 +87,7 @@ dp0_sound: dp0-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp0"; + rockchip,card-name= "rockchip-dp0"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx2>; rockchip,codec = <&dp0 1>; @@ -97,7 +97,7 @@ dp1_sound: dp1-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp1"; + rockchip,card-name= "rockchip-dp1"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx5>; rockchip,codec = <&dp1 1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle.dtsi index 383591104b0e..f4498cdd21c9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle.dtsi @@ -107,7 +107,7 @@ dp0_sound: dp0-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp0"; + rockchip,card-name= "rockchip-dp0"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx2>; rockchip,codec = <&dp0 1>; @@ -117,7 +117,7 @@ dp1_sound: dp1-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp1"; + rockchip,card-name= "rockchip-dp1"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx5>; rockchip,codec = <&dp1 1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi index 6db4c5734836..586c6277449c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi @@ -87,7 +87,7 @@ dp0_sound: dp0-sound { status = "disabled"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp0"; + rockchip,card-name= "rockchip-dp0"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx2>; rockchip,codec = <&dp0 1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi index b61a843ef28f..2a78a4eb05a1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi @@ -114,7 +114,7 @@ dp0_sound: dp0-sound { status = "okay"; compatible = "rockchip,hdmi"; - rockchip,card-name= "rockchip,dp0"; + rockchip,card-name= "rockchip-dp0"; rockchip,mclk-fs = <512>; rockchip,cpu = <&spdif_tx2>; rockchip,codec = <&dp0 1>;