A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 21:59:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "asoc: lahaina: remove auxpcm be dai when auxpcm is disabled"

Browse source
This commit is contained in:
qctecmdr 2020-12-09 09:48:00 -08:00 • committed by Gerrit - the friendly Code Review server
commit ccbb47efc8
3 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
asoc/holi.c
View file

@ -4180,6 +4180,7 @@ static void holi_tdm_snd_shutdown(struct snd_pcm_substream *substream)
}
}
#ifndef CONFIG_AUXPCM_DISABLE
static int holi_aux_snd_startup(struct snd_pcm_substream *substream)
{
int ret = 0;
@ -4241,6 +4242,7 @@ static void holi_aux_snd_shutdown(struct snd_pcm_substream *substream)
}
}
}
#endif
static int msm_snd_cdc_dma_startup(struct snd_pcm_substream *substream)
{
@ -4574,10 +4576,12 @@ err:
return ret;
}
#ifndef CONFIG_AUXPCM_DISABLE
static struct snd_soc_ops holi_aux_be_ops = {
.startup = holi_aux_snd_startup,
.shutdown = holi_aux_snd_shutdown
};
#endif
static struct snd_soc_ops holi_tdm_be_ops = {
.hw_params = holi_tdm_snd_hw_params,
@ -5665,6 +5669,7 @@ static struct snd_soc_dai_link msm_mi2s_be_dai_links[] = {
},
};
#ifndef CONFIG_AUXPCM_DISABLE
static struct snd_soc_dai_link msm_auxpcm_be_dai_links[] = {
/* Primary AUX PCM Backend DAI Links */
{
@ -5761,6 +5766,7 @@ static struct snd_soc_dai_link msm_auxpcm_be_dai_links[] = {
SND_SOC_DAILINK_REG(quat_auxpcm_tx),
},
};
#endif
static struct snd_soc_dai_link msm_rx_tx_cdc_dma_be_dai_links[] = {
/* RX CDC DMA Backend DAI Links */
@ -5906,7 +5912,9 @@ static struct snd_soc_dai_link msm_holi_dai_links[
ARRAY_SIZE(msm_common_misc_fe_dai_links) +
ARRAY_SIZE(msm_common_be_dai_links) +
ARRAY_SIZE(msm_mi2s_be_dai_links) +
#ifndef CONFIG_AUXPCM_DISABLE
ARRAY_SIZE(msm_auxpcm_be_dai_links) +
#endif
ARRAY_SIZE(msm_rx_tx_cdc_dma_be_dai_links) +
ARRAY_SIZE(msm_va_cdc_dma_be_dai_links) +
ARRAY_SIZE(msm_afe_rxtx_lb_be_dai_link) +
@ -6162,7 +6170,6 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
int total_links = 0;
int rc = 0;
u32 mi2s_audio_intf = 0;
u32 auxpcm_audio_intf = 0;
u32 val = 0;
u32 wcn_btfm_intf = 0;
const struct of_device_id *match;
@ -6218,15 +6225,15 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
ARRAY_SIZE(msm_mi2s_be_dai_links);
}
}
#ifndef CONFIG_AUXPCM_DISABLE
rc = of_property_read_u32(dev->of_node,
"qcom,auxpcm-audio-intf",
&auxpcm_audio_intf);
&val);
if (rc) {
dev_dbg(dev, "%s: No DT match Aux PCM interface\n",
__func__);
} else {
if (auxpcm_audio_intf) {
if (val) {
memcpy(msm_holi_dai_links + total_links,
msm_auxpcm_be_dai_links,
sizeof(msm_auxpcm_be_dai_links));
@ -6234,6 +6241,7 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
ARRAY_SIZE(msm_auxpcm_be_dai_links);
}
}
#endif
rc = of_property_read_u32(dev->of_node, "qcom,afe-rxtx-lb",
&val);

16
asoc/lahaina.c
View file

@ -4934,6 +4934,7 @@ static void lahaina_tdm_snd_shutdown(struct snd_pcm_substream *substream)
}
}
#ifndef CONFIG_AUXPCM_DISABLE
static int lahaina_aux_snd_startup(struct snd_pcm_substream *substream)
{
int ret = 0;
@ -4995,6 +4996,7 @@ static void lahaina_aux_snd_shutdown(struct snd_pcm_substream *substream)
}
}
}
#endif
static int msm_snd_cdc_dma_startup(struct snd_pcm_substream *substream)
{
@ -5474,10 +5476,12 @@ err:
return ret;
}
#ifndef CONFIG_AUXPCM_DISABLE
static struct snd_soc_ops lahaina_aux_be_ops = {
.startup = lahaina_aux_snd_startup,
.shutdown = lahaina_aux_snd_shutdown
};
#endif
static struct snd_soc_ops lahaina_tdm_be_ops = {
.hw_params = lahaina_tdm_snd_hw_params,
@ -6766,6 +6770,7 @@ static struct snd_soc_dai_link msm_mi2s_be_dai_links[] = {
},
};
#ifndef CONFIG_AUXPCM_DISABLE
static struct snd_soc_dai_link msm_auxpcm_be_dai_links[] = {
/* Primary AUX PCM Backend DAI Links */
{
@ -6908,6 +6913,7 @@ static struct snd_soc_dai_link msm_auxpcm_be_dai_links[] = {
SND_SOC_DAILINK_REG(sen_auxpcm_tx),
},
};
#endif
static struct snd_soc_dai_link msm_wsa_cdc_dma_be_dai_links[] = {
/* WSA CDC DMA Backend DAI Links */
@ -7134,7 +7140,9 @@ static struct snd_soc_dai_link msm_lahaina_dai_links[
ARRAY_SIZE(msm_common_misc_fe_dai_links) +
ARRAY_SIZE(msm_common_be_dai_links) +
ARRAY_SIZE(msm_mi2s_be_dai_links) +
#ifndef CONFIG_AUXPCM_DISABLE
ARRAY_SIZE(msm_auxpcm_be_dai_links) +
#endif
ARRAY_SIZE(msm_wsa_cdc_dma_be_dai_links) +
ARRAY_SIZE(msm_rx_tx_cdc_dma_be_dai_links) +
ARRAY_SIZE(msm_va_cdc_dma_be_dai_links) +
@ -7441,7 +7449,6 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
int total_links = 0;
int rc = 0;
u32 mi2s_audio_intf = 0;
u32 auxpcm_audio_intf = 0;
u32 val = 0;
u32 wcn_btfm_intf = 0;
const struct of_device_id *match;
@ -7526,15 +7533,15 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
ARRAY_SIZE(msm_mi2s_be_dai_links);
}
}
#ifndef CONFIG_AUXPCM_DISABLE
rc = of_property_read_u32(dev->of_node,
"qcom,auxpcm-audio-intf",
&auxpcm_audio_intf);
&val);
if (rc) {
dev_dbg(dev, "%s: No DT match Aux PCM interface\n",
__func__);
} else {
if (auxpcm_audio_intf) {
if (val) {
memcpy(msm_lahaina_dai_links + total_links,
msm_auxpcm_be_dai_links,
sizeof(msm_auxpcm_be_dai_links));
@ -7542,6 +7549,7 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
ARRAY_SIZE(msm_auxpcm_be_dai_links);
}
}
#endif
#if IS_ENABLED(CONFIG_AUDIO_QGKI)
rc = of_property_read_u32(dev->of_node,

7
asoc/msm-dai-q6-v2.c
View file

@ -13506,13 +13506,13 @@ static struct platform_driver msm_dai_cdc_dma_q6 = {
int __init msm_dai_q6_init(void)
{
int rc;
#ifndef CONFIG_AUXPCM_DISABLE
rc = platform_driver_register(&msm_auxpcm_dev_driver);
if (rc) {
pr_err("%s: fail to register auxpcm dev driver", __func__);
goto fail;
return rc;
}
#endif
rc = platform_driver_register(&msm_dai_q6);
if (rc) {
pr_err("%s: fail to register dai q6 driver", __func__);
@ -13596,7 +13596,6 @@ dai_q6_dev_fail:
platform_driver_unregister(&msm_dai_q6);
dai_q6_fail:
platform_driver_unregister(&msm_auxpcm_dev_driver);
fail:
return rc;
}