commit 9cdf4ea68d01e0c90d2abdf025cb15113ad2bac0
author Xiaojun Sang <xsang@codeaurora.org> Mon Jul 13 09:24:29 2020 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 23 22:20:19 2020 -0700
tree e2c988b628afe28756533566f6bb130d01215006
parent a30cbcb6e00730b79e3eb4ff0270bce1393cc4e2

hal: assign RX_CDC_DMA_RX_0 for speaker on bengal-scuba

Backend assignment for bengal-scuba is incorrect. Bengal-scuba
uses RX_CDC_DMA_RX_0 for for WSA analog mode with soundwire.

Change-Id: Id48a0106fb2f1ce317568e3a01fc870587e9fb17

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 0be37a4..2ebd4d6 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3775,20 +3775,21 @@
                         strdup("RX_CDC_DMA_RX_1 SampleRate");
                 default_rx_backend = strdup("RX_CDC_DMA_RX_1");
                 my_data->is_multiple_sample_rate_combo_supported = false;
-            }
-
-            if (!strncmp(snd_card_name, "bengal-scuba", strlen("bengal-scuba")))
+            } else if (!strncmp(snd_card_name, "bengal-scuba", strlen("bengal-scuba"))) {
+                my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].bitwidth_mixer_ctl =
+                        strdup("RX_CDC_DMA_RX_0 Format");
+                my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].samplerate_mixer_ctl =
+                        strdup("RX_CDC_DMA_RX_0 SampleRate");
+                default_rx_backend = strdup("RX_CDC_DMA_RX_0");
                 my_data->is_multiple_sample_rate_combo_supported = false;
+            }
         } else if (!strncmp(snd_card_name, "sdm660", strlen("sdm660")) ||
                !strncmp(snd_card_name, "sdm670", strlen("sdm670")) ||
                !strncmp(snd_card_name, "qcs605", strlen("qcs605"))) {
-
-
             my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].bitwidth_mixer_ctl =
                 strdup("INT4_MI2S_RX Format");
             my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].samplerate_mixer_ctl =
                 strdup("INT4_MI2S_RX SampleRate");
-
             my_data->current_backend_cfg[DEFAULT_CODEC_TX_BACKEND].bitwidth_mixer_ctl =
                 strdup("INT3_MI2S_TX Format");
             my_data->current_backend_cfg[DEFAULT_CODEC_TX_BACKEND].samplerate_mixer_ctl =
@@ -3797,7 +3798,6 @@
                 strdup("INT0_MI2S_RX Format");
             my_data->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
                 strdup("INT0_MI2S_RX SampleRate");
-
             if (default_rx_backend)
                 free(default_rx_backend);
             default_rx_backend = strdup("INT4_MI2S_RX");