samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: enable external display only for QGKI

Browse Source 
Add external display dai links to sound card only when
CONFIG_AUDIO_QGKI is enabled.

Change-Id: Ic67def877cddeb08aebcfc00ab4886826905b7c2
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
This commit is contained in:
Vignesh Kulothungan
2020-03-04 16:17:49 -08:00
committed by Gerrit - the friendly Code Review server
parent 2ff57c7749
commit f6ace7d5da
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asoc/lahaina.c
View File

@@ -6291,6 +6291,7 @@ static struct snd_soc_dai_link msm_wcn_btfm_be_dai_links[] = {
}, },
}; };
#if IS_ENABLED(CONFIG_AUDIO_QGKI)
static struct snd_soc_dai_link ext_disp_be_dai_link[] = { static struct snd_soc_dai_link ext_disp_be_dai_link[] = {
/* DISP PORT BACK END DAI Link */ /* DISP PORT BACK END DAI Link */
{ {
@@ -6317,6 +6318,7 @@ static struct snd_soc_dai_link ext_disp_be_dai_link[] = {
SND_SOC_DAILINK_REG(display_port1), SND_SOC_DAILINK_REG(display_port1),
}, },
}; };
#endif
static struct snd_soc_dai_link msm_mi2s_be_dai_links[] = { static struct snd_soc_dai_link msm_mi2s_be_dai_links[] = {
{ {
@@ -6789,7 +6791,9 @@ static struct snd_soc_dai_link msm_lahaina_dai_links[
ARRAY_SIZE(msm_wsa_cdc_dma_be_dai_links) + ARRAY_SIZE(msm_wsa_cdc_dma_be_dai_links) +
ARRAY_SIZE(msm_rx_tx_cdc_dma_be_dai_links) + ARRAY_SIZE(msm_rx_tx_cdc_dma_be_dai_links) +
ARRAY_SIZE(msm_va_cdc_dma_be_dai_links) + ARRAY_SIZE(msm_va_cdc_dma_be_dai_links) +
#if IS_ENABLED(CONFIG_AUDIO_QGKI)
ARRAY_SIZE(ext_disp_be_dai_link) + ARRAY_SIZE(ext_disp_be_dai_link) +
#endif
ARRAY_SIZE(msm_wcn_be_dai_links) + ARRAY_SIZE(msm_wcn_be_dai_links) +
ARRAY_SIZE(msm_afe_rxtx_lb_be_dai_link) + ARRAY_SIZE(msm_afe_rxtx_lb_be_dai_link) +
ARRAY_SIZE(msm_wcn_btfm_be_dai_links)]; ARRAY_SIZE(msm_wcn_btfm_be_dai_links)];
@@ -7071,6 +7075,7 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
} }
} }
#if IS_ENABLED(CONFIG_AUDIO_QGKI)
rc = of_property_read_u32(dev->of_node, rc = of_property_read_u32(dev->of_node,
"qcom,ext-disp-audio-rx", &val); "qcom,ext-disp-audio-rx", &val);
if (!rc && val) { if (!rc && val) {
@@ -7081,6 +7086,7 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
sizeof(ext_disp_be_dai_link)); sizeof(ext_disp_be_dai_link));
total_links += ARRAY_SIZE(ext_disp_be_dai_link); total_links += ARRAY_SIZE(ext_disp_be_dai_link);
} }
#endif
rc = of_property_read_u32(dev->of_node, "qcom,wcn-bt", &val); rc = of_property_read_u32(dev->of_node, "qcom,wcn-bt", &val);
if (!rc && val) { if (!rc && val) {