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-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "asoc: qcs405: add missing dai links"

Browse source
This commit is contained in:
Linux Build Service Account 2018-08-25 04:00:43 -07:00 • committed by Gerrit - the friendly Code Review server
commit 24a544956c
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
asoc/qcs405.c
View file

@ -7566,7 +7566,7 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
int total_links = 0;
uint32_t tasha_codec = 0, auxpcm_audio_intf = 0;
uint32_t va_bolero_codec = 0, wsa_bolero_codec = 0, mi2s_audio_intf = 0;
uint32_t spdif_audio_intf = 0;
uint32_t spdif_audio_intf = 0, wcn_audio_intf = 0;
const struct of_device_id *match;
char __iomem *spdif_cfg, *spdif_pin_ctl;
int rc = 0;
@ -7710,6 +7710,20 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
iowrite32(0x2220, spdif_pin_ctl);
}
}
rc = of_property_read_u32(dev->of_node, "qcom,wcn-btfm",
&wcn_audio_intf);
if (rc) {
dev_dbg(dev, "%s: No DT match WCN audio interface\n",
__func__);
} else {
if (wcn_audio_intf) {
memcpy(msm_qcs405_dai_links + total_links,
msm_wcn_be_dai_links,
sizeof(msm_wcn_be_dai_links));
total_links +=
ARRAY_SIZE(msm_wcn_be_dai_links);
}
}
dailink = msm_qcs405_dai_links;
} else if (!strcmp(match->data, "stub_codec")) {
card = &snd_soc_card_stub_msm;