diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-04-19 13:17:53 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-04-19 13:17:53 +0300 |
| commit | 14dad21a23326663389204f8a670877bffa2d2dd (patch) | |
| tree | 172d111c2d99833e0c164538c41fb40bc03e2714 | |
| parent | 9a3ab12cc07f8579879b8ed626c3f92831be8506 (diff) | |
| parent | de3eb416311580d72480052ce18548003a291061 (diff) | |
| download | linux-14dad21a23326663389204f8a670877bffa2d2dd.tar.xz | |
Merge branch 'CR_10016_dts_6.6_hal.feng' into 'vf2-6.6.y-devel'
CR_10016_dts_6.6_hal.feng
See merge request sbc/linux!208
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-tdm.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-tdm.dts index 3944341b9157..b04396836dcc 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-tdm.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-tdm.dts @@ -8,7 +8,7 @@ #include "jh7110-starfive-visionfive-2-v1.3b.dts" / { - sound-tdm { + sound5: snd-card5 { compatible = "simple-audio-card"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dts index affa6c348acb..ef3c7fd5171d 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dts @@ -9,7 +9,7 @@ / { /* i2s + wm8960 */ - sound-wm8960 { + sound6: snd-card6 { compatible = "simple-audio-card"; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi index 10eab1f4ff41..c1d166a3988a 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -91,9 +91,9 @@ #sound-dai-cells = <0>; }; - sound-pwmdac { + sound3: snd-card3 { compatible = "simple-audio-card"; - simple-audio-card,name = "StarFive-PWMDAC-Sound-Card"; + simple-audio-card,name = "Starfive-PWMDAC-Sound-Card"; #address-cells = <1>; #size-cells = <0>; @@ -113,12 +113,12 @@ }; }; - sound-hdmi { + sound1: snd-card1 { compatible = "simple-audio-card"; #address-cells = <1>; #size-cells = <0>; - simple-audio-card,name = "StarFive-HDMI-Sound-Card"; + simple-audio-card,name = "Starfive-HDMI-Sound-Card"; simple-audio-card,dai-link@0 { reg = <0>; format = "i2s"; |