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
This commit is contained in:
andy.hu 2024-04-19 10:17:53 +00:00
commit 14dad21a23
3 changed files with 6 additions and 6 deletions

View file

@ -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>;

View file

@ -9,7 +9,7 @@
/ {
/* i2s + wm8960 */
sound-wm8960 {
sound6: snd-card6 {
compatible = "simple-audio-card";
#address-cells = <1>;
#size-cells = <0>;

View file

@ -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";