Skip to content

Commit

Permalink
ASoC: DaVinci: Support Audio on DA830 EVM
Browse files Browse the repository at this point in the history
Add support for audio on DA830 EVM- here McASP1 is interfaced to
TLV320AIC3106 codec.

Signed-off-by: Chaithrika U S <chaithrika@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Chaithrika U S authored and Mark Brown committed Aug 8, 2009
1 parent dbe9ea6 commit 7ae5945
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 0 deletions.
11 changes: 11 additions & 0 deletions sound/soc/davinci/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,14 @@ config SND_DAVINCI_SOC_SFFSDR
help
Say Y if you want to add support for SoC audio on
Lyrtech SFFSDR board.

config SND_DA830_SOC_EVM
tristate "SoC Audio support for DA830/OMAPL137 EVM"
depends on SND_DAVINCI_SOC && MACH_DAVINCI_DA830_EVM
select SND_DAVINCI_SOC_MCASP
select SND_SOC_TLV320AIC3X

help
Say Y if you want to add support for SoC audio on TI
DA830/OMAPL137 EVM

1 change: 1 addition & 0 deletions sound/soc/davinci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ 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_DA830_SOC_EVM) += snd-soc-evm.o
obj-$(CONFIG_SND_DAVINCI_SOC_SFFSDR) += snd-soc-sffsdr.o
33 changes: 33 additions & 0 deletions sound/soc/davinci/davinci-evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ static int evm_hw_params(struct snd_pcm_substream *substream,
else if (machine_is_davinci_evm())
sysclk = 12288000;

else if (machine_is_davinci_da830_evm())
sysclk = 24576000;

else
return -EINVAL;

Expand Down Expand Up @@ -162,6 +165,14 @@ static struct snd_soc_dai_link dm6467_evm_dai[] = {
.ops = &evm_ops,
},
};
static struct snd_soc_dai_link da830_evm_dai = {
.name = "TLV320AIC3X",
.stream_name = "AIC3X",
.cpu_dai = &davinci_mcasp_dai[DAVINCI_MCASP_I2S_DAI],
.codec_dai = &aic3x_dai,
.init = evm_aic3x_init,
.ops = &evm_ops,
};

/* davinci-evm audio machine driver */
static struct snd_soc_card snd_soc_card_evm = {
Expand All @@ -179,6 +190,13 @@ static struct snd_soc_card dm6467_snd_soc_card_evm = {
.num_links = ARRAY_SIZE(dm6467_evm_dai),
};

static struct snd_soc_card da830_snd_soc_card = {
.name = "DA830 EVM",
.dai_link = &da830_evm_dai,
.platform = &davinci_soc_platform,
.num_links = 1,
};

/* evm audio private data */
static struct aic3x_setup_data evm_aic3x_setup = {
.i2c_bus = 1,
Expand All @@ -191,6 +209,11 @@ static struct aic3x_setup_data dm6467_evm_aic3x_setup = {
.i2c_address = 0x18,
};

static struct aic3x_setup_data da830_evm_aic3x_setup = {
.i2c_bus = 1,
.i2c_address = 0x18,
};

/* evm audio subsystem */
static struct snd_soc_device evm_snd_devdata = {
.card = &snd_soc_card_evm,
Expand All @@ -205,6 +228,13 @@ static struct snd_soc_device dm6467_evm_snd_devdata = {
.codec_data = &dm6467_evm_aic3x_setup,
};

/* evm audio subsystem */
static struct snd_soc_device da830_evm_snd_devdata = {
.card = &da830_snd_soc_card,
.codec_dev = &soc_codec_dev_aic3x,
.codec_data = &da830_evm_aic3x_setup,
};

static struct platform_device *evm_snd_device;

static int __init evm_init(void)
Expand All @@ -222,6 +252,9 @@ static int __init evm_init(void)
} else if (machine_is_davinci_dm6467_evm()) {
evm_snd_dev_data = &dm6467_evm_snd_devdata;
index = 0;
} else if (machine_is_davinci_da830_evm()) {
evm_snd_dev_data = &da830_evm_snd_devdata;
index = 1;
} else
return -EINVAL;

Expand Down

0 comments on commit 7ae5945

Please sign in to comment.