From 54b59fcb64d79afab009fd0475696df7e797dc86 Mon Sep 17 00:00:00 2001 From: Xing Wang Date: Thu, 26 Jul 2018 15:51:37 +0800 Subject: [PATCH] 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 --- arch/arm64/boot/dts/amlogic/txl_t950_p341.dts | 2 +- arch/arm64/boot/dts/amlogic/txl_t960_p346.dts | 2 +- arch/arm64/boot/dts/amlogic/txl_t962_p320.dts | 2 +- arch/arm64/boot/dts/amlogic/txl_t962_p321.dts | 2 +- sound/soc/amlogic/meson/tv.c | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts index b104a1b..9af220c 100644 --- 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 af69487..de345e8 100644 --- 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 c45f5cb..190a66b 100644 --- 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 f8a3f62..ff6e23a 100644 --- 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 a884113..33a698a 100644 --- 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; } -- 2.7.4