2008-02-18 18:40:22 +08:00
|
|
|
/*
|
|
|
|
* ALSA SoC I2S (McBSP) Audio Layer for TI DAVINCI processor
|
|
|
|
*
|
2008-09-30 03:14:11 +08:00
|
|
|
* Author: Vladimir Barinov, <vbarinov@embeddedalley.com>
|
2008-02-18 18:40:22 +08: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/init.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/device.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2008-02-18 18:40:22 +08:00
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/io.h>
|
|
|
|
#include <linux/clk.h>
|
|
|
|
|
|
|
|
#include <sound/core.h>
|
|
|
|
#include <sound/pcm.h>
|
|
|
|
#include <sound/pcm_params.h>
|
|
|
|
#include <sound/initval.h>
|
|
|
|
#include <sound/soc.h>
|
|
|
|
|
2009-07-08 23:54:51 +08:00
|
|
|
#include <mach/asp.h>
|
|
|
|
|
2008-02-18 18:40:22 +08:00
|
|
|
#include "davinci-pcm.h"
|
2010-07-06 16:39:02 +08:00
|
|
|
#include "davinci-i2s.h"
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2009-05-15 03:47:42 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* NOTE: terminology here is confusing.
|
|
|
|
*
|
|
|
|
* - This driver supports the "Audio Serial Port" (ASP),
|
|
|
|
* found on dm6446, dm355, and other DaVinci chips.
|
|
|
|
*
|
|
|
|
* - But it labels it a "Multi-channel Buffered Serial Port"
|
|
|
|
* (McBSP) as on older chips like the dm642 ... which was
|
|
|
|
* backward-compatible, possibly explaining that confusion.
|
|
|
|
*
|
|
|
|
* - OMAP chips have a controller called McBSP, which is
|
|
|
|
* incompatible with the DaVinci flavor of McBSP.
|
|
|
|
*
|
|
|
|
* - Newer DaVinci chips have a controller called McASP,
|
|
|
|
* incompatible with ASP and with either McBSP.
|
|
|
|
*
|
|
|
|
* In short: this uses ASP to implement I2S, not McBSP.
|
|
|
|
* And it won't be the only DaVinci implemention of I2S.
|
|
|
|
*/
|
2008-02-18 18:40:22 +08:00
|
|
|
#define DAVINCI_MCBSP_DRR_REG 0x00
|
|
|
|
#define DAVINCI_MCBSP_DXR_REG 0x04
|
|
|
|
#define DAVINCI_MCBSP_SPCR_REG 0x08
|
|
|
|
#define DAVINCI_MCBSP_RCR_REG 0x0c
|
|
|
|
#define DAVINCI_MCBSP_XCR_REG 0x10
|
|
|
|
#define DAVINCI_MCBSP_SRGR_REG 0x14
|
|
|
|
#define DAVINCI_MCBSP_PCR_REG 0x24
|
|
|
|
|
|
|
|
#define DAVINCI_MCBSP_SPCR_RRST (1 << 0)
|
|
|
|
#define DAVINCI_MCBSP_SPCR_RINTM(v) ((v) << 4)
|
|
|
|
#define DAVINCI_MCBSP_SPCR_XRST (1 << 16)
|
|
|
|
#define DAVINCI_MCBSP_SPCR_XINTM(v) ((v) << 20)
|
|
|
|
#define DAVINCI_MCBSP_SPCR_GRST (1 << 22)
|
|
|
|
#define DAVINCI_MCBSP_SPCR_FRST (1 << 23)
|
|
|
|
#define DAVINCI_MCBSP_SPCR_FREE (1 << 25)
|
|
|
|
|
|
|
|
#define DAVINCI_MCBSP_RCR_RWDLEN1(v) ((v) << 5)
|
|
|
|
#define DAVINCI_MCBSP_RCR_RFRLEN1(v) ((v) << 8)
|
|
|
|
#define DAVINCI_MCBSP_RCR_RDATDLY(v) ((v) << 16)
|
2009-07-05 10:29:57 +08:00
|
|
|
#define DAVINCI_MCBSP_RCR_RFIG (1 << 18)
|
2008-02-18 18:40:22 +08:00
|
|
|
#define DAVINCI_MCBSP_RCR_RWDLEN2(v) ((v) << 21)
|
2010-07-06 16:39:02 +08:00
|
|
|
#define DAVINCI_MCBSP_RCR_RFRLEN2(v) ((v) << 24)
|
|
|
|
#define DAVINCI_MCBSP_RCR_RPHASE BIT(31)
|
2008-02-18 18:40:22 +08:00
|
|
|
|
|
|
|
#define DAVINCI_MCBSP_XCR_XWDLEN1(v) ((v) << 5)
|
|
|
|
#define DAVINCI_MCBSP_XCR_XFRLEN1(v) ((v) << 8)
|
|
|
|
#define DAVINCI_MCBSP_XCR_XDATDLY(v) ((v) << 16)
|
|
|
|
#define DAVINCI_MCBSP_XCR_XFIG (1 << 18)
|
|
|
|
#define DAVINCI_MCBSP_XCR_XWDLEN2(v) ((v) << 21)
|
2010-07-06 16:39:02 +08:00
|
|
|
#define DAVINCI_MCBSP_XCR_XFRLEN2(v) ((v) << 24)
|
|
|
|
#define DAVINCI_MCBSP_XCR_XPHASE BIT(31)
|
2008-02-18 18:40:22 +08:00
|
|
|
|
|
|
|
#define DAVINCI_MCBSP_SRGR_FWID(v) ((v) << 8)
|
|
|
|
#define DAVINCI_MCBSP_SRGR_FPER(v) ((v) << 16)
|
|
|
|
#define DAVINCI_MCBSP_SRGR_FSGM (1 << 28)
|
2010-07-06 16:39:02 +08:00
|
|
|
#define DAVINCI_MCBSP_SRGR_CLKSM BIT(29)
|
2008-02-18 18:40:22 +08:00
|
|
|
|
|
|
|
#define DAVINCI_MCBSP_PCR_CLKRP (1 << 0)
|
|
|
|
#define DAVINCI_MCBSP_PCR_CLKXP (1 << 1)
|
|
|
|
#define DAVINCI_MCBSP_PCR_FSRP (1 << 2)
|
|
|
|
#define DAVINCI_MCBSP_PCR_FSXP (1 << 3)
|
2008-11-09 02:26:09 +08:00
|
|
|
#define DAVINCI_MCBSP_PCR_SCLKME (1 << 7)
|
2008-02-18 18:40:22 +08:00
|
|
|
#define DAVINCI_MCBSP_PCR_CLKRM (1 << 8)
|
|
|
|
#define DAVINCI_MCBSP_PCR_CLKXM (1 << 9)
|
|
|
|
#define DAVINCI_MCBSP_PCR_FSRM (1 << 10)
|
|
|
|
#define DAVINCI_MCBSP_PCR_FSXM (1 << 11)
|
|
|
|
|
|
|
|
enum {
|
|
|
|
DAVINCI_MCBSP_WORD_8 = 0,
|
|
|
|
DAVINCI_MCBSP_WORD_12,
|
|
|
|
DAVINCI_MCBSP_WORD_16,
|
|
|
|
DAVINCI_MCBSP_WORD_20,
|
|
|
|
DAVINCI_MCBSP_WORD_24,
|
|
|
|
DAVINCI_MCBSP_WORD_32,
|
|
|
|
};
|
|
|
|
|
2009-11-19 08:49:51 +08:00
|
|
|
static const unsigned char data_type[SNDRV_PCM_FORMAT_S32_LE + 1] = {
|
|
|
|
[SNDRV_PCM_FORMAT_S8] = 1,
|
|
|
|
[SNDRV_PCM_FORMAT_S16_LE] = 2,
|
|
|
|
[SNDRV_PCM_FORMAT_S32_LE] = 4,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const unsigned char asp_word_length[SNDRV_PCM_FORMAT_S32_LE + 1] = {
|
|
|
|
[SNDRV_PCM_FORMAT_S8] = DAVINCI_MCBSP_WORD_8,
|
|
|
|
[SNDRV_PCM_FORMAT_S16_LE] = DAVINCI_MCBSP_WORD_16,
|
|
|
|
[SNDRV_PCM_FORMAT_S32_LE] = DAVINCI_MCBSP_WORD_32,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const unsigned char double_fmt[SNDRV_PCM_FORMAT_S32_LE + 1] = {
|
|
|
|
[SNDRV_PCM_FORMAT_S8] = SNDRV_PCM_FORMAT_S16_LE,
|
|
|
|
[SNDRV_PCM_FORMAT_S16_LE] = SNDRV_PCM_FORMAT_S32_LE,
|
|
|
|
};
|
|
|
|
|
2008-02-18 18:40:22 +08:00
|
|
|
struct davinci_mcbsp_dev {
|
2010-07-06 16:39:03 +08:00
|
|
|
struct device *dev;
|
2009-09-12 05:29:03 +08:00
|
|
|
struct davinci_pcm_dma_params dma_params[2];
|
2008-02-18 18:40:22 +08:00
|
|
|
void __iomem *base;
|
2009-07-05 10:29:57 +08:00
|
|
|
#define MOD_DSP_A 0
|
|
|
|
#define MOD_DSP_B 1
|
|
|
|
int mode;
|
2009-07-05 10:29:52 +08:00
|
|
|
u32 pcr;
|
2008-02-18 18:40:22 +08:00
|
|
|
struct clk *clk;
|
2009-11-19 08:49:51 +08:00
|
|
|
/*
|
|
|
|
* Combining both channels into 1 element will at least double the
|
|
|
|
* amount of time between servicing the dma channel, increase
|
|
|
|
* effiency, and reduce the chance of overrun/underrun. But,
|
|
|
|
* it will result in the left & right channels being swapped.
|
|
|
|
*
|
|
|
|
* If relabeling the left and right channels is not possible,
|
|
|
|
* you may want to let the codec know to swap them back.
|
|
|
|
*
|
|
|
|
* It may allow x10 the amount of time to service dma requests,
|
|
|
|
* if the codec is master and is using an unnecessarily fast bit clock
|
|
|
|
* (ie. tlvaic23b), independent of the sample rate. So, having an
|
|
|
|
* entire frame at once means it can be serviced at the sample rate
|
|
|
|
* instead of the bit clock rate.
|
|
|
|
*
|
|
|
|
* In the now unlikely case that an underrun still
|
|
|
|
* occurs, both the left and right samples will be repeated
|
|
|
|
* so that no pops are heard, and the left and right channels
|
|
|
|
* won't end up being swapped because of the underrun.
|
|
|
|
*/
|
|
|
|
unsigned enable_channel_combine:1;
|
2010-07-06 16:39:02 +08:00
|
|
|
|
|
|
|
unsigned int fmt;
|
|
|
|
int clk_div;
|
2010-07-06 16:39:03 +08:00
|
|
|
int clk_input_pin;
|
2010-07-06 16:39:04 +08:00
|
|
|
bool i2s_accurate_sck;
|
2008-02-18 18:40:22 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static inline void davinci_mcbsp_write_reg(struct davinci_mcbsp_dev *dev,
|
|
|
|
int reg, u32 val)
|
|
|
|
{
|
|
|
|
__raw_writel(val, dev->base + reg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u32 davinci_mcbsp_read_reg(struct davinci_mcbsp_dev *dev, int reg)
|
|
|
|
{
|
|
|
|
return __raw_readl(dev->base + reg);
|
|
|
|
}
|
|
|
|
|
2009-07-05 10:29:52 +08:00
|
|
|
static void toggle_clock(struct davinci_mcbsp_dev *dev, int playback)
|
|
|
|
{
|
|
|
|
u32 m = playback ? DAVINCI_MCBSP_PCR_CLKXP : DAVINCI_MCBSP_PCR_CLKRP;
|
|
|
|
/* The clock needs to toggle to complete reset.
|
|
|
|
* So, fake it by toggling the clk polarity.
|
|
|
|
*/
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_PCR_REG, dev->pcr ^ m);
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_PCR_REG, dev->pcr);
|
|
|
|
}
|
|
|
|
|
2009-07-05 10:29:53 +08:00
|
|
|
static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
|
|
|
|
struct snd_pcm_substream *substream)
|
2008-02-18 18:40:22 +08:00
|
|
|
{
|
|
|
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
2010-03-18 04:15:21 +08:00
|
|
|
struct snd_soc_platform *platform = rtd->platform;
|
2009-07-05 10:29:52 +08:00
|
|
|
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
|
2009-07-05 10:29:51 +08:00
|
|
|
u32 spcr;
|
2009-07-05 10:29:52 +08:00
|
|
|
u32 mask = playback ? DAVINCI_MCBSP_SPCR_XRST : DAVINCI_MCBSP_SPCR_RRST;
|
2009-07-05 10:29:51 +08:00
|
|
|
spcr = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SPCR_REG);
|
2009-07-05 10:29:52 +08:00
|
|
|
if (spcr & mask) {
|
|
|
|
/* start off disabled */
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG,
|
|
|
|
spcr & ~mask);
|
|
|
|
toggle_clock(dev, playback);
|
|
|
|
}
|
2009-07-05 10:29:55 +08:00
|
|
|
if (dev->pcr & (DAVINCI_MCBSP_PCR_FSXM | DAVINCI_MCBSP_PCR_FSRM |
|
|
|
|
DAVINCI_MCBSP_PCR_CLKXM | DAVINCI_MCBSP_PCR_CLKRM)) {
|
|
|
|
/* Start the sample generator */
|
|
|
|
spcr |= DAVINCI_MCBSP_SPCR_GRST;
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, spcr);
|
|
|
|
}
|
2008-11-12 12:56:31 +08:00
|
|
|
|
2009-07-05 10:29:55 +08:00
|
|
|
if (playback) {
|
2008-11-12 12:56:31 +08:00
|
|
|
/* Stop the DMA to avoid data loss */
|
|
|
|
/* while the transmitter is out of reset to handle XSYNCERR */
|
2010-03-18 04:15:21 +08:00
|
|
|
if (platform->driver->ops->trigger) {
|
|
|
|
int ret = platform->driver->ops->trigger(substream,
|
2008-11-12 12:56:31 +08:00
|
|
|
SNDRV_PCM_TRIGGER_STOP);
|
|
|
|
if (ret < 0)
|
|
|
|
printk(KERN_DEBUG "Playback DMA stop failed\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Enable the transmitter */
|
2009-07-05 10:29:51 +08:00
|
|
|
spcr = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SPCR_REG);
|
|
|
|
spcr |= DAVINCI_MCBSP_SPCR_XRST;
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, spcr);
|
2008-11-12 12:56:31 +08:00
|
|
|
|
|
|
|
/* wait for any unexpected frame sync error to occur */
|
|
|
|
udelay(100);
|
|
|
|
|
|
|
|
/* Disable the transmitter to clear any outstanding XSYNCERR */
|
2009-07-05 10:29:51 +08:00
|
|
|
spcr = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SPCR_REG);
|
|
|
|
spcr &= ~DAVINCI_MCBSP_SPCR_XRST;
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, spcr);
|
2009-07-05 10:29:52 +08:00
|
|
|
toggle_clock(dev, playback);
|
2008-11-12 12:56:31 +08:00
|
|
|
|
|
|
|
/* Restart the DMA */
|
2010-03-18 04:15:21 +08:00
|
|
|
if (platform->driver->ops->trigger) {
|
|
|
|
int ret = platform->driver->ops->trigger(substream,
|
2008-11-12 12:56:31 +08:00
|
|
|
SNDRV_PCM_TRIGGER_START);
|
|
|
|
if (ret < 0)
|
|
|
|
printk(KERN_DEBUG "Playback DMA start failed\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-05 10:29:55 +08:00
|
|
|
/* Enable transmitter or receiver */
|
2009-07-05 10:29:51 +08:00
|
|
|
spcr = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SPCR_REG);
|
2009-07-05 10:29:55 +08:00
|
|
|
spcr |= mask;
|
|
|
|
|
|
|
|
if (dev->pcr & (DAVINCI_MCBSP_PCR_FSXM | DAVINCI_MCBSP_PCR_FSRM)) {
|
|
|
|
/* Start frame sync */
|
|
|
|
spcr |= DAVINCI_MCBSP_SPCR_FRST;
|
|
|
|
}
|
2009-07-05 10:29:51 +08:00
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, spcr);
|
2008-02-18 18:40:22 +08:00
|
|
|
}
|
|
|
|
|
2009-07-05 10:29:53 +08:00
|
|
|
static void davinci_mcbsp_stop(struct davinci_mcbsp_dev *dev, int playback)
|
2008-02-18 18:40:22 +08:00
|
|
|
{
|
2009-07-05 10:29:51 +08:00
|
|
|
u32 spcr;
|
2008-02-18 18:40:22 +08:00
|
|
|
|
|
|
|
/* Reset transmitter/receiver and sample rate/frame sync generators */
|
2009-07-05 10:29:51 +08:00
|
|
|
spcr = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SPCR_REG);
|
|
|
|
spcr &= ~(DAVINCI_MCBSP_SPCR_GRST | DAVINCI_MCBSP_SPCR_FRST);
|
2009-07-05 10:29:52 +08:00
|
|
|
spcr &= playback ? ~DAVINCI_MCBSP_SPCR_XRST : ~DAVINCI_MCBSP_SPCR_RRST;
|
2009-07-05 10:29:51 +08:00
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, spcr);
|
2009-07-05 10:29:52 +08:00
|
|
|
toggle_clock(dev, playback);
|
2008-02-18 18:40:22 +08:00
|
|
|
}
|
|
|
|
|
2008-12-19 03:36:43 +08:00
|
|
|
#define DEFAULT_BITPERSAMPLE 16
|
|
|
|
|
2008-07-07 23:07:42 +08:00
|
|
|
static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
|
2008-02-18 18:40:22 +08:00
|
|
|
unsigned int fmt)
|
|
|
|
{
|
2010-03-18 04:15:21 +08:00
|
|
|
struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
|
2008-12-19 03:36:43 +08:00
|
|
|
unsigned int pcr;
|
|
|
|
unsigned int srgr;
|
2010-07-06 16:39:02 +08:00
|
|
|
/* Attention srgr is updated by hw_params! */
|
2008-12-19 03:36:43 +08:00
|
|
|
srgr = DAVINCI_MCBSP_SRGR_FSGM |
|
|
|
|
DAVINCI_MCBSP_SRGR_FPER(DEFAULT_BITPERSAMPLE * 2 - 1) |
|
|
|
|
DAVINCI_MCBSP_SRGR_FWID(DEFAULT_BITPERSAMPLE - 1);
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2010-07-06 16:39:02 +08:00
|
|
|
dev->fmt = fmt;
|
2009-07-05 10:29:57 +08:00
|
|
|
/* set master/slave audio interface */
|
2008-02-18 18:40:22 +08:00
|
|
|
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
|
|
|
case SND_SOC_DAIFMT_CBS_CFS:
|
2008-12-19 03:36:43 +08:00
|
|
|
/* cpu is master */
|
|
|
|
pcr = DAVINCI_MCBSP_PCR_FSXM |
|
|
|
|
DAVINCI_MCBSP_PCR_FSRM |
|
|
|
|
DAVINCI_MCBSP_PCR_CLKXM |
|
|
|
|
DAVINCI_MCBSP_PCR_CLKRM;
|
2008-02-18 18:40:22 +08:00
|
|
|
break;
|
2008-11-09 02:26:09 +08:00
|
|
|
case SND_SOC_DAIFMT_CBM_CFS:
|
2010-07-06 16:39:03 +08:00
|
|
|
pcr = DAVINCI_MCBSP_PCR_FSRM | DAVINCI_MCBSP_PCR_FSXM;
|
|
|
|
/*
|
|
|
|
* Selection of the clock input pin that is the
|
|
|
|
* input for the Sample Rate Generator.
|
|
|
|
* McBSP FSR and FSX are driven by the Sample Rate
|
|
|
|
* Generator.
|
|
|
|
*/
|
|
|
|
switch (dev->clk_input_pin) {
|
|
|
|
case MCBSP_CLKS:
|
|
|
|
pcr |= DAVINCI_MCBSP_PCR_CLKXM |
|
|
|
|
DAVINCI_MCBSP_PCR_CLKRM;
|
|
|
|
break;
|
|
|
|
case MCBSP_CLKR:
|
|
|
|
pcr |= DAVINCI_MCBSP_PCR_SCLKME;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
dev_err(dev->dev, "bad clk_input_pin\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2008-11-09 02:26:09 +08:00
|
|
|
break;
|
2008-02-18 18:40:22 +08:00
|
|
|
case SND_SOC_DAIFMT_CBM_CFM:
|
2008-12-19 03:36:43 +08:00
|
|
|
/* codec is master */
|
|
|
|
pcr = 0;
|
2008-02-18 18:40:22 +08:00
|
|
|
break;
|
|
|
|
default:
|
2008-12-19 03:36:43 +08:00
|
|
|
printk(KERN_ERR "%s:bad master\n", __func__);
|
2008-02-18 18:40:22 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2009-07-05 10:29:57 +08:00
|
|
|
/* interface format */
|
2008-12-19 03:36:44 +08:00
|
|
|
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
|
|
|
|
case SND_SOC_DAIFMT_I2S:
|
2008-12-20 04:05:24 +08:00
|
|
|
/* Davinci doesn't support TRUE I2S, but some codecs will have
|
|
|
|
* the left and right channels contiguous. This allows
|
|
|
|
* dsp_a mode to be used with an inverted normal frame clk.
|
|
|
|
* If your codec is master and does not have contiguous
|
|
|
|
* channels, then you will have sound on only one channel.
|
|
|
|
* Try using a different mode, or codec as slave.
|
|
|
|
*
|
|
|
|
* The TLV320AIC33 is an example of a codec where this works.
|
|
|
|
* It has a variable bit clock frequency allowing it to have
|
|
|
|
* valid data on every bit clock.
|
|
|
|
*
|
|
|
|
* The TLV320AIC23 is an example of a codec where this does not
|
|
|
|
* work. It has a fixed bit clock frequency with progressively
|
|
|
|
* more empty bit clock slots between channels as the sample
|
|
|
|
* rate is lowered.
|
|
|
|
*/
|
|
|
|
fmt ^= SND_SOC_DAIFMT_NB_IF;
|
|
|
|
case SND_SOC_DAIFMT_DSP_A:
|
2009-07-05 10:29:57 +08:00
|
|
|
dev->mode = MOD_DSP_A;
|
|
|
|
break;
|
|
|
|
case SND_SOC_DAIFMT_DSP_B:
|
|
|
|
dev->mode = MOD_DSP_B;
|
2008-12-19 03:36:44 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printk(KERN_ERR "%s:bad format\n", __func__);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2008-02-18 18:40:22 +08:00
|
|
|
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
|
2008-12-20 04:05:23 +08:00
|
|
|
case SND_SOC_DAIFMT_NB_NF:
|
2008-12-19 03:36:41 +08:00
|
|
|
/* CLKRP Receive clock polarity,
|
|
|
|
* 1 - sampled on rising edge of CLKR
|
|
|
|
* valid on rising edge
|
|
|
|
* CLKXP Transmit clock polarity,
|
|
|
|
* 1 - clocked on falling edge of CLKX
|
|
|
|
* valid on rising edge
|
|
|
|
* FSRP Receive frame sync pol, 0 - active high
|
|
|
|
* FSXP Transmit frame sync pol, 0 - active high
|
|
|
|
*/
|
2008-12-19 03:36:43 +08:00
|
|
|
pcr |= (DAVINCI_MCBSP_PCR_CLKXP | DAVINCI_MCBSP_PCR_CLKRP);
|
2008-02-18 18:40:22 +08:00
|
|
|
break;
|
2008-12-20 04:05:23 +08:00
|
|
|
case SND_SOC_DAIFMT_IB_IF:
|
2008-12-19 03:36:41 +08:00
|
|
|
/* CLKRP Receive clock polarity,
|
|
|
|
* 0 - sampled on falling edge of CLKR
|
|
|
|
* valid on falling edge
|
|
|
|
* CLKXP Transmit clock polarity,
|
|
|
|
* 0 - clocked on rising edge of CLKX
|
|
|
|
* valid on falling edge
|
|
|
|
* FSRP Receive frame sync pol, 1 - active low
|
|
|
|
* FSXP Transmit frame sync pol, 1 - active low
|
|
|
|
*/
|
2008-12-19 03:36:43 +08:00
|
|
|
pcr |= (DAVINCI_MCBSP_PCR_FSXP | DAVINCI_MCBSP_PCR_FSRP);
|
2008-02-18 18:40:22 +08:00
|
|
|
break;
|
2008-12-20 04:05:23 +08:00
|
|
|
case SND_SOC_DAIFMT_NB_IF:
|
2008-12-19 03:36:41 +08:00
|
|
|
/* CLKRP Receive clock polarity,
|
|
|
|
* 1 - sampled on rising edge of CLKR
|
|
|
|
* valid on rising edge
|
|
|
|
* CLKXP Transmit clock polarity,
|
|
|
|
* 1 - clocked on falling edge of CLKX
|
|
|
|
* valid on rising edge
|
|
|
|
* FSRP Receive frame sync pol, 1 - active low
|
|
|
|
* FSXP Transmit frame sync pol, 1 - active low
|
|
|
|
*/
|
2008-12-19 03:36:43 +08:00
|
|
|
pcr |= (DAVINCI_MCBSP_PCR_CLKXP | DAVINCI_MCBSP_PCR_CLKRP |
|
|
|
|
DAVINCI_MCBSP_PCR_FSXP | DAVINCI_MCBSP_PCR_FSRP);
|
2008-02-18 18:40:22 +08:00
|
|
|
break;
|
2008-12-20 04:05:23 +08:00
|
|
|
case SND_SOC_DAIFMT_IB_NF:
|
2008-12-19 03:36:41 +08:00
|
|
|
/* CLKRP Receive clock polarity,
|
|
|
|
* 0 - sampled on falling edge of CLKR
|
|
|
|
* valid on falling edge
|
|
|
|
* CLKXP Transmit clock polarity,
|
|
|
|
* 0 - clocked on rising edge of CLKX
|
|
|
|
* valid on falling edge
|
|
|
|
* FSRP Receive frame sync pol, 0 - active high
|
|
|
|
* FSXP Transmit frame sync pol, 0 - active high
|
|
|
|
*/
|
2008-02-18 18:40:22 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2008-12-19 03:36:43 +08:00
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SRGR_REG, srgr);
|
2009-07-05 10:29:52 +08:00
|
|
|
dev->pcr = pcr;
|
2008-12-19 03:36:43 +08:00
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_PCR_REG, pcr);
|
2008-02-18 18:40:22 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-07-06 16:39:02 +08:00
|
|
|
static int davinci_i2s_dai_set_clkdiv(struct snd_soc_dai *cpu_dai,
|
|
|
|
int div_id, int div)
|
|
|
|
{
|
2010-03-18 04:15:21 +08:00
|
|
|
struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
|
2010-07-06 16:39:02 +08:00
|
|
|
|
|
|
|
if (div_id != DAVINCI_MCBSP_CLKGDV)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
dev->clk_div = div;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-02-18 18:40:22 +08:00
|
|
|
static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
|
2008-11-19 06:11:38 +08:00
|
|
|
struct snd_pcm_hw_params *params,
|
|
|
|
struct snd_soc_dai *dai)
|
2008-02-18 18:40:22 +08:00
|
|
|
{
|
2010-03-18 04:15:21 +08:00
|
|
|
struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai);
|
2009-09-12 05:29:02 +08:00
|
|
|
struct davinci_pcm_dma_params *dma_params =
|
2009-09-12 05:29:03 +08:00
|
|
|
&dev->dma_params[substream->stream];
|
2008-02-18 18:40:22 +08:00
|
|
|
struct snd_interval *i = NULL;
|
2010-07-06 16:39:02 +08:00
|
|
|
int mcbsp_word_length, master;
|
|
|
|
unsigned int rcr, xcr, srgr, clk_div, freq, framesize;
|
2009-07-05 10:29:51 +08:00
|
|
|
u32 spcr;
|
2009-11-19 08:49:51 +08:00
|
|
|
snd_pcm_format_t fmt;
|
|
|
|
unsigned element_cnt = 1;
|
2008-02-18 18:40:22 +08:00
|
|
|
|
|
|
|
/* general line settings */
|
2009-07-05 10:29:51 +08:00
|
|
|
spcr = davinci_mcbsp_read_reg(dev, DAVINCI_MCBSP_SPCR_REG);
|
2008-11-18 13:31:03 +08:00
|
|
|
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
|
2009-07-05 10:29:51 +08:00
|
|
|
spcr |= DAVINCI_MCBSP_SPCR_RINTM(3) | DAVINCI_MCBSP_SPCR_FREE;
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, spcr);
|
2008-11-18 13:31:03 +08:00
|
|
|
} else {
|
2009-07-05 10:29:51 +08:00
|
|
|
spcr |= DAVINCI_MCBSP_SPCR_XINTM(3) | DAVINCI_MCBSP_SPCR_FREE;
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SPCR_REG, spcr);
|
2008-11-18 13:31:03 +08:00
|
|
|
}
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2010-07-06 16:39:02 +08:00
|
|
|
master = dev->fmt & SND_SOC_DAIFMT_MASTER_MASK;
|
|
|
|
fmt = params_format(params);
|
|
|
|
mcbsp_word_length = asp_word_length[fmt];
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2010-07-06 16:39:02 +08:00
|
|
|
switch (master) {
|
|
|
|
case SND_SOC_DAIFMT_CBS_CFS:
|
|
|
|
freq = clk_get_rate(dev->clk);
|
|
|
|
srgr = DAVINCI_MCBSP_SRGR_FSGM |
|
|
|
|
DAVINCI_MCBSP_SRGR_CLKSM;
|
|
|
|
srgr |= DAVINCI_MCBSP_SRGR_FWID(mcbsp_word_length *
|
|
|
|
8 - 1);
|
2010-07-06 16:39:04 +08:00
|
|
|
if (dev->i2s_accurate_sck) {
|
|
|
|
clk_div = 256;
|
|
|
|
do {
|
|
|
|
framesize = (freq / (--clk_div)) /
|
|
|
|
params->rate_num *
|
|
|
|
params->rate_den;
|
|
|
|
} while (((framesize < 33) || (framesize > 4095)) &&
|
|
|
|
(clk_div));
|
|
|
|
clk_div--;
|
|
|
|
srgr |= DAVINCI_MCBSP_SRGR_FPER(framesize - 1);
|
|
|
|
} else {
|
|
|
|
/* symmetric waveforms */
|
|
|
|
clk_div = freq / (mcbsp_word_length * 16) /
|
|
|
|
params->rate_num * params->rate_den;
|
|
|
|
srgr |= DAVINCI_MCBSP_SRGR_FPER(mcbsp_word_length *
|
|
|
|
16 - 1);
|
|
|
|
}
|
2010-07-06 16:39:02 +08:00
|
|
|
clk_div &= 0xFF;
|
|
|
|
srgr |= clk_div;
|
|
|
|
break;
|
|
|
|
case SND_SOC_DAIFMT_CBM_CFS:
|
|
|
|
srgr = DAVINCI_MCBSP_SRGR_FSGM;
|
|
|
|
clk_div = dev->clk_div - 1;
|
|
|
|
srgr |= DAVINCI_MCBSP_SRGR_FWID(mcbsp_word_length * 8 - 1);
|
|
|
|
srgr |= DAVINCI_MCBSP_SRGR_FPER(mcbsp_word_length * 16 - 1);
|
|
|
|
clk_div &= 0xFF;
|
|
|
|
srgr |= clk_div;
|
|
|
|
break;
|
|
|
|
case SND_SOC_DAIFMT_CBM_CFM:
|
|
|
|
/* Clock and frame sync given from external sources */
|
|
|
|
i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);
|
|
|
|
srgr = DAVINCI_MCBSP_SRGR_FSGM;
|
|
|
|
srgr |= DAVINCI_MCBSP_SRGR_FWID(snd_interval_value(i) - 1);
|
|
|
|
pr_debug("%s - %d FWID set: re-read srgr = %X\n",
|
|
|
|
__func__, __LINE__, snd_interval_value(i) - 1);
|
|
|
|
|
|
|
|
i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_FRAME_BITS);
|
|
|
|
srgr |= DAVINCI_MCBSP_SRGR_FPER(snd_interval_value(i) - 1);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-07-05 10:29:51 +08:00
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_SRGR_REG, srgr);
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2009-07-05 10:29:57 +08:00
|
|
|
rcr = DAVINCI_MCBSP_RCR_RFIG;
|
|
|
|
xcr = DAVINCI_MCBSP_XCR_XFIG;
|
|
|
|
if (dev->mode == MOD_DSP_B) {
|
|
|
|
rcr |= DAVINCI_MCBSP_RCR_RDATDLY(0);
|
|
|
|
xcr |= DAVINCI_MCBSP_XCR_XDATDLY(0);
|
|
|
|
} else {
|
|
|
|
rcr |= DAVINCI_MCBSP_RCR_RDATDLY(1);
|
|
|
|
xcr |= DAVINCI_MCBSP_XCR_XDATDLY(1);
|
|
|
|
}
|
2008-02-18 18:40:22 +08:00
|
|
|
/* Determine xfer data type */
|
2009-11-19 08:49:51 +08:00
|
|
|
fmt = params_format(params);
|
|
|
|
if ((fmt > SNDRV_PCM_FORMAT_S32_LE) || !data_type[fmt]) {
|
2008-08-26 21:47:55 +08:00
|
|
|
printk(KERN_WARNING "davinci-i2s: unsupported PCM format\n");
|
2008-02-18 18:40:22 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2009-11-19 08:49:51 +08:00
|
|
|
if (params_channels(params) == 2) {
|
|
|
|
element_cnt = 2;
|
|
|
|
if (double_fmt[fmt] && dev->enable_channel_combine) {
|
|
|
|
element_cnt = 1;
|
|
|
|
fmt = double_fmt[fmt];
|
|
|
|
}
|
2010-07-06 16:39:02 +08:00
|
|
|
switch (master) {
|
|
|
|
case SND_SOC_DAIFMT_CBS_CFS:
|
|
|
|
case SND_SOC_DAIFMT_CBS_CFM:
|
|
|
|
rcr |= DAVINCI_MCBSP_RCR_RFRLEN2(0);
|
|
|
|
xcr |= DAVINCI_MCBSP_XCR_XFRLEN2(0);
|
|
|
|
rcr |= DAVINCI_MCBSP_RCR_RPHASE;
|
|
|
|
xcr |= DAVINCI_MCBSP_XCR_XPHASE;
|
|
|
|
break;
|
|
|
|
case SND_SOC_DAIFMT_CBM_CFM:
|
|
|
|
case SND_SOC_DAIFMT_CBM_CFS:
|
|
|
|
rcr |= DAVINCI_MCBSP_RCR_RFRLEN2(element_cnt - 1);
|
|
|
|
xcr |= DAVINCI_MCBSP_XCR_XFRLEN2(element_cnt - 1);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-11-19 08:49:51 +08:00
|
|
|
}
|
|
|
|
dma_params->acnt = dma_params->data_type = data_type[fmt];
|
2009-10-01 05:32:27 +08:00
|
|
|
dma_params->fifo_level = 0;
|
2009-11-19 08:49:51 +08:00
|
|
|
mcbsp_word_length = asp_word_length[fmt];
|
2010-07-06 16:39:02 +08:00
|
|
|
|
|
|
|
switch (master) {
|
|
|
|
case SND_SOC_DAIFMT_CBS_CFS:
|
|
|
|
case SND_SOC_DAIFMT_CBS_CFM:
|
|
|
|
rcr |= DAVINCI_MCBSP_RCR_RFRLEN1(0);
|
|
|
|
xcr |= DAVINCI_MCBSP_XCR_XFRLEN1(0);
|
|
|
|
break;
|
|
|
|
case SND_SOC_DAIFMT_CBM_CFM:
|
|
|
|
case SND_SOC_DAIFMT_CBM_CFS:
|
|
|
|
rcr |= DAVINCI_MCBSP_RCR_RFRLEN1(element_cnt - 1);
|
|
|
|
xcr |= DAVINCI_MCBSP_XCR_XFRLEN1(element_cnt - 1);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2009-07-05 10:29:57 +08:00
|
|
|
rcr |= DAVINCI_MCBSP_RCR_RWDLEN1(mcbsp_word_length) |
|
|
|
|
DAVINCI_MCBSP_RCR_RWDLEN2(mcbsp_word_length);
|
|
|
|
xcr |= DAVINCI_MCBSP_XCR_XWDLEN1(mcbsp_word_length) |
|
|
|
|
DAVINCI_MCBSP_XCR_XWDLEN2(mcbsp_word_length);
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2009-07-05 10:29:57 +08:00
|
|
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_XCR_REG, xcr);
|
|
|
|
else
|
|
|
|
davinci_mcbsp_write_reg(dev, DAVINCI_MCBSP_RCR_REG, rcr);
|
2010-07-06 16:39:02 +08:00
|
|
|
|
|
|
|
pr_debug("%s - %d srgr=%X\n", __func__, __LINE__, srgr);
|
|
|
|
pr_debug("%s - %d xcr=%X\n", __func__, __LINE__, xcr);
|
|
|
|
pr_debug("%s - %d rcr=%X\n", __func__, __LINE__, rcr);
|
2008-02-18 18:40:22 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-05 10:29:59 +08:00
|
|
|
static int davinci_i2s_prepare(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_soc_dai *dai)
|
|
|
|
{
|
2010-03-18 04:15:21 +08:00
|
|
|
struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai);
|
2009-07-05 10:29:59 +08:00
|
|
|
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
|
|
|
|
davinci_mcbsp_stop(dev, playback);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-11-19 06:11:38 +08:00
|
|
|
static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
|
|
|
|
struct snd_soc_dai *dai)
|
2008-02-18 18:40:22 +08:00
|
|
|
{
|
2010-03-18 04:15:21 +08:00
|
|
|
struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai);
|
2008-02-18 18:40:22 +08:00
|
|
|
int ret = 0;
|
2009-07-05 10:29:53 +08:00
|
|
|
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
|
2008-02-18 18:40:22 +08:00
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case SNDRV_PCM_TRIGGER_START:
|
|
|
|
case SNDRV_PCM_TRIGGER_RESUME:
|
|
|
|
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
|
2009-07-05 10:29:53 +08:00
|
|
|
davinci_mcbsp_start(dev, substream);
|
2008-02-18 18:40:22 +08:00
|
|
|
break;
|
|
|
|
case SNDRV_PCM_TRIGGER_STOP:
|
|
|
|
case SNDRV_PCM_TRIGGER_SUSPEND:
|
|
|
|
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
2009-07-05 10:29:53 +08:00
|
|
|
davinci_mcbsp_stop(dev, playback);
|
2008-02-18 18:40:22 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ret = -EINVAL;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
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 20:27:09 +08:00
|
|
|
static int davinci_i2s_startup(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_soc_dai *dai)
|
|
|
|
{
|
|
|
|
struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai);
|
|
|
|
|
|
|
|
snd_soc_dai_set_dma_data(dai, substream, dev->dma_params);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-05 10:29:59 +08:00
|
|
|
static void davinci_i2s_shutdown(struct snd_pcm_substream *substream,
|
|
|
|
struct snd_soc_dai *dai)
|
|
|
|
{
|
2010-03-18 04:15:21 +08:00
|
|
|
struct davinci_mcbsp_dev *dev = snd_soc_dai_get_drvdata(dai);
|
2009-07-05 10:29:59 +08:00
|
|
|
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
|
|
|
|
davinci_mcbsp_stop(dev, playback);
|
|
|
|
}
|
|
|
|
|
2009-06-05 18:28:23 +08:00
|
|
|
#define DAVINCI_I2S_RATES SNDRV_PCM_RATE_8000_96000
|
|
|
|
|
|
|
|
static struct snd_soc_dai_ops davinci_i2s_dai_ops = {
|
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 20:27:09 +08:00
|
|
|
.startup = davinci_i2s_startup,
|
2009-07-08 02:18:46 +08:00
|
|
|
.shutdown = davinci_i2s_shutdown,
|
|
|
|
.prepare = davinci_i2s_prepare,
|
2009-06-05 18:28:23 +08:00
|
|
|
.trigger = davinci_i2s_trigger,
|
|
|
|
.hw_params = davinci_i2s_hw_params,
|
|
|
|
.set_fmt = davinci_i2s_set_dai_fmt,
|
2010-07-06 16:39:02 +08:00
|
|
|
.set_clkdiv = davinci_i2s_dai_set_clkdiv,
|
2009-06-05 18:28:23 +08:00
|
|
|
|
|
|
|
};
|
|
|
|
|
2010-03-18 04:15:21 +08:00
|
|
|
static struct snd_soc_dai_driver davinci_i2s_dai = {
|
2009-06-05 18:28:23 +08:00
|
|
|
.playback = {
|
|
|
|
.channels_min = 2,
|
|
|
|
.channels_max = 2,
|
|
|
|
.rates = DAVINCI_I2S_RATES,
|
|
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,},
|
|
|
|
.capture = {
|
|
|
|
.channels_min = 2,
|
|
|
|
.channels_max = 2,
|
|
|
|
.rates = DAVINCI_I2S_RATES,
|
|
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,},
|
|
|
|
.ops = &davinci_i2s_dai_ops,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
static int davinci_i2s_probe(struct platform_device *pdev)
|
2008-02-18 18:40:22 +08:00
|
|
|
{
|
2009-06-05 18:28:23 +08:00
|
|
|
struct snd_platform_data *pdata = pdev->dev.platform_data;
|
2008-02-18 18:40:22 +08:00
|
|
|
struct davinci_mcbsp_dev *dev;
|
2009-06-05 18:28:23 +08:00
|
|
|
struct resource *mem, *ioarea, *res;
|
2010-07-19 15:01:16 +08:00
|
|
|
enum dma_event_q asp_chan_q = EVENTQ_0;
|
|
|
|
enum dma_event_q ram_chan_q = EVENTQ_1;
|
2008-02-18 18:40:22 +08:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
|
if (!mem) {
|
|
|
|
dev_err(&pdev->dev, "no mem resource?\n");
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
2011-02-09 21:09:52 +08:00
|
|
|
ioarea = request_mem_region(mem->start, resource_size(mem),
|
2008-02-18 18:40:22 +08:00
|
|
|
pdev->name);
|
|
|
|
if (!ioarea) {
|
|
|
|
dev_err(&pdev->dev, "McBSP region already claimed\n");
|
|
|
|
return -EBUSY;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev = kzalloc(sizeof(struct davinci_mcbsp_dev), GFP_KERNEL);
|
|
|
|
if (!dev) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto err_release_region;
|
|
|
|
}
|
2009-11-19 08:49:53 +08:00
|
|
|
if (pdata) {
|
2009-11-19 08:49:51 +08:00
|
|
|
dev->enable_channel_combine = pdata->enable_channel_combine;
|
2009-11-19 08:49:53 +08:00
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].sram_size =
|
|
|
|
pdata->sram_size_playback;
|
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].sram_size =
|
|
|
|
pdata->sram_size_capture;
|
2010-07-06 16:39:03 +08:00
|
|
|
dev->clk_input_pin = pdata->clk_input_pin;
|
2010-07-06 16:39:04 +08:00
|
|
|
dev->i2s_accurate_sck = pdata->i2s_accurate_sck;
|
2010-07-19 15:01:16 +08:00
|
|
|
asp_chan_q = pdata->asp_chan_q;
|
|
|
|
ram_chan_q = pdata->ram_chan_q;
|
2009-11-19 08:49:53 +08:00
|
|
|
}
|
2010-07-19 15:01:16 +08:00
|
|
|
|
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].asp_chan_q = asp_chan_q;
|
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].ram_chan_q = ram_chan_q;
|
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].asp_chan_q = asp_chan_q;
|
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].ram_chan_q = ram_chan_q;
|
|
|
|
|
2009-07-16 01:42:09 +08:00
|
|
|
dev->clk = clk_get(&pdev->dev, NULL);
|
2008-02-18 18:40:22 +08:00
|
|
|
if (IS_ERR(dev->clk)) {
|
|
|
|
ret = -ENODEV;
|
|
|
|
goto err_free_mem;
|
|
|
|
}
|
|
|
|
clk_enable(dev->clk);
|
|
|
|
|
2011-02-09 21:09:54 +08:00
|
|
|
dev->base = ioremap(mem->start, resource_size(mem));
|
|
|
|
if (!dev->base) {
|
|
|
|
dev_err(&pdev->dev, "ioremap failed\n");
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto err_release_clk;
|
|
|
|
}
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2009-09-12 05:29:03 +08:00
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].dma_addr =
|
2011-02-09 21:09:54 +08:00
|
|
|
(dma_addr_t)(mem->start + DAVINCI_MCBSP_DXR_REG);
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2009-09-12 05:29:03 +08:00
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].dma_addr =
|
2011-02-09 21:09:54 +08:00
|
|
|
(dma_addr_t)(mem->start + DAVINCI_MCBSP_DRR_REG);
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2009-06-05 18:28:23 +08:00
|
|
|
/* first TX, then RX */
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
|
|
|
|
if (!res) {
|
|
|
|
dev_err(&pdev->dev, "no DMA resource\n");
|
2009-06-08 18:49:41 +08:00
|
|
|
ret = -ENXIO;
|
2011-02-09 21:09:54 +08:00
|
|
|
goto err_iounmap;
|
2009-06-05 18:28:23 +08:00
|
|
|
}
|
2009-09-12 05:29:03 +08:00
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK].channel = res->start;
|
2009-06-05 18:28:23 +08:00
|
|
|
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
|
|
|
|
if (!res) {
|
|
|
|
dev_err(&pdev->dev, "no DMA resource\n");
|
2009-06-08 18:49:41 +08:00
|
|
|
ret = -ENXIO;
|
2011-02-09 21:09:54 +08:00
|
|
|
goto err_iounmap;
|
2009-06-05 18:28:23 +08:00
|
|
|
}
|
2009-09-12 05:29:03 +08:00
|
|
|
dev->dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res->start;
|
2010-07-06 16:39:03 +08:00
|
|
|
dev->dev = &pdev->dev;
|
2009-06-05 18:28:23 +08:00
|
|
|
|
2010-03-18 04:15:21 +08:00
|
|
|
dev_set_drvdata(&pdev->dev, dev);
|
|
|
|
|
|
|
|
ret = snd_soc_register_dai(&pdev->dev, &davinci_i2s_dai);
|
2009-06-05 18:28:23 +08:00
|
|
|
if (ret != 0)
|
2011-02-09 21:09:54 +08:00
|
|
|
goto err_iounmap;
|
2009-06-05 18:28:23 +08:00
|
|
|
|
2008-02-18 18:40:22 +08:00
|
|
|
return 0;
|
|
|
|
|
2011-02-09 21:09:54 +08:00
|
|
|
err_iounmap:
|
|
|
|
iounmap(dev->base);
|
2011-02-09 21:09:53 +08:00
|
|
|
err_release_clk:
|
|
|
|
clk_disable(dev->clk);
|
|
|
|
clk_put(dev->clk);
|
2008-02-18 18:40:22 +08:00
|
|
|
err_free_mem:
|
|
|
|
kfree(dev);
|
|
|
|
err_release_region:
|
2011-02-09 21:09:52 +08:00
|
|
|
release_mem_region(mem->start, resource_size(mem));
|
2008-02-18 18:40:22 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-06-05 18:28:23 +08:00
|
|
|
static int davinci_i2s_remove(struct platform_device *pdev)
|
2008-02-18 18:40:22 +08:00
|
|
|
{
|
2010-03-18 04:15:21 +08:00
|
|
|
struct davinci_mcbsp_dev *dev = dev_get_drvdata(&pdev->dev);
|
2008-02-18 18:40:22 +08:00
|
|
|
struct resource *mem;
|
|
|
|
|
2010-03-18 04:15:21 +08:00
|
|
|
snd_soc_unregister_dai(&pdev->dev);
|
2008-02-18 18:40:22 +08:00
|
|
|
clk_disable(dev->clk);
|
|
|
|
clk_put(dev->clk);
|
|
|
|
dev->clk = NULL;
|
|
|
|
kfree(dev);
|
|
|
|
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
2011-02-09 21:09:52 +08:00
|
|
|
release_mem_region(mem->start, resource_size(mem));
|
2008-02-18 18:40:22 +08:00
|
|
|
|
2009-06-05 18:28:23 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2009-03-03 09:41:00 +08:00
|
|
|
|
2009-06-05 18:28:23 +08:00
|
|
|
static struct platform_driver davinci_mcbsp_driver = {
|
|
|
|
.probe = davinci_i2s_probe,
|
|
|
|
.remove = davinci_i2s_remove,
|
|
|
|
.driver = {
|
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 20:27:09 +08:00
|
|
|
.name = "davinci-mcbsp",
|
2009-06-05 18:28:23 +08:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
},
|
2008-02-18 18:40:22 +08:00
|
|
|
};
|
|
|
|
|
2008-12-10 14:47:22 +08:00
|
|
|
static int __init davinci_i2s_init(void)
|
2008-12-04 03:26:35 +08:00
|
|
|
{
|
2009-06-05 18:28:23 +08:00
|
|
|
return platform_driver_register(&davinci_mcbsp_driver);
|
2008-12-04 03:26:35 +08:00
|
|
|
}
|
|
|
|
module_init(davinci_i2s_init);
|
|
|
|
|
|
|
|
static void __exit davinci_i2s_exit(void)
|
|
|
|
{
|
2009-06-05 18:28:23 +08:00
|
|
|
platform_driver_unregister(&davinci_mcbsp_driver);
|
2008-12-04 03:26:35 +08:00
|
|
|
}
|
|
|
|
module_exit(davinci_i2s_exit);
|
|
|
|
|
2008-02-18 18:40:22 +08:00
|
|
|
MODULE_AUTHOR("Vladimir Barinov");
|
|
|
|
MODULE_DESCRIPTION("TI DAVINCI I2S (McBSP) SoC Interface");
|
|
|
|
MODULE_LICENSE("GPL");
|