audio: solve av out output level low issue [2/2]

PD#SWPL-766

Problem:
  av output level only 100mv

Solution:
  change the channel map for av out,
  use orignal pcm for output w/o volume
  control and postprocess.

Verify:
  verified by r311

Change-Id: Ibeaf0ecfda03f81ff6061dc9c4975049452ba659
Signed-off-by: Lianlian Zhu <lianlian.zhu@amlogic.com>
Signed-off-by: Jian Xu <jian.xu@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index 2c5963c68ac03cc9ab10c496d1068277d08e611b..d7597053489344359b672b31e2eeaaa0a94491fe 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -1277,8 +1277,8 @@
                Channel_Mask {
                        /*i2s has 4 pins, 8channel, mux output*/
                        Speaker0_Channel_Mask = "i2s_2/3";
-                       DAC0_Channel_Mask = "i2s_2/3";
-                       DAC1_Channel_Mask = "i2s_2/3";
+                       DAC0_Channel_Mask = "i2s_4/5";
+                       DAC1_Channel_Mask = "i2s_4/5";
                        EQ_DRC_Channel_Mask = "i2s_2/3";
                        Spdif_samesource_Channel_Mask = "i2s_0/1";
                };

diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index ea892b92fafec5be5868cb678d56ca6a3a637178..95164b3a993321154245d59ff68ca882d02f2ffa 100644 (file)
--- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -1283,8 +1283,8 @@
                Channel_Mask {
                        /*i2s has 4 pins, 8channel, mux output*/
                        Speaker0_Channel_Mask = "i2s_2/3";
-                       DAC0_Channel_Mask = "i2s_2/3";
-                       DAC1_Channel_Mask = "i2s_2/3";
+                       DAC0_Channel_Mask = "i2s_4/5";
+                       DAC1_Channel_Mask = "i2s_4/5";
                        EQ_DRC_Channel_Mask = "i2s_2/3";
                        Spdif_samesource_Channel_Mask = "i2s_0/1";
                };

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index 5c07b358ea200cef0636a95cbea7a49568c3b9ce..5191319c1b5dfa5a92a19abb48a3d76d61322342 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -1274,8 +1274,8 @@
                Channel_Mask {
                        /*i2s has 4 pins, 8channel, mux output*/
                        Speaker0_Channel_Mask = "i2s_2/3";
-                       DAC0_Channel_Mask = "i2s_2/3";
-                       DAC1_Channel_Mask = "i2s_2/3";
+                       DAC0_Channel_Mask = "i2s_4/5";
+                       DAC1_Channel_Mask = "i2s_4/5";
                        EQ_DRC_Channel_Mask = "i2s_2/3";
                        Spdif_samesource_Channel_Mask = "i2s_0/1";
                };

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index 52653e25751ede8989522f9e097fb6046641c356..8981fe4913589fe2c6203027699567abce1929b8 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -1280,8 +1280,8 @@
                Channel_Mask {
                        /*i2s has 4 pins, 8channel, mux output*/
                        Speaker0_Channel_Mask = "i2s_2/3";
-                       DAC0_Channel_Mask = "i2s_2/3";
-                       DAC1_Channel_Mask = "i2s_2/3";
+                       DAC0_Channel_Mask = "i2s_4/5";
+                       DAC1_Channel_Mask = "i2s_4/5";
                        EQ_DRC_Channel_Mask = "i2s_2/3";
                        Spdif_samesource_Channel_Mask = "i2s_0/1";
                };

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index d275829069150c1830c8b6ec69f9e9c08771b15f..0ef8894de8eca6a57dca30ce43c95d4798e1b112 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -1273,8 +1273,8 @@
                Channel_Mask {
                        /*i2s has 4 pins, 8channel, mux output*/
                        Speaker0_Channel_Mask = "i2s_2/3";
-                       DAC0_Channel_Mask = "i2s_2/3";
-                       DAC1_Channel_Mask = "i2s_2/3";
+                       DAC0_Channel_Mask = "i2s_4/5";
+                       DAC1_Channel_Mask = "i2s_4/5";
                        EQ_DRC_Channel_Mask = "i2s_2/3";
                        Spdif_samesource_Channel_Mask = "i2s_0/1";
                };