Commit 22849e45 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next

parents 994f2f9e 88abfd5b

arch/arm/mach-davinci/board-da850-evm.c

+14 −10
Original line number Diff line number Diff line
@@ -769,9 +769,12 @@ static struct snd_platform_data da850_evm_snd_data = { 
	.tdm_slots		= 2,

	.serial_dir		= da850_iis_serializer_direction,

	.asp_chan_q		= EVENTQ_0,

	.ram_chan_q		= EVENTQ_1,

	.version		= MCASP_VERSION_2,

	.txnumevt		= 1,

	.rxnumevt		= 1,

	.sram_size_playback	= SZ_8K,

	.sram_size_capture	= SZ_8K,

};



static const short da850_evm_mcasp_pins[] __initconst = {
@@ -1509,6 +1512,7 @@ static __init void da850_evm_init(void) 
		pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",

				ret);



	da850_evm_snd_data.sram_pool = sram_get_gen_pool();

	da8xx_register_mcasp(0, &da850_evm_snd_data);



	ret = davinci_cfg_reg_list(da850_lcdcntl_pins);

include/linux/platform_data/davinci_asp.h

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#ifndef __DAVINCI_ASP_H

#define __DAVINCI_ASP_H



#include <linux/genalloc.h>



struct snd_platform_data {

	u32 tx_dma_offset;

	u32 rx_dma_offset;
@@ -30,6 +32,7 @@ struct snd_platform_data { 
	unsigned enable_channel_combine:1;

	unsigned sram_size_playback;

	unsigned sram_size_capture;

	struct gen_pool *sram_pool;



	/*

	 * If McBSP peripheral gets the clock from an external pin,

sound/soc/davinci/davinci-evm.c

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ static int evm_hw_params(struct snd_pcm_substream *substream, 
	if (ret < 0)

		return ret;



	/* set the CPU system clock */

	ret = snd_soc_dai_set_sysclk(cpu_dai, 0, sysclk, SND_SOC_CLOCK_OUT);

	if (ret < 0)

		return ret;



	return 0;

}

sound/soc/davinci/davinci-mcasp.c

+82 −11
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ 
#define ACLKXE		BIT(5)

#define TX_ASYNC	BIT(6)

#define ACLKXPOL	BIT(7)

#define ACLKXDIV_MASK	0x1f



/*

 * DAVINCI_MCASP_ACLKRCTL_REG Receive Clock Control Register Bits
@@ -207,6 +208,7 @@ 
#define ACLKRE		BIT(5)

#define RX_ASYNC	BIT(6)

#define ACLKRPOL	BIT(7)

#define ACLKRDIV_MASK	0x1f



/*

 * DAVINCI_MCASP_AHCLKXCTL_REG - High Frequency Transmit Clock Control
@@ -215,6 +217,7 @@ 
#define AHCLKXDIV(val)	(val)

#define AHCLKXPOL	BIT(14)

#define AHCLKXE		BIT(15)

#define AHCLKXDIV_MASK	0xfff



/*

 * DAVINCI_MCASP_AHCLKRCTL_REG - High Frequency Receive Clock Control
@@ -223,6 +226,7 @@ 
#define AHCLKRDIV(val)	(val)

#define AHCLKRPOL	BIT(14)

#define AHCLKRE		BIT(15)

#define AHCLKRDIV_MASK	0xfff



/*

 * DAVINCI_MCASP_XRSRCTL_BASE_REG -  Serializer Control Register Bits
@@ -473,6 +477,23 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
	struct davinci_audio_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);

	void __iomem *base = dev->base;



	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {

	case SND_SOC_DAIFMT_DSP_B:

	case SND_SOC_DAIFMT_AC97:

		mcasp_clr_bits(dev->base + DAVINCI_MCASP_TXFMCTL_REG, FSXDUR);

		mcasp_clr_bits(dev->base + DAVINCI_MCASP_RXFMCTL_REG, FSRDUR);

		break;

	default:

		/* configure a full-word SYNC pulse (LRCLK) */

		mcasp_set_bits(dev->base + DAVINCI_MCASP_TXFMCTL_REG, FSXDUR);

		mcasp_set_bits(dev->base + DAVINCI_MCASP_RXFMCTL_REG, FSRDUR);



		/* make 1st data bit occur one ACLK cycle after the frame sync */

		mcasp_set_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, FSXDLY(1));

		mcasp_set_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, FSRDLY(1));

		break;

	}



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFS:

		/* codec is clock and frame slave */
@@ -482,8 +503,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
		mcasp_set_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);

		mcasp_set_bits(base + DAVINCI_MCASP_RXFMCTL_REG, AFSRE);



		mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG,

				ACLKX | AHCLKX | AFSX);

		mcasp_set_bits(base + DAVINCI_MCASP_PDIR_REG, ACLKX | AFSX);

		break;

	case SND_SOC_DAIFMT_CBM_CFS:

		/* codec is clock master and frame slave */
@@ -554,6 +574,50 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
	return 0;

}



static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div)

{

	struct davinci_audio_dev *dev = snd_soc_dai_get_drvdata(dai);



	switch (div_id) {

	case 0:		/* MCLK divider */

		mcasp_mod_bits(dev->base + DAVINCI_MCASP_AHCLKXCTL_REG,

			       AHCLKXDIV(div - 1), AHCLKXDIV_MASK);

		mcasp_mod_bits(dev->base + DAVINCI_MCASP_AHCLKRCTL_REG,

			       AHCLKRDIV(div - 1), AHCLKRDIV_MASK);

		break;



	case 1:		/* BCLK divider */

		mcasp_mod_bits(dev->base + DAVINCI_MCASP_ACLKXCTL_REG,

			       ACLKXDIV(div - 1), ACLKXDIV_MASK);

		mcasp_mod_bits(dev->base + DAVINCI_MCASP_ACLKRCTL_REG,

			       ACLKRDIV(div - 1), ACLKRDIV_MASK);

		break;



	default:

		return -EINVAL;

	}



	return 0;

}



static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id,

				    unsigned int freq, int dir)

{

	struct davinci_audio_dev *dev = snd_soc_dai_get_drvdata(dai);



	if (dir == SND_SOC_CLOCK_OUT) {

		mcasp_set_bits(dev->base + DAVINCI_MCASP_AHCLKXCTL_REG, AHCLKXE);

		mcasp_set_bits(dev->base + DAVINCI_MCASP_AHCLKRCTL_REG, AHCLKRE);

		mcasp_set_bits(dev->base + DAVINCI_MCASP_PDIR_REG, AHCLKX);

	} else {

		mcasp_clr_bits(dev->base + DAVINCI_MCASP_AHCLKXCTL_REG, AHCLKXE);

		mcasp_clr_bits(dev->base + DAVINCI_MCASP_AHCLKRCTL_REG, AHCLKRE);

		mcasp_clr_bits(dev->base + DAVINCI_MCASP_PDIR_REG, AHCLKX);

	}



	return 0;

}



static int davinci_config_channel_size(struct davinci_audio_dev *dev,

				       int channel_size)

{
@@ -709,8 +773,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream) 
	if (stream == SNDRV_PCM_STREAM_PLAYBACK) {

		/* bit stream is MSB first  with no delay */

		/* DSP_B mode */

		mcasp_set_bits(dev->base + DAVINCI_MCASP_AHCLKXCTL_REG,

				AHCLKXE);

		mcasp_set_reg(dev->base + DAVINCI_MCASP_TXTDM_REG, mask);

		mcasp_set_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXORD);
@@ -720,14 +782,10 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream) 
		else

			printk(KERN_ERR "playback tdm slot %d not supported\n",

				dev->tdm_slots);



		mcasp_clr_bits(dev->base + DAVINCI_MCASP_TXFMCTL_REG, FSXDUR);

	} else {

		/* bit stream is MSB first with no delay */

		/* DSP_B mode */

		mcasp_set_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXORD);

		mcasp_set_bits(dev->base + DAVINCI_MCASP_AHCLKRCTL_REG,

				AHCLKRE);

		mcasp_set_reg(dev->base + DAVINCI_MCASP_RXTDM_REG, mask);



		if ((dev->tdm_slots >= 2) && (dev->tdm_slots <= 32))
@@ -736,8 +794,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream) 
		else

			printk(KERN_ERR "capture tdm slot %d not supported\n",

				dev->tdm_slots);



		mcasp_clr_bits(dev->base + DAVINCI_MCASP_RXFMCTL_REG, FSRDUR);

	}

}
@@ -809,6 +865,14 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, 
		word_length = DAVINCI_AUDIO_WORD_16;

		break;



	case SNDRV_PCM_FORMAT_U24_3LE:

	case SNDRV_PCM_FORMAT_S24_3LE:

		dma_params->data_type = 3;

		word_length = DAVINCI_AUDIO_WORD_24;

		break;



	case SNDRV_PCM_FORMAT_U24_LE:

	case SNDRV_PCM_FORMAT_S24_LE:

	case SNDRV_PCM_FORMAT_U32_LE:

	case SNDRV_PCM_FORMAT_S32_LE:

		dma_params->data_type = 4;
@@ -880,13 +944,18 @@ static const struct snd_soc_dai_ops davinci_mcasp_dai_ops = { 
	.trigger	= davinci_mcasp_trigger,

	.hw_params	= davinci_mcasp_hw_params,

	.set_fmt	= davinci_mcasp_set_dai_fmt,



	.set_clkdiv	= davinci_mcasp_set_clkdiv,

	.set_sysclk	= davinci_mcasp_set_sysclk,

};



#define DAVINCI_MCASP_PCM_FMTS (SNDRV_PCM_FMTBIT_S8 | \

				SNDRV_PCM_FMTBIT_U8 | \

				SNDRV_PCM_FMTBIT_S16_LE | \

				SNDRV_PCM_FMTBIT_U16_LE | \

				SNDRV_PCM_FMTBIT_S24_LE | \

				SNDRV_PCM_FMTBIT_U24_LE | \

				SNDRV_PCM_FMTBIT_S24_3LE | \

				SNDRV_PCM_FMTBIT_U24_3LE | \

				SNDRV_PCM_FMTBIT_S32_LE | \

				SNDRV_PCM_FMTBIT_U32_LE)
@@ -1098,6 +1167,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 
	dma_data = &dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK];

	dma_data->asp_chan_q = pdata->asp_chan_q;

	dma_data->ram_chan_q = pdata->ram_chan_q;

	dma_data->sram_pool = pdata->sram_pool;

	dma_data->sram_size = pdata->sram_size_playback;

	dma_data->dma_addr = (dma_addr_t) (pdata->tx_dma_offset +

							mem->start);
@@ -1115,6 +1185,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 
	dma_data = &dev->dma_params[SNDRV_PCM_STREAM_CAPTURE];

	dma_data->asp_chan_q = pdata->asp_chan_q;

	dma_data->ram_chan_q = pdata->ram_chan_q;

	dma_data->sram_pool = pdata->sram_pool;

	dma_data->sram_size = pdata->sram_size_capture;

	dma_data->dma_addr = (dma_addr_t)(pdata->rx_dma_offset +

							mem->start);

sound/soc/davinci/davinci-mcasp.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


#include "davinci-pcm.h"



#define DAVINCI_MCASP_RATES	SNDRV_PCM_RATE_8000_96000

#define DAVINCI_MCASP_RATES	SNDRV_PCM_RATE_8000_192000

#define DAVINCI_MCASP_I2S_DAI	0

#define DAVINCI_MCASP_DIT_DAI	1