Commit b67f4487 authored by Chaithrika U S's avatar Chaithrika U S Committed by Mark Brown
Browse files

ASoC: Add mcasp support for DM646x 

Adds driver support for the two instances of McASP on TI's DM646x.

The multichannel audio serial port (McASP) functions as a general-purpose audio
serial port optimized for the needs of multichannel audio application.
(http://www.ti.com/litv/pdf/spruer1b

).

There are two instances of McASP on DM646x. The McASP0 module includes up to 4
serializers that can be individually enabled to either transmit or receive
in different modes. The McASP1 module is limited with only 1 pinned-out
serializer that can be enabled to only transmit in DIT mode (neither receiving
in any mode nor transmitting in either Burst or TDM mode is supported).

McASP0 consists of transmit and receive sections that may operate
synchronized, or completely independently with separate master clocks, bit
clocks, and frame syncs, and using different transmit modes with different
bit-stream formats.

Signed-off-by: default avatarSteve Chen <schen@mvista.com>
Signed-off-by: default avatarPavel Kiryukhin <pkiryukhin@ru.mvista.com>
Signed-off-by: default avatarNaresh Medisetty <naresh@ti.com>
Signed-off-by: default avatarChaithrika U S <chaithrika@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5204d496

sound/soc/davinci/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ config SND_DAVINCI_SOC 
config SND_DAVINCI_SOC_I2S

	tristate



config SND_DAVINCI_SOC_MCASP

	tristate



config SND_DAVINCI_SOC_EVM

	tristate "SoC Audio support for DaVinci DM6446 or DM355 EVM"

	depends on SND_DAVINCI_SOC
@@ -19,6 +22,16 @@ config SND_DAVINCI_SOC_EVM 
	  Say Y if you want to add support for SoC audio on TI

	  DaVinci DM6446 or DM355 EVM platforms.



config  SND_DM6467_SOC_EVM

	tristate "SoC Audio support for DaVinci DM6467 EVM"

	depends on SND_DAVINCI_SOC && MACH_DAVINCI_DM6467_EVM

	select SND_DAVINCI_SOC_MCASP

	select SND_SOC_TLV320AIC3X

	select SND_SOC_SPDIF



	help

	  Say Y if you want to add support for SoC audio on TI



config SND_DAVINCI_SOC_SFFSDR

	tristate "SoC Audio support for SFFSDR"

	depends on SND_DAVINCI_SOC && MACH_SFFSDR

sound/soc/davinci/Makefile

+3 −0
Original line number Diff line number Diff line 
# DAVINCI Platform Support

snd-soc-davinci-objs := davinci-pcm.o

snd-soc-davinci-i2s-objs := davinci-i2s.o

snd-soc-davinci-mcasp-objs:= davinci-mcasp.o



obj-$(CONFIG_SND_DAVINCI_SOC) += snd-soc-davinci.o

obj-$(CONFIG_SND_DAVINCI_SOC_I2S) += snd-soc-davinci-i2s.o

obj-$(CONFIG_SND_DAVINCI_SOC_MCASP) += snd-soc-davinci-mcasp.o



# DAVINCI Machine Support

snd-soc-evm-objs := davinci-evm.o

snd-soc-sffsdr-objs := davinci-sffsdr.o



obj-$(CONFIG_SND_DAVINCI_SOC_EVM) += snd-soc-evm.o

obj-$(CONFIG_SND_DM6467_SOC_EVM) += snd-soc-evm.o

obj-$(CONFIG_SND_DAVINCI_SOC_SFFSDR) += snd-soc-sffsdr.o

sound/soc/davinci/davinci-mcasp.c

0 → 100644
+874 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/soc/davinci/davinci-mcasp.h

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

 * ALSA SoC McASP Audio Layer for TI DAVINCI processor

 *

 * MCASP related definitions

 *

 * Author: Nirmal Pandey <n-pandey@ti.com>,

 *         Suresh Rajashekara <suresh.r@ti.com>

 *         Steve Chen <schen@.mvista.com>

 *

 * Copyright:   (C) 2009 MontaVista Software, Inc., <source@mvista.com>

 * Copyright:   (C) 2009  Texas Instruments, India

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef DAVINCI_MCASP_H

#define DAVINCI_MCASP_H



#include <linux/io.h>

#include <mach/asp.h>

#include "davinci-pcm.h"



extern struct snd_soc_dai davinci_mcasp_dai[];



#define DAVINCI_MCASP_RATES	SNDRV_PCM_RATE_8000_96000

#define DAVINCI_MCASP_I2S_DAI	0

#define DAVINCI_MCASP_DIT_DAI	1



enum {

	DAVINCI_AUDIO_WORD_8 = 0,

	DAVINCI_AUDIO_WORD_12,

	DAVINCI_AUDIO_WORD_16,

	DAVINCI_AUDIO_WORD_20,

	DAVINCI_AUDIO_WORD_24,

	DAVINCI_AUDIO_WORD_32,

	DAVINCI_AUDIO_WORD_28,  /* This is only valid for McASP */

};



struct davinci_audio_dev {

	void __iomem *base;

	int sample_rate;

	struct clk *clk;

	struct davinci_pcm_dma_params *dma_params[2];

	unsigned int codec_fmt;



	/* McASP specific data */

	int	tdm_slots;

	u8	op_mode;

	u8	num_serializer;

	u8	*serial_dir;

};



#endif	/* DAVINCI_MCASP_H */

sound/soc/davinci/davinci-pcm.h

+10 −8
Original line number Diff line number Diff line
@@ -12,17 +12,19 @@ 
#ifndef _DAVINCI_PCM_H

#define _DAVINCI_PCM_H



#include <mach/edma.h>

#include <mach/asp.h>





struct davinci_pcm_dma_params {

	char *name;			/* stream identifier */

	int channel;			/* sync dma channel ID */

	dma_addr_t dma_addr;		/* device physical address for DMA */

	unsigned int data_type;	/* xfer data type */

	enum dma_event_q eventq_no;	/* event queue number */

	unsigned char data_type;	/* xfer data type */

	unsigned char convert_mono_stereo;

};



struct evm_snd_platform_data {

	int tx_dma_ch;

	int rx_dma_ch;

};



extern struct snd_soc_platform davinci_soc_platform;

CRA Git | Maintained and supported by SUSTech CRA and CCSE