2008-02-18 13:40:22 +03:00
|
|
|
/*
|
|
|
|
* ASoC driver for TI DAVINCI EVM platform
|
|
|
|
*
|
2008-09-29 23:14:11 +04:00
|
|
|
* Author: Vladimir Barinov, <vbarinov@embeddedalley.com>
|
2008-02-18 13:40:22 +03:00
|
|
|
* Copyright: (C) 2007 MontaVista Software, Inc., <source@mvista.com>
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/moduleparam.h>
|
|
|
|
#include <linux/timer.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/platform_device.h>
|
2013-03-06 20:15:31 +04:00
|
|
|
#include <linux/platform_data/edma.h>
|
2009-08-21 01:50:42 +04:00
|
|
|
#include <linux/i2c.h>
|
2013-10-23 16:30:14 +04:00
|
|
|
#include <linux/of_platform.h>
|
2014-01-27 19:37:51 +04:00
|
|
|
#include <linux/clk.h>
|
2008-02-18 13:40:22 +03:00
|
|
|
#include <sound/core.h>
|
|
|
|
#include <sound/pcm.h>
|
|
|
|
#include <sound/soc.h>
|
|
|
|
|
|
|
|
#include <asm/dma.h>
|
2009-05-15 00:01:59 +04:00
|
|
|
#include <asm/mach-types.h>
|
|
|
|
|
2013-10-23 16:30:14 +04:00
|
|
|
#include <linux/edma.h>
|
|
|
|
|
2008-02-18 13:40:22 +03:00
|
|
|
#include "davinci-pcm.h"
|
|
|
|
#include "davinci-i2s.h"
|
|
|
|
|
2013-09-17 13:26:00 +04:00
|
|
|
struct snd_soc_card_drvdata_davinci {
|
2014-01-27 19:37:51 +04:00
|
|
|
struct clk *mclk;
|
2013-09-17 13:26:00 +04:00
|
|
|
unsigned sysclk;
|
|
|
|
};
|
|
|
|
|
2014-01-27 19:37:51 +04:00
|
|
|
static int evm_startup(struct snd_pcm_substream *substream)
|
|
|
|
{
|
|
|
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
|
|
struct snd_soc_card *soc_card = rtd->codec->card;
|
|
|
|
struct snd_soc_card_drvdata_davinci *drvdata =
|
|
|
|
snd_soc_card_get_drvdata(soc_card);
|
|
|
|
|
|
|
|
if (drvdata->mclk)
|
|
|
|
return clk_prepare_enable(drvdata->mclk);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void evm_shutdown(struct snd_pcm_substream *substream)
|
|
|
|
{
|
|
|
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
|
|
struct snd_soc_card *soc_card = rtd->codec->card;
|
|
|
|
struct snd_soc_card_drvdata_davinci *drvdata =
|
|
|
|
snd_soc_card_get_drvdata(soc_card);
|
|
|
|
|
|
|
|
if (drvdata->mclk)
|
|
|
|
clk_disable_unprepare(drvdata->mclk);
|
|
|
|
}
|
|
|
|
|
2008-02-18 13:40:22 +03:00
|
|
|
static int evm_hw_params(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_pcm_hw_params *params)
|
|
|
|
{
|
|
|
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
2010-03-17 23:15:21 +03:00
|
|
|
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
|
|
|
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
2013-09-17 13:26:00 +04:00
|
|
|
struct snd_soc_codec *codec = rtd->codec;
|
|
|
|
struct snd_soc_card *soc_card = codec->card;
|
2008-02-18 13:40:22 +03:00
|
|
|
int ret = 0;
|
2013-09-17 13:26:00 +04:00
|
|
|
unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)
|
|
|
|
snd_soc_card_get_drvdata(soc_card))->sysclk;
|
2008-02-18 13:40:22 +03:00
|
|
|
|
|
|
|
/* set the codec system clock */
|
2009-01-04 13:50:10 +03:00
|
|
|
ret = snd_soc_dai_set_sysclk(codec_dai, 0, sysclk, SND_SOC_CLOCK_OUT);
|
2008-02-18 13:40:22 +03:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2012-10-04 17:08:41 +04:00
|
|
|
/* set the CPU system clock */
|
|
|
|
ret = snd_soc_dai_set_sysclk(cpu_dai, 0, sysclk, SND_SOC_CLOCK_OUT);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2008-02-18 13:40:22 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct snd_soc_ops evm_ops = {
|
2014-01-27 19:37:51 +04:00
|
|
|
.startup = evm_startup,
|
|
|
|
.shutdown = evm_shutdown,
|
2008-02-18 13:40:22 +03:00
|
|
|
.hw_params = evm_hw_params,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* davinci-evm machine dapm widgets */
|
|
|
|
static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
|
|
|
|
SND_SOC_DAPM_HP("Headphone Jack", NULL),
|
|
|
|
SND_SOC_DAPM_LINE("Line Out", NULL),
|
|
|
|
SND_SOC_DAPM_MIC("Mic Jack", NULL),
|
|
|
|
SND_SOC_DAPM_LINE("Line In", NULL),
|
|
|
|
};
|
|
|
|
|
|
|
|
/* davinci-evm machine audio_mapnections to the codec pins */
|
2008-05-13 16:58:30 +04:00
|
|
|
static const struct snd_soc_dapm_route audio_map[] = {
|
2008-02-18 13:40:22 +03:00
|
|
|
/* Headphone connected to HPLOUT, HPROUT */
|
|
|
|
{"Headphone Jack", NULL, "HPLOUT"},
|
|
|
|
{"Headphone Jack", NULL, "HPROUT"},
|
|
|
|
|
|
|
|
/* Line Out connected to LLOUT, RLOUT */
|
|
|
|
{"Line Out", NULL, "LLOUT"},
|
|
|
|
{"Line Out", NULL, "RLOUT"},
|
|
|
|
|
|
|
|
/* Mic connected to (MIC3L | MIC3R) */
|
2013-01-31 16:53:04 +04:00
|
|
|
{"MIC3L", NULL, "Mic Bias"},
|
|
|
|
{"MIC3R", NULL, "Mic Bias"},
|
|
|
|
{"Mic Bias", NULL, "Mic Jack"},
|
2008-02-18 13:40:22 +03:00
|
|
|
|
|
|
|
/* Line In connected to (LINE1L | LINE2L), (LINE1R | LINE2R) */
|
|
|
|
{"LINE1L", NULL, "Line In"},
|
|
|
|
{"LINE2L", NULL, "Line In"},
|
|
|
|
{"LINE1R", NULL, "Line In"},
|
|
|
|
{"LINE2R", NULL, "Line In"},
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Logic for a aic3x as connected on a davinci-evm */
|
2010-03-17 23:15:21 +03:00
|
|
|
static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
|
2008-02-18 13:40:22 +03:00
|
|
|
{
|
2010-03-17 23:15:21 +03:00
|
|
|
struct snd_soc_codec *codec = rtd->codec;
|
2010-11-05 16:53:46 +03:00
|
|
|
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
2013-10-23 16:30:14 +04:00
|
|
|
struct device_node *np = codec->card->dev->of_node;
|
|
|
|
int ret;
|
2010-03-17 23:15:21 +03:00
|
|
|
|
2008-02-18 13:40:22 +03:00
|
|
|
/* Add davinci-evm specific widgets */
|
2010-11-05 16:53:46 +03:00
|
|
|
snd_soc_dapm_new_controls(dapm, aic3x_dapm_widgets,
|
2008-05-13 16:58:30 +04:00
|
|
|
ARRAY_SIZE(aic3x_dapm_widgets));
|
2008-02-18 13:40:22 +03:00
|
|
|
|
2013-10-23 16:30:14 +04:00
|
|
|
if (np) {
|
|
|
|
ret = snd_soc_of_parse_audio_routing(codec->card,
|
|
|
|
"ti,audio-routing");
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
} else {
|
|
|
|
/* Set up davinci-evm specific audio path audio_map */
|
|
|
|
snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
|
|
|
|
}
|
2008-02-18 13:40:22 +03:00
|
|
|
|
|
|
|
/* not connected */
|
2010-11-05 16:53:46 +03:00
|
|
|
snd_soc_dapm_disable_pin(dapm, "MONO_LOUT");
|
|
|
|
snd_soc_dapm_disable_pin(dapm, "HPLCOM");
|
|
|
|
snd_soc_dapm_disable_pin(dapm, "HPRCOM");
|
2008-02-18 13:40:22 +03:00
|
|
|
|
|
|
|
/* always connected */
|
2010-11-05 16:53:46 +03:00
|
|
|
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
|
|
|
|
snd_soc_dapm_enable_pin(dapm, "Line Out");
|
|
|
|
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
|
|
|
|
snd_soc_dapm_enable_pin(dapm, "Line In");
|
2008-02-18 13:40:22 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* davinci-evm digital audio interface glue - connects codec <--> CPU */
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
static struct snd_soc_dai_link dm6446_evm_dai = {
|
2008-02-18 13:40:22 +03:00
|
|
|
.name = "TLV320AIC3X",
|
|
|
|
.stream_name = "AIC3X",
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
.cpu_dai_name = "davinci-mcbsp",
|
2010-03-17 23:15:21 +03:00
|
|
|
.codec_dai_name = "tlv320aic3x-hifi",
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
.codec_name = "tlv320aic3x-codec.1-001b",
|
2012-08-27 17:26:39 +04:00
|
|
|
.platform_name = "davinci-mcbsp",
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
.init = evm_aic3x_init,
|
|
|
|
.ops = &evm_ops,
|
2013-11-14 13:35:21 +04:00
|
|
|
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM |
|
|
|
|
SND_SOC_DAIFMT_IB_NF,
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct snd_soc_dai_link dm355_evm_dai = {
|
|
|
|
.name = "TLV320AIC3X",
|
|
|
|
.stream_name = "AIC3X",
|
|
|
|
.cpu_dai_name = "davinci-mcbsp.1",
|
|
|
|
.codec_dai_name = "tlv320aic3x-hifi",
|
|
|
|
.codec_name = "tlv320aic3x-codec.1-001b",
|
2012-08-27 17:26:39 +04:00
|
|
|
.platform_name = "davinci-mcbsp.1",
|
2008-02-18 13:40:22 +03:00
|
|
|
.init = evm_aic3x_init,
|
|
|
|
.ops = &evm_ops,
|
2013-11-14 13:35:21 +04:00
|
|
|
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM |
|
|
|
|
SND_SOC_DAIFMT_IB_NF,
|
2008-02-18 13:40:22 +03:00
|
|
|
};
|
|
|
|
|
2010-03-11 18:33:40 +03:00
|
|
|
static struct snd_soc_dai_link dm365_evm_dai = {
|
|
|
|
#ifdef CONFIG_SND_DM365_AIC3X_CODEC
|
|
|
|
.name = "TLV320AIC3X",
|
|
|
|
.stream_name = "AIC3X",
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
.cpu_dai_name = "davinci-mcbsp",
|
2010-03-17 23:15:21 +03:00
|
|
|
.codec_dai_name = "tlv320aic3x-hifi",
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
.codec_name = "tlv320aic3x-codec.1-0018",
|
2012-08-27 17:26:39 +04:00
|
|
|
.platform_name = "davinci-mcbsp",
|
2013-11-14 13:35:21 +04:00
|
|
|
.init = evm_aic3x_init,
|
|
|
|
.ops = &evm_ops,
|
|
|
|
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM |
|
|
|
|
SND_SOC_DAIFMT_IB_NF,
|
2010-03-11 18:33:40 +03:00
|
|
|
#elif defined(CONFIG_SND_DM365_VOICE_CODEC)
|
|
|
|
.name = "Voice Codec - CQ93VC",
|
|
|
|
.stream_name = "CQ93",
|
2010-03-17 23:15:21 +03:00
|
|
|
.cpu_dai_name = "davinci-vcif",
|
|
|
|
.codec_dai_name = "cq93vc-hifi",
|
|
|
|
.codec_name = "cq93vc-codec",
|
2012-08-31 16:50:59 +04:00
|
|
|
.platform_name = "davinci-vcif",
|
2010-03-11 18:33:40 +03:00
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
2009-06-05 14:28:49 +04:00
|
|
|
static struct snd_soc_dai_link dm6467_evm_dai[] = {
|
|
|
|
{
|
|
|
|
.name = "TLV320AIC3X",
|
|
|
|
.stream_name = "AIC3X",
|
2010-03-17 23:15:21 +03:00
|
|
|
.cpu_dai_name= "davinci-mcasp.0",
|
|
|
|
.codec_dai_name = "tlv320aic3x-hifi",
|
2012-08-27 17:26:39 +04:00
|
|
|
.platform_name = "davinci-mcasp.0",
|
2010-03-17 23:15:21 +03:00
|
|
|
.codec_name = "tlv320aic3x-codec.0-001a",
|
2009-06-05 14:28:49 +04:00
|
|
|
.init = evm_aic3x_init,
|
|
|
|
.ops = &evm_ops,
|
2013-11-14 13:35:21 +04:00
|
|
|
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM |
|
|
|
|
SND_SOC_DAIFMT_IB_NF,
|
2009-06-05 14:28:49 +04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "McASP",
|
|
|
|
.stream_name = "spdif",
|
2010-03-17 23:15:21 +03:00
|
|
|
.cpu_dai_name= "davinci-mcasp.1",
|
|
|
|
.codec_dai_name = "dit-hifi",
|
|
|
|
.codec_name = "spdif_dit",
|
2012-08-27 17:26:39 +04:00
|
|
|
.platform_name = "davinci-mcasp.1",
|
2013-11-14 13:35:21 +04:00
|
|
|
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM |
|
|
|
|
SND_SOC_DAIFMT_IB_NF,
|
2009-06-05 14:28:49 +04:00
|
|
|
},
|
|
|
|
};
|
2011-02-03 14:12:25 +03:00
|
|
|
|
|
|
|
static struct snd_soc_dai_link da830_evm_dai = {
|
|
|
|
.name = "TLV320AIC3X",
|
|
|
|
.stream_name = "AIC3X",
|
|
|
|
.cpu_dai_name = "davinci-mcasp.1",
|
|
|
|
.codec_dai_name = "tlv320aic3x-hifi",
|
|
|
|
.codec_name = "tlv320aic3x-codec.1-0018",
|
2012-08-27 17:26:39 +04:00
|
|
|
.platform_name = "davinci-mcasp.1",
|
2011-02-03 14:12:25 +03:00
|
|
|
.init = evm_aic3x_init,
|
|
|
|
.ops = &evm_ops,
|
2013-11-14 13:35:21 +04:00
|
|
|
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM |
|
|
|
|
SND_SOC_DAIFMT_IB_NF,
|
2011-02-03 14:12:25 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct snd_soc_dai_link da850_evm_dai = {
|
2009-08-07 18:07:51 +04:00
|
|
|
.name = "TLV320AIC3X",
|
|
|
|
.stream_name = "AIC3X",
|
2010-03-17 23:15:21 +03:00
|
|
|
.cpu_dai_name= "davinci-mcasp.0",
|
|
|
|
.codec_dai_name = "tlv320aic3x-hifi",
|
2011-01-21 17:40:01 +03:00
|
|
|
.codec_name = "tlv320aic3x-codec.1-0018",
|
2012-08-27 17:26:39 +04:00
|
|
|
.platform_name = "davinci-mcasp.0",
|
2009-08-07 18:07:51 +04:00
|
|
|
.init = evm_aic3x_init,
|
|
|
|
.ops = &evm_ops,
|
2013-11-14 13:35:21 +04:00
|
|
|
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM |
|
|
|
|
SND_SOC_DAIFMT_IB_NF,
|
2009-08-07 18:07:51 +04:00
|
|
|
};
|
2009-06-05 14:28:49 +04:00
|
|
|
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
/* davinci dm6446 evm audio machine driver */
|
2013-09-17 13:26:00 +04:00
|
|
|
/*
|
|
|
|
* ASP0 in DM6446 EVM is clocked by U55, as configured by
|
|
|
|
* board-dm644x-evm.c using GPIOs from U18. There are six
|
|
|
|
* options; here we "know" we use a 48 KHz sample rate.
|
|
|
|
*/
|
|
|
|
static struct snd_soc_card_drvdata_davinci dm6446_snd_soc_card_drvdata = {
|
|
|
|
.sysclk = 12288000,
|
|
|
|
};
|
|
|
|
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
static struct snd_soc_card dm6446_snd_soc_card_evm = {
|
|
|
|
.name = "DaVinci DM6446 EVM",
|
2011-12-22 17:19:42 +04:00
|
|
|
.owner = THIS_MODULE,
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
.dai_link = &dm6446_evm_dai,
|
|
|
|
.num_links = 1,
|
2013-09-17 13:26:00 +04:00
|
|
|
.drvdata = &dm6446_snd_soc_card_drvdata,
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
/* davinci dm355 evm audio machine driver */
|
2013-09-17 13:26:00 +04:00
|
|
|
/* ASP1 on DM355 EVM is clocked by an external oscillator */
|
|
|
|
static struct snd_soc_card_drvdata_davinci dm355_snd_soc_card_drvdata = {
|
|
|
|
.sysclk = 27000000,
|
|
|
|
};
|
|
|
|
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
static struct snd_soc_card dm355_snd_soc_card_evm = {
|
|
|
|
.name = "DaVinci DM355 EVM",
|
2011-12-22 17:19:42 +04:00
|
|
|
.owner = THIS_MODULE,
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
.dai_link = &dm355_evm_dai,
|
2008-02-18 13:40:22 +03:00
|
|
|
.num_links = 1,
|
2013-09-17 13:26:00 +04:00
|
|
|
.drvdata = &dm355_snd_soc_card_drvdata,
|
2008-02-18 13:40:22 +03:00
|
|
|
};
|
|
|
|
|
2010-03-11 18:33:40 +03:00
|
|
|
/* davinci dm365 evm audio machine driver */
|
2013-09-17 13:26:00 +04:00
|
|
|
static struct snd_soc_card_drvdata_davinci dm365_snd_soc_card_drvdata = {
|
|
|
|
.sysclk = 27000000,
|
|
|
|
};
|
|
|
|
|
2010-03-11 18:33:40 +03:00
|
|
|
static struct snd_soc_card dm365_snd_soc_card_evm = {
|
|
|
|
.name = "DaVinci DM365 EVM",
|
2011-12-22 17:19:42 +04:00
|
|
|
.owner = THIS_MODULE,
|
2010-03-11 18:33:40 +03:00
|
|
|
.dai_link = &dm365_evm_dai,
|
|
|
|
.num_links = 1,
|
2013-09-17 13:26:00 +04:00
|
|
|
.drvdata = &dm365_snd_soc_card_drvdata,
|
2010-03-11 18:33:40 +03:00
|
|
|
};
|
|
|
|
|
2009-06-05 14:28:49 +04:00
|
|
|
/* davinci dm6467 evm audio machine driver */
|
2013-09-17 13:26:00 +04:00
|
|
|
static struct snd_soc_card_drvdata_davinci dm6467_snd_soc_card_drvdata = {
|
|
|
|
.sysclk = 27000000,
|
|
|
|
};
|
|
|
|
|
2009-06-05 14:28:49 +04:00
|
|
|
static struct snd_soc_card dm6467_snd_soc_card_evm = {
|
|
|
|
.name = "DaVinci DM6467 EVM",
|
2011-12-22 17:19:42 +04:00
|
|
|
.owner = THIS_MODULE,
|
2009-06-05 14:28:49 +04:00
|
|
|
.dai_link = dm6467_evm_dai,
|
|
|
|
.num_links = ARRAY_SIZE(dm6467_evm_dai),
|
2013-09-17 13:26:00 +04:00
|
|
|
.drvdata = &dm6467_snd_soc_card_drvdata,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct snd_soc_card_drvdata_davinci da830_snd_soc_card_drvdata = {
|
|
|
|
.sysclk = 24576000,
|
2009-06-05 14:28:49 +04:00
|
|
|
};
|
|
|
|
|
2009-08-07 18:07:51 +04:00
|
|
|
static struct snd_soc_card da830_snd_soc_card = {
|
2009-08-12 00:59:21 +04:00
|
|
|
.name = "DA830/OMAP-L137 EVM",
|
2011-12-22 17:19:42 +04:00
|
|
|
.owner = THIS_MODULE,
|
2011-02-03 14:12:25 +03:00
|
|
|
.dai_link = &da830_evm_dai,
|
2009-08-12 00:59:21 +04:00
|
|
|
.num_links = 1,
|
2013-09-17 13:26:00 +04:00
|
|
|
.drvdata = &da830_snd_soc_card_drvdata,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct snd_soc_card_drvdata_davinci da850_snd_soc_card_drvdata = {
|
|
|
|
.sysclk = 24576000,
|
2009-08-12 00:59:21 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct snd_soc_card da850_snd_soc_card = {
|
|
|
|
.name = "DA850/OMAP-L138 EVM",
|
2011-12-22 17:19:42 +04:00
|
|
|
.owner = THIS_MODULE,
|
2011-02-03 14:12:25 +03:00
|
|
|
.dai_link = &da850_evm_dai,
|
2009-08-07 18:07:51 +04:00
|
|
|
.num_links = 1,
|
2013-09-17 13:26:00 +04:00
|
|
|
.drvdata = &da850_snd_soc_card_drvdata,
|
2009-08-07 18:07:51 +04:00
|
|
|
};
|
|
|
|
|
2013-10-23 16:30:14 +04:00
|
|
|
#if defined(CONFIG_OF)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The struct is used as place holder. It will be completely
|
|
|
|
* filled with data from dt node.
|
|
|
|
*/
|
|
|
|
static struct snd_soc_dai_link evm_dai_tlv320aic3x = {
|
|
|
|
.name = "TLV320AIC3X",
|
|
|
|
.stream_name = "AIC3X",
|
|
|
|
.codec_dai_name = "tlv320aic3x-hifi",
|
|
|
|
.ops = &evm_ops,
|
|
|
|
.init = evm_aic3x_init,
|
2013-11-14 13:35:21 +04:00
|
|
|
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM |
|
|
|
|
SND_SOC_DAIFMT_IB_NF,
|
2013-10-23 16:30:14 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct of_device_id davinci_evm_dt_ids[] = {
|
|
|
|
{
|
|
|
|
.compatible = "ti,da830-evm-audio",
|
|
|
|
.data = (void *) &evm_dai_tlv320aic3x,
|
|
|
|
},
|
|
|
|
{ /* sentinel */ }
|
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(of, davinci_evm_dt_ids);
|
|
|
|
|
|
|
|
/* davinci evm audio machine driver */
|
|
|
|
static struct snd_soc_card evm_soc_card = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.num_links = 1,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int davinci_evm_probe(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct device_node *np = pdev->dev.of_node;
|
|
|
|
const struct of_device_id *match =
|
|
|
|
of_match_device(of_match_ptr(davinci_evm_dt_ids), &pdev->dev);
|
|
|
|
struct snd_soc_dai_link *dai = (struct snd_soc_dai_link *) match->data;
|
|
|
|
struct snd_soc_card_drvdata_davinci *drvdata = NULL;
|
2014-01-27 19:37:51 +04:00
|
|
|
struct clk *mclk;
|
2013-10-23 16:30:14 +04:00
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
evm_soc_card.dai_link = dai;
|
|
|
|
|
|
|
|
dai->codec_of_node = of_parse_phandle(np, "ti,audio-codec", 0);
|
|
|
|
if (!dai->codec_of_node)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
dai->cpu_of_node = of_parse_phandle(np, "ti,mcasp-controller", 0);
|
|
|
|
if (!dai->cpu_of_node)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
dai->platform_of_node = dai->cpu_of_node;
|
|
|
|
|
|
|
|
evm_soc_card.dev = &pdev->dev;
|
|
|
|
ret = snd_soc_of_parse_card_name(&evm_soc_card, "ti,model");
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2014-01-27 19:37:51 +04:00
|
|
|
mclk = devm_clk_get(&pdev->dev, "mclk");
|
|
|
|
if (PTR_ERR(mclk) == -EPROBE_DEFER) {
|
|
|
|
return -EPROBE_DEFER;
|
|
|
|
} else if (IS_ERR(mclk)) {
|
|
|
|
dev_dbg(&pdev->dev, "mclk not found.\n");
|
|
|
|
mclk = NULL;
|
|
|
|
}
|
|
|
|
|
2013-10-23 16:30:14 +04:00
|
|
|
drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
|
|
|
|
if (!drvdata)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2014-01-27 19:37:51 +04:00
|
|
|
drvdata->mclk = mclk;
|
|
|
|
|
2013-10-23 16:30:14 +04:00
|
|
|
ret = of_property_read_u32(np, "ti,codec-clock-rate", &drvdata->sysclk);
|
2014-01-27 19:37:51 +04:00
|
|
|
|
|
|
|
if (ret < 0) {
|
|
|
|
if (!drvdata->mclk) {
|
|
|
|
dev_err(&pdev->dev,
|
|
|
|
"No clock or clock rate defined.\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
drvdata->sysclk = clk_get_rate(drvdata->mclk);
|
|
|
|
} else if (drvdata->mclk) {
|
|
|
|
unsigned int requestd_rate = drvdata->sysclk;
|
|
|
|
clk_set_rate(drvdata->mclk, drvdata->sysclk);
|
|
|
|
drvdata->sysclk = clk_get_rate(drvdata->mclk);
|
|
|
|
if (drvdata->sysclk != requestd_rate)
|
|
|
|
dev_warn(&pdev->dev,
|
|
|
|
"Could not get requested rate %u using %u.\n",
|
|
|
|
requestd_rate, drvdata->sysclk);
|
|
|
|
}
|
2013-10-23 16:30:14 +04:00
|
|
|
|
|
|
|
snd_soc_card_set_drvdata(&evm_soc_card, drvdata);
|
|
|
|
ret = devm_snd_soc_register_card(&pdev->dev, &evm_soc_card);
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int davinci_evm_remove(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
|
|
|
|
|
|
|
snd_soc_unregister_card(card);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct platform_driver davinci_evm_driver = {
|
|
|
|
.probe = davinci_evm_probe,
|
|
|
|
.remove = davinci_evm_remove,
|
|
|
|
.driver = {
|
|
|
|
.name = "davinci_evm",
|
|
|
|
.owner = THIS_MODULE,
|
2014-01-30 17:21:31 +04:00
|
|
|
.pm = &snd_soc_pm_ops,
|
2013-10-23 16:30:14 +04:00
|
|
|
.of_match_table = of_match_ptr(davinci_evm_dt_ids),
|
|
|
|
},
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2008-02-18 13:40:22 +03:00
|
|
|
static struct platform_device *evm_snd_device;
|
|
|
|
|
|
|
|
static int __init evm_init(void)
|
|
|
|
{
|
2010-03-17 23:15:21 +03:00
|
|
|
struct snd_soc_card *evm_snd_dev_data;
|
2009-05-15 00:01:59 +04:00
|
|
|
int index;
|
2008-02-18 13:40:22 +03:00
|
|
|
int ret;
|
|
|
|
|
2013-10-23 16:30:14 +04:00
|
|
|
/*
|
|
|
|
* If dtb is there, the devices will be created dynamically.
|
|
|
|
* Only register platfrom driver structure.
|
|
|
|
*/
|
|
|
|
#if defined(CONFIG_OF)
|
|
|
|
if (of_have_populated_dt())
|
|
|
|
return platform_driver_register(&davinci_evm_driver);
|
|
|
|
#endif
|
|
|
|
|
2010-03-11 18:33:40 +03:00
|
|
|
if (machine_is_davinci_evm()) {
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
evm_snd_dev_data = &dm6446_snd_soc_card_evm;
|
2009-05-15 00:01:59 +04:00
|
|
|
index = 0;
|
|
|
|
} else if (machine_is_davinci_dm355_evm()) {
|
ASoC: davinci: fixes for multi-component
Multi-component commit f0fba2ad broke a few things which this patch should
fix. Tested on the DM355 EVM. I've been as careful as I can, but it would be
good if those with access to other Davinci boards could test.
--
The multi-component commit put the initialisation of
snd_soc_dai.[capture|playback]_dma_data into snd_soc_dai_ops.hw_params of the
McBSP, McASP & VCIF drivers (davinci-i2s.c, davinci-mcasp.c & davinci-vcif.c).
The initialisation had to be moved from the probe function in these drivers
because davinci_*_dai changed from snd_soc_dai to snd_soc_dai_driver.
Unfortunately, the DMA params pointer is needed by davinci_pcm_open (in
davinci-pcm.c) before hw_params is called. I have moved the initialisation to
a new snd_soc_dai_ops.startup function in each of these drivers. This fix
indicates that all platforms that use davinci-pcm must have been broken and
need to test with this fix.
--
The multi-component commit also changed the McBSP driver name from
"davinci-asp" to "davinci-i2s" in davinci-i2s.c without updating the board
level references to the driver name. This change is understandable, as there
is a similarly named "davinci-mcasp" driver in davinci-mcasp.c.
There is probably no 'correct' name for this driver. The DM6446 datasheet
calls it the "ASP" and describes it as a "specialised McBSP". The DM355
datasheet calls it the "ASP" and describes it as a "specialised ASP". The
DM365 datasheet calls it the "McBSP". Rather than fix this problem by
reverting to "davinci-asp", I've elected to avoid future confusion with the
"davinci-mcasp" driver by changing it to "davinci-mcbsp", which is also
consistent with the names of the functions in the driver. There are other
fixes required, so it was never going to be as simple as a revert anyway.
--
The DM365 only has one McBSP port (of the McBSP platforms, only the DM355 has
2 ports), so I've changed the the id of the platform_device from 0 to -1.
--
In davinci-evm.c, the DM6446 EVM can no longer share a snd_soc_dai_link
structure with the DM355 EVM as they use different cpu DAI names (the DM355
has 2 ports and the EVM uses the second port, but the DM6446 only has 1 port).
This also means that the 2 boards need different snd_soc_card structures.
--
The codec_name entries in davinci-evm.c didn't match the i2c ids in the board
files. I have only checked and fixed the details of the names used for the
McBSP based platforms. Someone with a McASP based platform (eg DA8xx) should
check the others.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2010-11-16 15:27:09 +03:00
|
|
|
evm_snd_dev_data = &dm355_snd_soc_card_evm;
|
2009-05-15 00:01:59 +04:00
|
|
|
index = 1;
|
2010-03-11 18:33:40 +03:00
|
|
|
} else if (machine_is_davinci_dm365_evm()) {
|
2010-03-17 23:15:21 +03:00
|
|
|
evm_snd_dev_data = &dm365_snd_soc_card_evm;
|
2010-03-11 18:33:40 +03:00
|
|
|
index = 0;
|
2009-06-05 14:28:49 +04:00
|
|
|
} else if (machine_is_davinci_dm6467_evm()) {
|
2010-03-17 23:15:21 +03:00
|
|
|
evm_snd_dev_data = &dm6467_snd_soc_card_evm;
|
2009-06-05 14:28:49 +04:00
|
|
|
index = 0;
|
2009-08-07 18:07:51 +04:00
|
|
|
} else if (machine_is_davinci_da830_evm()) {
|
2010-03-17 23:15:21 +03:00
|
|
|
evm_snd_dev_data = &da830_snd_soc_card;
|
2009-08-07 18:07:51 +04:00
|
|
|
index = 1;
|
2009-08-12 00:59:21 +04:00
|
|
|
} else if (machine_is_davinci_da850_evm()) {
|
2010-03-17 23:15:21 +03:00
|
|
|
evm_snd_dev_data = &da850_snd_soc_card;
|
2009-08-12 00:59:21 +04:00
|
|
|
index = 0;
|
2009-05-15 00:01:59 +04:00
|
|
|
} else
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
evm_snd_device = platform_device_alloc("soc-audio", index);
|
2008-02-18 13:40:22 +03:00
|
|
|
if (!evm_snd_device)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2009-06-05 14:28:49 +04:00
|
|
|
platform_set_drvdata(evm_snd_device, evm_snd_dev_data);
|
2008-02-18 13:40:22 +03:00
|
|
|
ret = platform_device_add(evm_snd_device);
|
|
|
|
if (ret)
|
|
|
|
platform_device_put(evm_snd_device);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit evm_exit(void)
|
|
|
|
{
|
2013-10-23 16:30:14 +04:00
|
|
|
#if defined(CONFIG_OF)
|
|
|
|
if (of_have_populated_dt()) {
|
|
|
|
platform_driver_unregister(&davinci_evm_driver);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-02-18 13:40:22 +03:00
|
|
|
platform_device_unregister(evm_snd_device);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(evm_init);
|
|
|
|
module_exit(evm_exit);
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Vladimir Barinov");
|
|
|
|
MODULE_DESCRIPTION("TI DAVINCI EVM ASoC driver");
|
|
|
|
MODULE_LICENSE("GPL");
|