summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: d6586f6)
raw | patch | inline | side by side (from parent 1: d6586f6)
author | Hebbar, Gururaja <gururaja.hebbar@ti.com> | |
Mon, 26 Sep 2011 11:33:23 +0000 (17:03 +0530) | ||
committer | Vaibhav Hiremath <hvaibhav@ti.com> | |
Mon, 23 Jan 2012 19:14:25 +0000 (00:44 +0530) |
This patch adds the machine driver for AM335x EVM in conformance with the new
ASoC framework.
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
ASoC framework.
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
sound/soc/davinci/davinci-evm.c | patch | blob | history |
index 32b4a801bd18ddc6be4aa53d35c55bb9d2f9c86d..f6a62c3cd0943e60195fa3b4af8ea0f569cb009b 100644 (file)
else if (machine_is_davinci_da830_evm() ||
machine_is_davinci_da850_evm())
sysclk = 24576000;
+ /* On AM335X, CODEC gets MCLK from external Xtal (12MHz). */
+ else if (machine_is_am335xevm())
+ sysclk = 12000000;
else
return -EINVAL;
.ops = &evm_ops,
};
+static struct snd_soc_dai_link am335x_evm_dai = {
+ .name = "TLV320AIC3X",
+ .stream_name = "AIC3X",
+ .cpu_dai_name = "davinci-mcasp.1",
+ .codec_dai_name = "tlv320aic3x-hifi",
+ .codec_name = "tlv320aic3x-codec.2-001b",
+ .platform_name = "davinci-pcm-audio",
+ .init = evm_aic3x_init,
+ .ops = &evm_ops,
+};
+
/* davinci dm6446 evm audio machine driver */
static struct snd_soc_card dm6446_snd_soc_card_evm = {
.name = "DaVinci DM6446 EVM",
.num_links = 1,
};
+static struct snd_soc_card am335x_snd_soc_card = {
+ .name = "AM335X EVM",
+ .dai_link = &am335x_evm_dai,
+ .num_links = 1,
+};
+
static struct platform_device *evm_snd_device;
static int __init evm_init(void)
} else if (machine_is_davinci_da850_evm()) {
evm_snd_dev_data = &da850_snd_soc_card;
index = 0;
+ } else if (machine_is_am335xevm()) {
+ evm_snd_dev_data = &am335x_snd_soc_card;
+ index = 0;
} else
return -EINVAL;