ARM: dts: sync amlogic G12A/G12B/SM1 DT from Linux 5.8-rc1

[platform/kernel/u-boot.git] / arch / arm / dts / meson-g12b-khadas-vim3.dtsi

diff --git a/arch/arm/dts/meson-g12b-khadas-vim3.dtsi b/arch/arm/dts/meson-g12b-khadas-vim3.dtsi
index c33e85f..224c890 100644 (file)
--- a/arch/arm/dts/meson-g12b-khadas-vim3.dtsi
+++ b/arch/arm/dts/meson-g12b-khadas-vim3.dtsi
@@ -51,11 +51,11 @@
        sound {
                compatible = "amlogic,axg-sound-card";
                model = "G12B-KHADAS-VIM3";
-               audio-aux-devs = <&tdmout_b>;
-               audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
-                               "TDMOUT_B IN 1", "FRDDR_B OUT 1",
-                               "TDMOUT_B IN 2", "FRDDR_C OUT 1",
-                               "TDM_B Playback", "TDMOUT_B OUT";
+               audio-aux-devs = <&tdmout_a>;
+               audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
+                               "TDMOUT_A IN 1", "FRDDR_B OUT 0",
+                               "TDMOUT_A IN 2", "FRDDR_C OUT 0",
+                               "TDM_A Playback", "TDMOUT_A OUT";
 
                assigned-clocks = <&clkc CLKID_MPLL2>,
                                  <&clkc CLKID_MPLL0>,
@@ -80,7 +80,7 @@
 
                /* 8ch hdmi interface */
                dai-link-3 {
-                       sound-dai = <&tdmif_b>;
+                       sound-dai = <&tdmif_a>;
                        dai-format = "i2s";
                        dai-tdm-slot-tx-mask-0 = <1 1>;
                        dai-tdm-slot-tx-mask-1 = <1 1>;
@@ -89,7 +89,7 @@
                        mclk-fs = <256>;
 
                        codec {
-                               sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
+                               sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
                        };
                };
 
@@ -154,6 +154,10 @@
        clock-latency = <50000>;
 };
 
+&frddr_a {
+       status = "okay";
+};
+
 &frddr_b {
        status = "okay";
 };
@@ -178,11 +182,11 @@
        status = "okay";
 };
 
-&tdmif_b {
+&tdmif_a {
        status = "okay";
 };
 
-&tdmout_b {
+&tdmout_a {
        status = "okay";
 };