summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-18 21:15:05 -0400
committerMark Brown <broonie@kernel.org>2019-06-19 07:49:02 -0400
commit318ebbe8060d9664370c844029246f0588263fe4 (patch)
tree0d5aa3df5df72cec7cd4cb7a59525f59e3e297fb /sound/soc/atmel
parent3609750e9d4ba9db7027866827a0e462fbe86866 (diff)
ASoC: atmel: mikroe-proto: 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/atmel')
-rw-r--r--sound/soc/atmel/mikroe-proto.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c
index 255168a9df5b..5335ca0ee086 100644
--- a/sound/soc/atmel/mikroe-proto.c
+++ b/sound/soc/atmel/mikroe-proto.c
@@ -88,8 +88,8 @@ static int snd_proto_probe(struct platform_device *pdev)
88 if (!dai) 88 if (!dai)
89 return -ENOMEM; 89 return -ENOMEM;
90 90
91 /* for cpus/codecs/platforms */ 91 /* for cpus/codecs */
92 comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL); 92 comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL);
93 if (!comp) 93 if (!comp)
94 return -ENOMEM; 94 return -ENOMEM;
95 95
@@ -100,8 +100,6 @@ static int snd_proto_probe(struct platform_device *pdev)
100 dai->num_cpus = 1; 100 dai->num_cpus = 1;
101 dai->codecs = &comp[1]; 101 dai->codecs = &comp[1];
102 dai->num_codecs = 1; 102 dai->num_codecs = 1;
103 dai->platforms = &comp[2];
104 dai->num_platforms = 1;
105 103
106 dai->name = "WM8731"; 104 dai->name = "WM8731";
107 dai->stream_name = "WM8731 HiFi"; 105 dai->stream_name = "WM8731 HiFi";
@@ -121,7 +119,6 @@ static int snd_proto_probe(struct platform_device *pdev)
121 return -EINVAL; 119 return -EINVAL;
122 } 120 }
123 dai->cpus->of_node = cpu_np; 121 dai->cpus->of_node = cpu_np;
124 dai->platforms->of_node = cpu_np;
125 122
126 dai_fmt = snd_soc_of_parse_daifmt(np, NULL, 123 dai_fmt = snd_soc_of_parse_daifmt(np, NULL,
127 &bitclkmaster, &framemaster); 124 &bitclkmaster, &framemaster);