[alsa-devel] [PATCH v4 2/2] ASoC: Davinci: Add audio codec support for DM365 EVM
From: Miguel Aguilar miguel.aguilar@ridgerun.com
This patch enables tlv320aic3101 support on DM365 EVM and it was tested on DM365 EVM rev c.
Note: this patch was created based on temp/asoc branch.
Signed-off-by: Miguel Aguilar miguel.aguilar@ridgerun.com --- sound/soc/davinci/Kconfig | 4 ++-- sound/soc/davinci/davinci-evm.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index 4dfd4ad..047ee39 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -13,9 +13,9 @@ config SND_DAVINCI_SOC_MCASP tristate
config SND_DAVINCI_SOC_EVM - tristate "SoC Audio support for DaVinci DM6446 or DM355 EVM" + tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM" depends on SND_DAVINCI_SOC - depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM + depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM select SND_DAVINCI_SOC_I2S select SND_SOC_TLV320AIC3X help diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 67414f6..7ccbe66 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -45,7 +45,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream, unsigned sysclk;
/* ASP1 on DM355 EVM is clocked by an external oscillator */ - if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm()) + if (machine_is_davinci_dm355_evm() || machine_is_davinci_dm6467_evm() || + machine_is_davinci_dm365_evm()) sysclk = 27000000;
/* ASP0 in DM6446 EVM is clocked by U55, as configured by @@ -176,7 +177,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = { .ops = &evm_ops, };
-/* davinci-evm audio machine driver */ +/* davinci dm6446, dm355 or dm365 evm audio machine driver */ static struct snd_soc_card snd_soc_card_evm = { .name = "DaVinci EVM", .platform = &davinci_soc_platform, @@ -243,7 +244,7 @@ static int __init evm_init(void) int index; int ret;
- if (machine_is_davinci_evm()) { + if (machine_is_davinci_evm() || machine_is_davinci_dm365_evm()) { evm_snd_dev_data = &evm_snd_devdata; index = 0; } else if (machine_is_davinci_dm355_evm()) {
On Wed, Sep 02, 2009 at 03:33:59PM -0600, miguel.aguilar@ridgerun.com wrote:
From: Miguel Aguilar miguel.aguilar@ridgerun.com
This patch enables tlv320aic3101 support on DM365 EVM and it was tested on DM365 EVM rev c.
Note: this patch was created based on temp/asoc branch.
This is OK. Kevin, will you apply the arch/arm side of this for 2.6.32? If so I'll apply the ASoC side - I'd rather not have one without the other in case of confusion from the Kconfig text. Otherwise I'll hold off until after the merge window.
Mark Brown broonie@opensource.wolfsonmicro.com writes:
On Wed, Sep 02, 2009 at 03:33:59PM -0600, miguel.aguilar@ridgerun.com wrote:
From: Miguel Aguilar miguel.aguilar@ridgerun.com
This patch enables tlv320aic3101 support on DM365 EVM and it was tested on DM365 EVM rev c.
Note: this patch was created based on temp/asoc branch.
This is OK. Kevin, will you apply the arch/arm side of this for 2.6.32? If so I'll apply the ASoC side - I'd rather not have one without the other in case of confusion from the Kconfig text. Otherwise I'll hold off until after the merge window.
I think I'll wait for the next merge window for this one. It's a bit late for the current merge window.
Kevin
On Mon, Sep 14, 2009 at 12:21:10PM -0700, Kevin Hilman wrote:
I think I'll wait for the next merge window for this one. It's a bit late for the current merge window.
OK, I've applied it to my 2.6.33 branch. Thanks!
participants (3)
-
Kevin Hilman
-
Mark Brown
-
miguel.aguilar@ridgerun.com