diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-06 06:19:10 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-06 23:09:54 +0200 |
| commit | f60adf38514183b897301cdf616ef8bf5ef34094 (patch) | |
| tree | a00cd99c417852ee5d815c71dbf8dfc1556fcc56 /sound/soc/tegra | |
| parent | ASoC: tegra: tegra_wm9712: use modern dai_link style (diff) | |
| download | linux-f60adf38514183b897301cdf616ef8bf5ef34094.tar.xz linux-f60adf38514183b897301cdf616ef8bf5ef34094.zip | |
ASoC: tegra: tegra_max98090: use modern dai_link style
ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/tegra')
| -rw-r--r-- | sound/soc/tegra/tegra_max98090.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c index cf142e2c7bd7..b6c1f4839266 100644 --- a/sound/soc/tegra/tegra_max98090.c +++ b/sound/soc/tegra/tegra_max98090.c @@ -176,14 +176,19 @@ static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) return 0; } +SND_SOC_DAILINK_DEFS(pcm, + DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "HiFi")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + static struct snd_soc_dai_link tegra_max98090_dai = { .name = "max98090", .stream_name = "max98090 PCM", - .codec_dai_name = "HiFi", .init = tegra_max98090_asoc_init, .ops = &tegra_max98090_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, + SND_SOC_DAILINK_REG(pcm), }; static struct snd_soc_card snd_soc_tegra_max98090 = { @@ -230,25 +235,25 @@ static int tegra_max98090_probe(struct platform_device *pdev) if (ret) goto err; - tegra_max98090_dai.codec_of_node = of_parse_phandle(np, + tegra_max98090_dai.codecs->of_node = of_parse_phandle(np, "nvidia,audio-codec", 0); - if (!tegra_max98090_dai.codec_of_node) { + if (!tegra_max98090_dai.codecs->of_node) { dev_err(&pdev->dev, "Property 'nvidia,audio-codec' missing or invalid\n"); ret = -EINVAL; goto err; } - tegra_max98090_dai.cpu_of_node = of_parse_phandle(np, + tegra_max98090_dai.cpus->of_node = of_parse_phandle(np, "nvidia,i2s-controller", 0); - if (!tegra_max98090_dai.cpu_of_node) { + if (!tegra_max98090_dai.cpus->of_node) { dev_err(&pdev->dev, "Property 'nvidia,i2s-controller' missing or invalid\n"); ret = -EINVAL; goto err; } - tegra_max98090_dai.platform_of_node = tegra_max98090_dai.cpu_of_node; + tegra_max98090_dai.platforms->of_node = tegra_max98090_dai.cpus->of_node; ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); if (ret) |