|
@@ -383,6 +383,7 @@ static struct snd_soc_dai_link tm2_dai_links[] = {
|
|
{
|
|
{
|
|
.name = "WM5110 AIF1",
|
|
.name = "WM5110 AIF1",
|
|
.stream_name = "HiFi Primary",
|
|
.stream_name = "HiFi Primary",
|
|
|
|
+ .cpu_dai_name = SAMSUNG_I2S_DAI,
|
|
.codec_dai_name = "wm5110-aif1",
|
|
.codec_dai_name = "wm5110-aif1",
|
|
.ops = &tm2_aif1_ops,
|
|
.ops = &tm2_aif1_ops,
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
@@ -390,6 +391,7 @@ static struct snd_soc_dai_link tm2_dai_links[] = {
|
|
}, {
|
|
}, {
|
|
.name = "WM5110 Voice",
|
|
.name = "WM5110 Voice",
|
|
.stream_name = "Voice call",
|
|
.stream_name = "Voice call",
|
|
|
|
+ .cpu_dai_name = SAMSUNG_I2S_DAI,
|
|
.codec_dai_name = "wm5110-aif2",
|
|
.codec_dai_name = "wm5110-aif2",
|
|
.ops = &tm2_aif2_ops,
|
|
.ops = &tm2_aif2_ops,
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
@@ -398,6 +400,7 @@ static struct snd_soc_dai_link tm2_dai_links[] = {
|
|
}, {
|
|
}, {
|
|
.name = "WM5110 BT",
|
|
.name = "WM5110 BT",
|
|
.stream_name = "Bluetooth",
|
|
.stream_name = "Bluetooth",
|
|
|
|
+ .cpu_dai_name = SAMSUNG_I2S_DAI,
|
|
.codec_dai_name = "wm5110-aif3",
|
|
.codec_dai_name = "wm5110-aif3",
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBM_CFM,
|
|
SND_SOC_DAIFMT_CBM_CFM,
|
|
@@ -477,7 +480,6 @@ static int tm2_probe(struct platform_device *pdev)
|
|
}
|
|
}
|
|
|
|
|
|
for (i = 0; i < card->num_links; i++) {
|
|
for (i = 0; i < card->num_links; i++) {
|
|
- card->dai_link[i].cpu_dai_name = NULL;
|
|
|
|
card->dai_link[i].cpu_name = NULL;
|
|
card->dai_link[i].cpu_name = NULL;
|
|
card->dai_link[i].platform_name = NULL;
|
|
card->dai_link[i].platform_name = NULL;
|
|
card->dai_link[i].codec_of_node = codec_dai_node;
|
|
card->dai_link[i].codec_of_node = codec_dai_node;
|