summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 03:16:57 +0200
committerMark Brown <broonie@kernel.org>2019-06-19 13:50:51 +0200
commit82bf78ca49a3a048dcb61620f88d1ae40553ab88 (patch)
treea309c615c3e7d23ba7f15db5c7c1e3c0d8406ef8 /sound/soc/fsl
parentASoC: fsl: imx-es8328: don't select unnecessary Platform (diff)
downloadlinux-82bf78ca49a3a048dcb61620f88d1ae40553ab88.tar.xz
linux-82bf78ca49a3a048dcb61620f88d1ae40553ab88.zip
ASoC: fsl: imx-sgtl5000: 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/fsl')
-rw-r--r--sound/soc/fsl/imx-sgtl5000.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index 15e8b9343c35..c5ebe4950567 100644
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -123,7 +123,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
goto fail;
}
- comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);
+ comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL);
if (!comp) {
ret = -ENOMEM;
goto fail;
@@ -139,18 +139,15 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
data->dai.cpus = &comp[0];
data->dai.codecs = &comp[1];
- data->dai.platforms = &comp[2];
data->dai.num_cpus = 1;
data->dai.num_codecs = 1;
- data->dai.num_platforms = 1;
data->dai.name = "HiFi";
data->dai.stream_name = "HiFi";
data->dai.codecs->dai_name = "sgtl5000";
data->dai.codecs->of_node = codec_np;
data->dai.cpus->of_node = ssi_np;
- data->dai.platforms->of_node = ssi_np;
data->dai.init = &imx_sgtl5000_dai_init;
data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM;