ASoC: mediatek: Add second I2S on mt8173-rt5650 machine driver
This patch adds second I2S connection to rt5650 codec for capture path on mt8173-rt5650 machine driver. Signed-off-by: PC Liao <pc.liao@mediatek.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
f55532a0c0
commit
d349caeb05
|
@ -5,11 +5,21 @@ Required properties:
|
||||||
- mediatek,audio-codec: the phandles of rt5650 codecs
|
- mediatek,audio-codec: the phandles of rt5650 codecs
|
||||||
- mediatek,platform: the phandle of MT8173 ASoC platform
|
- mediatek,platform: the phandle of MT8173 ASoC platform
|
||||||
|
|
||||||
|
Optional subnodes:
|
||||||
|
- codec-capture : the subnode of rt5650 codec capture
|
||||||
|
Required codec-capture subnode properties:
|
||||||
|
- sound-dai: audio codec dai name on capture path
|
||||||
|
<&rt5650 0> : Default setting. Connect rt5650 I2S1 for capture. (dai_name = rt5645-aif1)
|
||||||
|
<&rt5650 1> : Connect rt5650 I2S2 for capture. (dai_name = rt5645-aif2)
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
sound {
|
sound {
|
||||||
compatible = "mediatek,mt8173-rt5650";
|
compatible = "mediatek,mt8173-rt5650";
|
||||||
mediatek,audio-codec = <&rt5650>;
|
mediatek,audio-codec = <&rt5650>;
|
||||||
mediatek,platform = <&afe>;
|
mediatek,platform = <&afe>;
|
||||||
|
codec-capture {
|
||||||
|
sound-dai = <&rt5650 1>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -85,12 +85,29 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
|
||||||
{
|
{
|
||||||
struct snd_soc_card *card = runtime->card;
|
struct snd_soc_card *card = runtime->card;
|
||||||
struct snd_soc_codec *codec = runtime->codec_dais[0]->codec;
|
struct snd_soc_codec *codec = runtime->codec_dais[0]->codec;
|
||||||
|
const char *codec_capture_dai = runtime->codec_dais[1]->name;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
rt5645_sel_asrc_clk_src(codec,
|
rt5645_sel_asrc_clk_src(codec,
|
||||||
RT5645_DA_STEREO_FILTER |
|
RT5645_DA_STEREO_FILTER,
|
||||||
RT5645_AD_STEREO_FILTER,
|
|
||||||
RT5645_CLK_SEL_I2S1_ASRC);
|
RT5645_CLK_SEL_I2S1_ASRC);
|
||||||
|
|
||||||
|
if (!strcmp(codec_capture_dai, "rt5645-aif1")) {
|
||||||
|
rt5645_sel_asrc_clk_src(codec,
|
||||||
|
RT5645_AD_STEREO_FILTER,
|
||||||
|
RT5645_CLK_SEL_I2S1_ASRC);
|
||||||
|
} else if (!strcmp(codec_capture_dai, "rt5645-aif2")) {
|
||||||
|
rt5645_sel_asrc_clk_src(codec,
|
||||||
|
RT5645_AD_STEREO_FILTER,
|
||||||
|
RT5645_CLK_SEL_I2S2_ASRC);
|
||||||
|
} else {
|
||||||
|
dev_warn(card->dev,
|
||||||
|
"Only one dai codec found in DTS, enabled rt5645 AD filter\n");
|
||||||
|
rt5645_sel_asrc_clk_src(codec,
|
||||||
|
RT5645_AD_STEREO_FILTER,
|
||||||
|
RT5645_CLK_SEL_I2S1_ASRC);
|
||||||
|
}
|
||||||
|
|
||||||
/* enable jack detection */
|
/* enable jack detection */
|
||||||
ret = snd_soc_card_jack_new(card, "Headset Jack",
|
ret = snd_soc_card_jack_new(card, "Headset Jack",
|
||||||
SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |
|
SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |
|
||||||
|
@ -110,6 +127,11 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime)
|
||||||
|
|
||||||
static struct snd_soc_dai_link_component mt8173_rt5650_codecs[] = {
|
static struct snd_soc_dai_link_component mt8173_rt5650_codecs[] = {
|
||||||
{
|
{
|
||||||
|
/* Playback */
|
||||||
|
.dai_name = "rt5645-aif1",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
/* Capture */
|
||||||
.dai_name = "rt5645-aif1",
|
.dai_name = "rt5645-aif1",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -149,7 +171,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = {
|
||||||
.cpu_dai_name = "I2S",
|
.cpu_dai_name = "I2S",
|
||||||
.no_pcm = 1,
|
.no_pcm = 1,
|
||||||
.codecs = mt8173_rt5650_codecs,
|
.codecs = mt8173_rt5650_codecs,
|
||||||
.num_codecs = 1,
|
.num_codecs = 2,
|
||||||
.init = mt8173_rt5650_init,
|
.init = mt8173_rt5650_init,
|
||||||
.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_CBS_CFS,
|
SND_SOC_DAIFMT_CBS_CFS,
|
||||||
|
@ -177,6 +199,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct snd_soc_card *card = &mt8173_rt5650_card;
|
struct snd_soc_card *card = &mt8173_rt5650_card;
|
||||||
struct device_node *platform_node;
|
struct device_node *platform_node;
|
||||||
|
struct device_node *np;
|
||||||
|
const char *codec_capture_dai;
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
platform_node = of_parse_phandle(pdev->dev.of_node,
|
platform_node = of_parse_phandle(pdev->dev.of_node,
|
||||||
|
@ -199,6 +223,26 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev)
|
||||||
"Property 'audio-codec' missing or invalid\n");
|
"Property 'audio-codec' missing or invalid\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
mt8173_rt5650_codecs[1].of_node = mt8173_rt5650_codecs[0].of_node;
|
||||||
|
|
||||||
|
if (of_find_node_by_name(platform_node, "codec-capture")) {
|
||||||
|
np = of_get_child_by_name(pdev->dev.of_node, "codec-capture");
|
||||||
|
if (!np) {
|
||||||
|
dev_err(&pdev->dev,
|
||||||
|
"%s: Can't find codec-capture DT node\n",
|
||||||
|
__func__);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
ret = snd_soc_of_get_dai_name(np, &codec_capture_dai);
|
||||||
|
if (ret < 0) {
|
||||||
|
dev_err(&pdev->dev,
|
||||||
|
"%s codec_capture_dai name fail %d\n",
|
||||||
|
__func__, ret);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
mt8173_rt5650_codecs[1].dai_name = codec_capture_dai;
|
||||||
|
}
|
||||||
|
|
||||||
card->dev = &pdev->dev;
|
card->dev = &pdev->dev;
|
||||||
platform_set_drvdata(pdev, card);
|
platform_set_drvdata(pdev, card);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue