summaryrefslogtreecommitdiff
path: root/sound/soc/ti
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 04:19:18 +0300
committerMark Brown <broonie@kernel.org>2019-06-19 14:58:01 +0300
commitbfe1273c65e1c97ed3861fecd4812f2feeb67800 (patch)
tree1ec2318a54773029fb632ab5cfcb722df4276c97 /sound/soc/ti
parentedba13aeae88feda7b689bccbbcdc911377a3fdd (diff)
downloadlinux-bfe1273c65e1c97ed3861fecd4812f2feeb67800.tar.xz
ASoC: ti: omap-twl4030: 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/ti')
-rw-r--r--sound/soc/ti/omap-twl4030.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/ti/omap-twl4030.c b/sound/soc/ti/omap-twl4030.c
index ddd24b2809b8..266999804cfd 100644
--- a/sound/soc/ti/omap-twl4030.c
+++ b/sound/soc/ti/omap-twl4030.c
@@ -211,13 +211,11 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)
/* Digital audio interface glue - connects codec <--> CPU */
SND_SOC_DAILINK_DEFS(hifi,
DAILINK_COMP_ARRAY(COMP_CPU("omap-mcbsp.2")),
- DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-hifi")),
- DAILINK_COMP_ARRAY(COMP_PLATFORM("omap-mcbsp.2")));
+ DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-hifi")));
SND_SOC_DAILINK_DEFS(voice,
DAILINK_COMP_ARRAY(COMP_CPU("omap-mcbsp.3")),
- DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-voice")),
- DAILINK_COMP_ARRAY(COMP_PLATFORM("omap-mcbsp.3")));
+ DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-voice")));
static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
{
@@ -279,18 +277,12 @@ static int omap_twl4030_probe(struct platform_device *pdev)
omap_twl4030_dai_links[0].cpus->dai_name = NULL;
omap_twl4030_dai_links[0].cpus->of_node = dai_node;
- omap_twl4030_dai_links[0].platforms->name = NULL;
- omap_twl4030_dai_links[0].platforms->of_node = dai_node;
-
dai_node = of_parse_phandle(node, "ti,mcbsp-voice", 0);
if (!dai_node) {
card->num_links = 1;
} else {
omap_twl4030_dai_links[1].cpus->dai_name = NULL;
omap_twl4030_dai_links[1].cpus->of_node = dai_node;
-
- omap_twl4030_dai_links[1].platforms->name = NULL;
- omap_twl4030_dai_links[1].platforms->of_node = dai_node;
}
priv->jack_detect = of_get_named_gpio(node,