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

Commit 91fff60b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/davinci' into asoc-davinci

parents 0929878f 182bef86

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

+12 −0
Original line number Diff line number Diff line
@@ -769,6 +769,10 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, 


	case SNDRV_PCM_FORMAT_U24_LE:

	case SNDRV_PCM_FORMAT_S24_LE:

		dma_params->data_type = 4;

		word_length = 24;

		break;



	case SNDRV_PCM_FORMAT_U32_LE:

	case SNDRV_PCM_FORMAT_S32_LE:

		dma_params->data_type = 4;
@@ -1272,14 +1276,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);