From a8384552a2e009797aa5b3e9a046d30e8d2e5d3c Mon Sep 17 00:00:00 2001 From: Joshua-Riek Date: Fri, 15 Sep 2023 20:56:18 -0400 Subject: [PATCH] arm64: dts: rockchip: use rockchip,hdmi driver for NanoPi R6 and NanoPC T6 --- .../arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 16 +++++----------- .../dts/rockchip/rk3588s-nanopi-r6-common.dtsi | 16 +++++----------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts index edc5e1e3ae70e..6e843c94f2548 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts @@ -109,17 +109,11 @@ hdmi1_sound: hdmi1-sound { status = "disabled"; - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <128>; - simple-audio-card,name = "rockchip-hdmi1"; - - simple-audio-card,cpu { - sound-dai = <&i2s6_8ch>; - }; - simple-audio-card,codec { - sound-dai = <&hdmi1>; - }; + compatible = "rockchip,hdmi"; + rockchip,mclk-fs = <128>; + rockchip,card-name = "rockchip-hdmi1"; + rockchip,cpu = <&i2s6_8ch>; + rockchip,codec = <&hdmi1>; }; hdmiin_sound: hdmiin-sound { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi index 36a60d8836062..eca8ae30a17e3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6-common.dtsi @@ -31,17 +31,11 @@ hdmi0_sound: hdmi0-sound { status = "disabled"; - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <128>; - simple-audio-card,name = "rockchip-hdmi0"; - - simple-audio-card,cpu { - sound-dai = <&i2s5_8ch>; - }; - simple-audio-card,codec { - sound-dai = <&hdmi0>; - }; + compatible = "rockchip,hdmi"; + rockchip,mclk-fs = <128>; + rockchip,card-name = "rockchip-hdmi0"; + rockchip,cpu = <&i2s5_8ch>; + rockchip,codec = <&hdmi0>; }; vcc5v0_sys: vcc5v0-sys {