summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-28 04:48:35 +0300
committerMark Brown <broonie@kernel.org>2019-06-28 17:17:03 +0300
commitd3569a47663b6feaa2788e885e84afa1c48741e6 (patch)
tree9a48b3a3273cf6e4017d65c6ae4f6f058089d486 /sound
parente22c32e1d41b69501ab04c1ec865eea606f7ebe2 (diff)
downloadlinux-d3569a47663b6feaa2788e885e84afa1c48741e6.tar.xz
ASoC: sunxi: sun4i-codec: consider CPU-Platform possibility
commit 3f780533bac9 ("ASoC: sunxi: sun4i-codec: don't select unnecessary Platform") Current ALSA SoC avoid to add duplicate component to rtd, and this driver was selecting CPU component as Platform component. Thus, above patch removed Platform settings from this driver, because it assumed these are same component. But, some CPU driver is using generic DMAEngine, in such case, both CPU component and Platform component will have same of_node/name. In other words, there are some components which are different but have same of_node/name. In such case, Card driver definitely need to select Platform even though it is same as CPU. It is depends on CPU driver, but is difficult to know it from Card driver. This patch reverts above patch. Fixes: commit 3f780533bac9 ("ASoC: sunxi: sun4i-codec: don't select unnecessary Platform") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/sunxi/sun4i-codec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index cd96cf5b01fa..619073e7d972 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -1297,21 +1297,24 @@ static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev,
struct snd_soc_dai_link *link = devm_kzalloc(dev, sizeof(*link),
GFP_KERNEL);
struct snd_soc_dai_link_component *dlc = devm_kzalloc(dev,
- 2 * sizeof(*dlc), GFP_KERNEL);
+ 3 * sizeof(*dlc), GFP_KERNEL);
if (!link || !dlc)
return NULL;
link->cpus = &dlc[0];
link->codecs = &dlc[1];
+ link->platforms = &dlc[2];
link->num_cpus = 1;
link->num_codecs = 1;
+ link->num_platforms = 1;
link->name = "cdc";
link->stream_name = "CDC PCM";
link->codecs->dai_name = "Codec";
link->cpus->dai_name = dev_name(dev);
link->codecs->name = dev_name(dev);
+ link->platforms->name = dev_name(dev);
link->dai_fmt = SND_SOC_DAIFMT_I2S;
*num_links = 1;