From 208ec3f1d605d4bd6fc3fe821f5c79d880c78f9e Mon Sep 17 00:00:00 2001 From: David Rhodes Date: Fri, 8 Jun 2018 13:37:54 -0500 Subject: [PATCH] ASoC: cs35l41: Remove DAPM route for ASP TX zero-fill Remove DAPM routes for ASP TX widgets when zero-fill is selected as the source. "Zero" should be selected for the ASP TX source whenever that channel is inactive. For example, when capturing one channel of data from each amp in a stereo setup, ASP TX2, TX3, and TX4 should all have source set to "Zero". Change-Id: I2d1c81307f8d88c4676f458fcfdbfa6a0bcbf750 Signed-off-by: David Rhodes Signed-off-by: Ravi Vembu Mot-CRs-Fixed: (CR) Reviewed-on: https://gerrit.mot.com/1202255 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Submit-Approved: Jira Key --- sound/soc/codecs/cs35l41.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index aedd308eb091..601fc22358aa 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -679,7 +679,6 @@ static const struct snd_soc_dapm_route cs35l41_audio_map[] = { {"ASP TX1 Source", "DSPTX2", "DSP1"}, {"ASP TX1 Source", "ASPRX1", "ASPRX1" }, {"ASP TX1 Source", "ASPRX2", "ASPRX2" }, - {"ASP TX1 Source", "Zero", "ASPRX1" }, {"ASP TX2 Source", "VMON", "VMON ADC"}, {"ASP TX2 Source", "IMON", "IMON ADC"}, {"ASP TX2 Source", "VPMON", "VPMON ADC"}, @@ -687,7 +686,6 @@ static const struct snd_soc_dapm_route cs35l41_audio_map[] = { {"ASP TX2 Source", "DSPTX2", "DSP1"}, {"ASP TX2 Source", "ASPRX1", "ASPRX1" }, {"ASP TX2 Source", "ASPRX2", "ASPRX2" }, - {"ASP TX2 Source", "Zero", "ASPRX1" }, {"ASP TX3 Source", "VMON", "VMON ADC"}, {"ASP TX3 Source", "IMON", "IMON ADC"}, {"ASP TX3 Source", "VPMON", "VPMON ADC"}, @@ -695,7 +693,6 @@ static const struct snd_soc_dapm_route cs35l41_audio_map[] = { {"ASP TX3 Source", "DSPTX2", "DSP1"}, {"ASP TX3 Source", "ASPRX1", "ASPRX1" }, {"ASP TX3 Source", "ASPRX2", "ASPRX2" }, - {"ASP TX3 Source", "Zero", "ASPRX1" }, {"ASP TX4 Source", "VMON", "VMON ADC"}, {"ASP TX4 Source", "IMON", "IMON ADC"}, {"ASP TX4 Source", "VPMON", "VPMON ADC"}, @@ -703,7 +700,6 @@ static const struct snd_soc_dapm_route cs35l41_audio_map[] = { {"ASP TX4 Source", "DSPTX2", "DSP1"}, {"ASP TX4 Source", "ASPRX1", "ASPRX1" }, {"ASP TX4 Source", "ASPRX2", "ASPRX2" }, - {"ASP TX4 Source", "Zero", "ASPRX1" }, {"ASPTX1", NULL, "ASP TX1 Source"}, {"ASPTX2", NULL, "ASP TX2 Source"}, {"ASPTX3", NULL, "ASP TX3 Source"}, @@ -1341,7 +1337,7 @@ static struct snd_soc_codec_driver soc_codec_dev_cs35l41 = { .num_controls = ARRAY_SIZE(cs35l41_aud_controls), }, .set_sysclk = cs35l41_codec_set_sysclk, - .ignore_pmdown_time = false, + .ignore_pmdown_time = true, }; static int cs35l41_handle_of_data(struct device *dev,