summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-18 21:17:14 -0400
committerMark Brown <broonie@kernel.org>2019-06-19 07:51:48 -0400
commit717f163317127bc5fdc0d90ad42e3d309dac0df0 (patch)
tree401d4dc8d2be164c1aefb7f1d66b4a672007b297
parentd8893261a7d327302520eb9bebb72c5040c2219f (diff)
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>
-rw-r--r--sound/soc/kirkwood/armada-370-db.c12
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[] = {
60 60
61SND_SOC_DAILINK_DEFS(analog, 61SND_SOC_DAILINK_DEFS(analog,
62 DAILINK_COMP_ARRAY(COMP_CPU("i2s")), 62 DAILINK_COMP_ARRAY(COMP_CPU("i2s")),
63 DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi")), 63 DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi")));
64 DAILINK_COMP_ARRAY(COMP_EMPTY()));
65 64
66SND_SOC_DAILINK_DEFS(spdif_out, 65SND_SOC_DAILINK_DEFS(spdif_out,
67 DAILINK_COMP_ARRAY(COMP_CPU("spdif")), 66 DAILINK_COMP_ARRAY(COMP_CPU("spdif")),
68 DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi")), 67 DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi")));
69 DAILINK_COMP_ARRAY(COMP_EMPTY()));
70 68
71SND_SOC_DAILINK_DEFS(spdif_in, 69SND_SOC_DAILINK_DEFS(spdif_in,
72 DAILINK_COMP_ARRAY(COMP_CPU("spdif")), 70 DAILINK_COMP_ARRAY(COMP_CPU("spdif")),
73 DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi")), 71 DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi")));
74 DAILINK_COMP_ARRAY(COMP_EMPTY()));
75 72
76static struct snd_soc_dai_link a370db_dai[] = { 73static struct snd_soc_dai_link a370db_dai[] = {
77{ 74{
@@ -115,21 +112,18 @@ static int a370db_probe(struct platform_device *pdev)
115 a370db_dai[0].cpus->of_node = 112 a370db_dai[0].cpus->of_node =
116 of_parse_phandle(pdev->dev.of_node, 113 of_parse_phandle(pdev->dev.of_node,
117 "marvell,audio-controller", 0); 114 "marvell,audio-controller", 0);
118 a370db_dai[0].platforms->of_node = a370db_dai[0].cpus->of_node;
119 115
120 a370db_dai[0].codecs->of_node = 116 a370db_dai[0].codecs->of_node =
121 of_parse_phandle(pdev->dev.of_node, 117 of_parse_phandle(pdev->dev.of_node,
122 "marvell,audio-codec", 0); 118 "marvell,audio-codec", 0);
123 119
124 a370db_dai[1].cpus->of_node = a370db_dai[0].cpus->of_node; 120 a370db_dai[1].cpus->of_node = a370db_dai[0].cpus->of_node;
125 a370db_dai[1].platforms->of_node = a370db_dai[0].cpus->of_node;
126 121
127 a370db_dai[1].codecs->of_node = 122 a370db_dai[1].codecs->of_node =
128 of_parse_phandle(pdev->dev.of_node, 123 of_parse_phandle(pdev->dev.of_node,
129 "marvell,audio-codec", 1); 124 "marvell,audio-codec", 1);
130 125
131 a370db_dai[2].cpus->of_node = a370db_dai[0].cpus->of_node; 126 a370db_dai[2].cpus->of_node = a370db_dai[0].cpus->of_node;
132 a370db_dai[2].platforms->of_node = a370db_dai[0].cpus->of_node;
133 127
134 a370db_dai[2].codecs->of_node = 128 a370db_dai[2].codecs->of_node =
135 of_parse_phandle(pdev->dev.of_node, 129 of_parse_phandle(pdev->dev.of_node,