Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f28f357 authored by Jyri Sarha's avatar Jyri Sarha Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Add dependecy to SND_DAVINCI_SOC or SND_OMAP_SOC 



Fixes build with SND_DAVINCI_SOC or SND_OMAP_SOC alone and adds build
dependecy to SND_DAVINCI_SOC or SND_OMAP_SOC.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 7171511e

sound/soc/davinci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config SND_DAVINCI_SOC_I2S 
	tristate



config SND_DAVINCI_SOC_MCASP

	depends on SND_DAVINCI_SOC || SND_OMAP_SOC

	tristate



config SND_DAVINCI_SOC_VCIF

sound/soc/davinci/davinci-mcasp.c

+8 −0
Original line number Diff line number Diff line
@@ -1223,14 +1223,22 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 
		goto err;



	switch (mcasp->version) {

#if IS_BUILTIN(CONFIG_SND_DAVINCI_SOC) || \

	(IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \

	 IS_MODULE(CONFIG_SND_DAVINCI_SOC))

	case MCASP_VERSION_1:

	case MCASP_VERSION_2:

	case MCASP_VERSION_3:

		ret = davinci_soc_platform_register(&pdev->dev);

		break;

#endif

#if IS_BUILTIN(CONFIG_SND_OMAP_SOC) || \

	(IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \

	 IS_MODULE(CONFIG_SND_OMAP_SOC))

	case MCASP_VERSION_4:

		ret = omap_pcm_platform_register(&pdev->dev);

		break;

#endif

	default:

		dev_err(&pdev->dev, "Invalid McASP version: %d\n",

			mcasp->version);