From 7029d2bde984e6811d8b354e2d2ee6e5b65b3011 Mon Sep 17 00:00:00 2001 From: Xing Wang Date: Sat, 29 Dec 2018 19:14:23 +0800 Subject: [PATCH] audio: auge: fix sharebuffer channel map [1/1] PD#SWPL-2645 Problem: play ddp source, then play pcm source, no sound Solution: 1. fix same source control and channel map issue 2. i2s 8ch, spdif 2ch, channels are not mapped, make spdif 8 channel mask 3. when same source used, keep mpll use same mpll Verify: x301 Change-Id: I2fe4bbcbcbfff0a1c1a6cebf61d1da5aba9b7a9d Signed-off-by: Xing Wang Conflicts: arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts --- arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts | 2 +- arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts index 4cf33f45b697..a7c8832248d4 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -1322,7 +1322,7 @@ &audiobus { tdma:tdm@0 { - compatible = "amlogic, tl1-snd-tdma"; + compatible = "amlogic, tm2-snd-tdma"; #sound-dai-cells = <0>; dai-tdm-lane-slot-mask-in = <1 0>; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts index 198fce058ec8..d265738263f0 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts @@ -1321,7 +1321,7 @@ &audiobus { tdma:tdm@0 { - compatible = "amlogic, tl1-snd-tdma"; + compatible = "amlogic, tm2-snd-tdma"; #sound-dai-cells = <0>; dai-tdm-lane-slot-mask-in = <1 0>;