diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-19 10:17:14 +0900 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-06-19 12:51:48 +0100 |
| commit | 717f163317127bc5fdc0d90ad42e3d309dac0df0 (patch) | |
| tree | 401d4dc8d2be164c1aefb7f1d66b4a672007b297 /sound/soc/kirkwood/armada-370-db.c | |
| parent | ASoC: fsl: imx-audmix: don't select unnecessary Platform (diff) | |
| download | wireguard-linux-717f163317127bc5fdc0d90ad42e3d309dac0df0.tar.xz wireguard-linux-717f163317127bc5fdc0d90ad42e3d309dac0df0.zip | |
ASoC: kirkwood: armada-370-db: don't select unnecessary Platform
ALSA SoC is now supporting "no Platform". Sound card doesn't need to
select "CPU component" as "Platform" anymore if it doesn't need
special Platform.
This patch removes such settings.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/kirkwood/armada-370-db.c')
| -rw-r--r-- | sound/soc/kirkwood/armada-370-db.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/kirkwood/armada-370-db.c b/sound/soc/kirkwood/armada-370-db.c index b2d735b610b8..14f41ea874ef 100644 --- a/sound/soc/kirkwood/armada-370-db.c +++ b/sound/soc/kirkwood/armada-370-db.c @@ -60,18 +60,15 @@ static const struct snd_soc_dapm_route a370db_route[] = { SND_SOC_DAILINK_DEFS(analog, DAILINK_COMP_ARRAY(COMP_CPU("i2s")), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi")), - DAILINK_COMP_ARRAY(COMP_EMPTY())); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi"))); SND_SOC_DAILINK_DEFS(spdif_out, DAILINK_COMP_ARRAY(COMP_CPU("spdif")), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi")), - DAILINK_COMP_ARRAY(COMP_EMPTY())); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi"))); SND_SOC_DAILINK_DEFS(spdif_in, DAILINK_COMP_ARRAY(COMP_CPU("spdif")), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi")), - DAILINK_COMP_ARRAY(COMP_EMPTY())); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi"))); static struct snd_soc_dai_link a370db_dai[] = { { @@ -115,21 +112,18 @@ static int a370db_probe(struct platform_device *pdev) a370db_dai[0].cpus->of_node = of_parse_phandle(pdev->dev.of_node, "marvell,audio-controller", 0); - a370db_dai[0].platforms->of_node = a370db_dai[0].cpus->of_node; a370db_dai[0].codecs->of_node = of_parse_phandle(pdev->dev.of_node, "marvell,audio-codec", 0); a370db_dai[1].cpus->of_node = a370db_dai[0].cpus->of_node; - a370db_dai[1].platforms->of_node = a370db_dai[0].cpus->of_node; a370db_dai[1].codecs->of_node = of_parse_phandle(pdev->dev.of_node, "marvell,audio-codec", 1); a370db_dai[2].cpus->of_node = a370db_dai[0].cpus->of_node; - a370db_dai[2].platforms->of_node = a370db_dai[0].cpus->of_node; a370db_dai[2].codecs->of_node = of_parse_phandle(pdev->dev.of_node, |