arm64: dts: txl: audio: re-map spk and dac mask

PD#170319: arm64: dts: txl: audio: re-map spk and dac mask

Change-Id: I47da64823dfa90460abf2327cd2e628320ef8ab1
Signed-off-by: Xing Wang <xing.wang@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts
index b104a1b6324b5c05f706d0dee578e2064dcb86ed..9af220cbcc85ab887eee5cd27899b141167a05d2 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts
@@ -930,7 +930,7 @@
                };
                Channel_Mask {
                        /*i2s has 4 pins, 8channel, mux output*/
-                       Speaker0_Channel_Mask = "i2s_2/3";
+                       DAC0_Channel_Mask = "i2s_2/3";
                };
        };
 

diff --git a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
index af69487de54a3908d665aa5f324ff7b2a23ac997..de345e80f609052d998be9238b0668764c0dcb69 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
@@ -937,7 +937,7 @@
                };
                Channel_Mask {
                        /*i2s has 4 pins, 8channel, mux output*/
-                       Speaker0_Channel_Mask = "i2s_2/3";
+                       DAC0_Channel_Mask = "i2s_2/3";
                };
        };
 

diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts
index c45f5cb3285a6a3684a21199deeb7db18c306ddf..190a66b6ce32dd9ee13575bb0ac08a326bb6395c 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts
@@ -926,7 +926,7 @@
                };
                Channel_Mask {
                        /*i2s has 4 pins, 8channel, mux output*/
-                       Speaker0_Channel_Mask = "i2s_2/3";
+                       Speaker1_Channel_Mask = "i2s_2/3";
                        DAC0_Channel_Mask = "i2s_2/3";
                };
        };

diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
index f8a3f6277d698088e1d91f126dbf087e1ae95ec7..ff6e23a5f2878bda12d27f6054f91bd100e045bd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
@@ -931,7 +931,7 @@
                };
                Channel_Mask {
                        /*i2s has 4 pins, 8channel, mux output*/
-                       Speaker0_Channel_Mask = "i2s_2/3";
+                       Speaker1_Channel_Mask = "i2s_2/3";
                        DAC0_Channel_Mask = "i2s_2/3";
                };
        };

diff --git a/sound/soc/amlogic/meson/tv.c b/sound/soc/amlogic/meson/tv.c
index a8841135a7dccf010c3bbcc80474f76bd8f08c11..33a698a092017e087e2bd86b1845c690ffe3ac23 100644 (file)
--- a/sound/soc/amlogic/meson/tv.c
+++ b/sound/soc/amlogic/meson/tv.c
@@ -1797,6 +1797,8 @@ int txl_chipset_init(struct snd_soc_card *card)
 
        /* channel mask */
        parse_speaker_channel_mask(card);
+       /* dac mask */
+       parse_dac_channel_mask(card);
 
        return 0;
 }