summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8731.c33
-rw-r--r--sound/soc/codecs/wm8750.c15
-rw-r--r--sound/soc/pxa/pxa2xx-i2s.c3
-rw-r--r--sound/soc/soc-core.c215
4 files changed, 196 insertions, 70 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 9adbd2d401c..412291241ec 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -90,32 +90,36 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 1536,
- .bfs = SND_SOC_FSB(64),
+ .bfs = 64,
},
{
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 2304,
- .bfs = SND_SOC_FSB(64),
+ .bfs = 64,
},
{
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 1408,
- .bfs = SND_SOC_FSB(64),
+ .bfs = 64,
},
{
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 2112,
- .bfs = SND_SOC_FSB(64),
+ .bfs = 64,
},
/* 32k */
@@ -124,16 +128,18 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_32000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 384,
- .bfs = SND_SOC_FSB(64),
+ .bfs = 64,
},
{
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_32000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 576,
- .bfs = SND_SOC_FSB(64),
+ .bfs = 64,
},
/* 44.1k & 48k */
@@ -142,16 +148,18 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 256,
- .bfs = SND_SOC_FSB(64),
+ .bfs = 64,
},
{
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 384,
- .bfs = SND_SOC_FSB(64),
+ .bfs = 64,
},
/* 88.2 & 96k */
@@ -160,17 +168,18 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 128,
- .bfs = SND_SOC_FSB(64),
-
+ .bfs = 64,
},
{
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
.pcmdir = WM8731_DIR,
+ .flags = SND_SOC_DAI_BFS_RATE,
.fs = 192,
- .bfs = SND_SOC_FSB(64),
+ .bfs = 64,
},
/* USB codec frame and clock master modes */
@@ -237,7 +246,7 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
.pcmdir = WM8731_DIR,
.flags = SND_SOC_DAI_BFS_DIV,
.fs = SND_SOC_FS_ALL,
- .bfs = SND_SOC_FSBD_ALL,
+ .bfs = SND_SOC_FSB_ALL,
},
};
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 243da712d9c..c5d13a9454d 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -343,7 +343,7 @@ static struct snd_soc_dai_mode wm8750_modes[] = {
.pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV,
.fs = SND_SOC_FS_ALL,
- .bfs = SND_SOC_FSBD_ALL,
+ .bfs = SND_SOC_FSB_ALL,
},
};
@@ -829,6 +829,9 @@ static inline int get_coeff(int mclk, int rate)
if (coeff_div[i].rate == rate && coeff_div[i].mclk == mclk)
return i;
}
+
+ printk(KERN_ERR "wm8750: could not get coeff for mclk %d @ rate %d\n",
+ mclk, rate);
return -EINVAL;
}
@@ -836,13 +839,7 @@ static inline int get_coeff(int mclk, int rate)
static unsigned int wm8750_config_sysclk(struct snd_soc_codec_dai *dai,
struct snd_soc_clock_info *info, unsigned int clk)
{
- dai->mclk = 0;
-
- /* check that the calculated FS and rate actually match a clock from
- * the machine driver */
- if (info->fs * info->rate == clk)
- dai->mclk = clk;
-
+ dai->mclk = clk;
return dai->mclk;
}
@@ -859,7 +856,7 @@ static int wm8750_pcm_prepare(struct snd_pcm_substream *substream)
if (i < 0)
return i;
- bfs = SND_SOC_FSB_REAL(rtd->codec_dai->dai_runtime.bfs);
+ bfs = SND_SOC_FSBD_REAL(rtd->codec_dai->dai_runtime.bfs);
/* set master/slave audio interface */
switch (rtd->codec_dai->dai_runtime.fmt & SND_SOC_DAIFMT_CLOCK_MASK) {
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 99f1da32744..98b167fe68e 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -126,7 +126,8 @@ static struct snd_soc_dai_mode pxa2xx_i2s_modes[] = {
.pcmrate = PXA_I2S_RATES,
.pcmdir = PXA_I2S_DIR,
.fs = SND_SOC_FS_ALL,
- .bfs = SND_SOC_FSB(64),
+ .flags = SND_SOC_DAI_BFS_RATE,
+ .bfs = 64,
.priv = 0x48,
},
};
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2ce0c8251dc..6da1616bf77 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -51,6 +51,8 @@
#define dbgc(format, arg...)
#endif
+#define CODEC_CPU(codec, cpu) ((codec << 4) | cpu)
+
static DEFINE_MUTEX(pcm_mutex);
static DEFINE_MUTEX(io_mutex);
static struct workqueue_struct *soc_workq;
@@ -150,11 +152,11 @@ static unsigned inline int soc_get_mclk(struct snd_soc_pcm_runtime *rtd,
}
/* changes a bitclk multiplier mask to a divider mask */
-static u16 soc_bfs_mult_to_div(u16 bfs, int rate, unsigned int mclk,
+static u64 soc_bfs_rcw_to_div(u64 bfs, int rate, unsigned int mclk,
unsigned int pcmfmt, unsigned int chn)
{
int i, j;
- u16 bfs_ = 0;
+ u64 bfs_ = 0;
int size = snd_pcm_format_physical_width(pcmfmt), min = 0;
if (size <= 0)
@@ -162,17 +164,14 @@ static u16 soc_bfs_mult_to_div(u16 bfs, int rate, unsigned int mclk,
/* the minimum bit clock that has enough bandwidth */
min = size * rate * chn;
- dbgc("mult --> div min bclk %d with mclk %d\n", min, mclk);
+ dbgc("rcw --> div min bclk %d with mclk %d\n", min, mclk);
- for (i = 0; i < 16; i++) {
+ for (i = 0; i < 64; i++) {
if ((bfs >> i) & 0x1) {
- j = rate * SND_SOC_FSB_REAL(1<<i);
-
- if (j >= min) {
- bfs_ |= SND_SOC_FSBD(mclk/j);
- dbgc("mult --> div support mult %d\n",
- SND_SOC_FSB_REAL(1<<i));
- }
+ j = min * (i + 1);
+ bfs_ |= SND_SOC_FSBD(mclk/j);
+ dbgc("rcw --> div support mult %d\n",
+ SND_SOC_FSBD_REAL(1<<i));
}
}
@@ -180,11 +179,11 @@ static u16 soc_bfs_mult_to_div(u16 bfs, int rate, unsigned int mclk,
}
/* changes a bitclk divider mask to a multiplier mask */
-static u16 soc_bfs_div_to_mult(u16 bfs, int rate, unsigned int mclk,
+static u64 soc_bfs_div_to_rcw(u64 bfs, int rate, unsigned int mclk,
unsigned int pcmfmt, unsigned int chn)
{
int i, j;
- u16 bfs_ = 0;
+ u64 bfs_ = 0;
int size = snd_pcm_format_physical_width(pcmfmt), min = 0;
@@ -193,15 +192,15 @@ static u16 soc_bfs_div_to_mult(u16 bfs, int rate, unsigned int mclk,
/* the minimum bit clock that has enough bandwidth */
min = size * rate * chn;
- dbgc("div to mult min bclk %d with mclk %d\n", min, mclk);
+ dbgc("div to rcw min bclk %d with mclk %d\n", min, mclk);
- for (i = 0; i < 16; i++) {
+ for (i = 0; i < 64; i++) {
if ((bfs >> i) & 0x1) {
- j = mclk / (SND_SOC_FSBD_REAL(1<<i));
+ j = mclk / (i + 1);
if (j >= min) {
- bfs_ |= SND_SOC_FSB(j/rate);
- dbgc("div --> mult support div %d\n",
- SND_SOC_FSBD_REAL(1<<i));
+ bfs_ |= SND_SOC_FSBW(j/min);
+ dbgc("div --> rcw support div %d\n",
+ SND_SOC_FSBW_REAL(1<<i));
}
}
}
@@ -209,6 +208,52 @@ static u16 soc_bfs_div_to_mult(u16 bfs, int rate, unsigned int mclk,
return bfs_;
}
+/* changes a constant bitclk to a multiplier mask */
+static u64 soc_bfs_rate_to_rcw(u64 bfs, int rate, unsigned int mclk,
+ unsigned int pcmfmt, unsigned int chn)
+{
+ unsigned int bfs_ = rate * bfs;
+ int size = snd_pcm_format_physical_width(pcmfmt), min = 0;
+
+ if (size <= 0)
+ return 0;
+
+ /* the minimum bit clock that has enough bandwidth */
+ min = size * rate * chn;
+ dbgc("rate --> rcw min bclk %d with mclk %d\n", min, mclk);
+
+ if (bfs_ < min)
+ return 0;
+ else {
+ bfs_ = SND_SOC_FSBW(bfs_/min);
+ dbgc("rate --> rcw support div %d\n", SND_SOC_FSBW_REAL(bfs_));
+ return bfs_;
+ }
+}
+
+/* changes a bitclk multiplier mask to a divider mask */
+static u64 soc_bfs_rate_to_div(u64 bfs, int rate, unsigned int mclk,
+ unsigned int pcmfmt, unsigned int chn)
+{
+ unsigned int bfs_ = rate * bfs;
+ int size = snd_pcm_format_physical_width(pcmfmt), min = 0;
+
+ if (size <= 0)
+ return 0;
+
+ /* the minimum bit clock that has enough bandwidth */
+ min = size * rate * chn;
+ dbgc("rate --> div min bclk %d with mclk %d\n", min, mclk);
+
+ if (bfs_ < min)
+ return 0;
+ else {
+ bfs_ = SND_SOC_FSBW(mclk/bfs_);
+ dbgc("rate --> div support div %d\n", SND_SOC_FSBD_REAL(bfs_));
+ return bfs_;
+ }
+}
+
/* Matches codec DAI and SoC CPU DAI hardware parameters */
static int soc_hw_match_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
@@ -217,9 +262,10 @@ static int soc_hw_match_params(struct snd_pcm_substream *substream,
struct snd_soc_dai_mode *codec_dai_mode = NULL;
struct snd_soc_dai_mode *cpu_dai_mode = NULL;
struct snd_soc_clock_info clk_info;
- unsigned int fs, mclk, codec_bfs, cpu_bfs, rate = params_rate(params),
+ unsigned int fs, mclk, rate = params_rate(params),
chn, j, k, cpu_bclk, codec_bclk, pcmrate;
u16 fmt = 0;
+ u64 codec_bfs, cpu_bfs;
dbg("asoc: match version %s\n", SND_SOC_VERSION);
clk_info.rate = rate;
@@ -309,44 +355,98 @@ static int soc_hw_match_params(struct snd_pcm_substream *substream,
* used in the codec and cpu DAI modes. We always choose the
* lowest possible clocks to reduce power.
*/
- if (codec_dai_mode->flags & cpu_dai_mode->flags &
- SND_SOC_DAI_BFS_DIV) {
+ switch (CODEC_CPU(codec_dai_mode->flags, cpu_dai_mode->flags)) {
+ case CODEC_CPU(SND_SOC_DAI_BFS_DIV, SND_SOC_DAI_BFS_DIV):
/* cpu & codec bfs dividers */
rtd->cpu_dai->dai_runtime.bfs =
rtd->codec_dai->dai_runtime.bfs =
1 << (fls(codec_dai_mode->bfs & cpu_dai_mode->bfs) - 1);
- } else if (codec_dai_mode->flags & SND_SOC_DAI_BFS_DIV) {
- /* normalise bfs codec divider & cpu mult */
- codec_bfs = soc_bfs_div_to_mult(codec_dai_mode->bfs, rate,
+ break;
+ case CODEC_CPU(SND_SOC_DAI_BFS_DIV, SND_SOC_DAI_BFS_RCW):
+ /* normalise bfs codec divider & cpu rcw mult */
+ codec_bfs = soc_bfs_div_to_rcw(codec_dai_mode->bfs, rate,
mclk, rtd->codec_dai->dai_runtime.pcmfmt, chn);
rtd->cpu_dai->dai_runtime.bfs =
1 << (ffs(codec_bfs & cpu_dai_mode->bfs) - 1);
- cpu_bfs = soc_bfs_mult_to_div(cpu_dai_mode->bfs, rate, mclk,
+ cpu_bfs = soc_bfs_rcw_to_div(cpu_dai_mode->bfs, rate, mclk,
rtd->codec_dai->dai_runtime.pcmfmt, chn);
rtd->codec_dai->dai_runtime.bfs =
1 << (fls(codec_dai_mode->bfs & cpu_bfs) - 1);
- } else if (cpu_dai_mode->flags & SND_SOC_DAI_BFS_DIV) {
- /* normalise bfs codec mult & cpu divider */
- codec_bfs = soc_bfs_mult_to_div(codec_dai_mode->bfs, rate,
+ break;
+ case CODEC_CPU(SND_SOC_DAI_BFS_RCW, SND_SOC_DAI_BFS_DIV):
+ /* normalise bfs codec rcw mult & cpu divider */
+ codec_bfs = soc_bfs_rcw_to_div(codec_dai_mode->bfs, rate,
mclk, rtd->codec_dai->dai_runtime.pcmfmt, chn);
rtd->cpu_dai->dai_runtime.bfs =
1 << (fls(codec_bfs & cpu_dai_mode->bfs) -1);
- cpu_bfs = soc_bfs_div_to_mult(cpu_dai_mode->bfs, rate, mclk,
+ cpu_bfs = soc_bfs_div_to_rcw(cpu_dai_mode->bfs, rate, mclk,
rtd->codec_dai->dai_runtime.pcmfmt, chn);
rtd->codec_dai->dai_runtime.bfs =
1 << (ffs(codec_dai_mode->bfs & cpu_bfs) -1);
- } else {
- /* codec & cpu bfs rate multipliers */
+ break;
+ case CODEC_CPU(SND_SOC_DAI_BFS_RCW, SND_SOC_DAI_BFS_RCW):
+ /* codec & cpu bfs rate rcw multipliers */
rtd->cpu_dai->dai_runtime.bfs =
rtd->codec_dai->dai_runtime.bfs =
1 << (ffs(codec_dai_mode->bfs & cpu_dai_mode->bfs) -1);
+ break;
+ case CODEC_CPU(SND_SOC_DAI_BFS_DIV, SND_SOC_DAI_BFS_RATE):
+ /* normalise cpu bfs rate const multiplier & codec div */
+ cpu_bfs = soc_bfs_rate_to_div(cpu_dai_mode->bfs, rate,
+ mclk, rtd->codec_dai->dai_runtime.pcmfmt, chn);
+ if(codec_dai_mode->bfs & cpu_bfs) {
+ rtd->codec_dai->dai_runtime.bfs = cpu_bfs;
+ rtd->cpu_dai->dai_runtime.bfs = cpu_dai_mode->bfs;
+ } else
+ rtd->cpu_dai->dai_runtime.bfs = 0;
+ break;
+ case CODEC_CPU(SND_SOC_DAI_BFS_RCW, SND_SOC_DAI_BFS_RATE):
+ /* normalise cpu bfs rate const multiplier & codec rcw mult */
+ cpu_bfs = soc_bfs_rate_to_rcw(cpu_dai_mode->bfs, rate,
+ mclk, rtd->codec_dai->dai_runtime.pcmfmt, chn);
+ if(codec_dai_mode->bfs & cpu_bfs) {
+ rtd->codec_dai->dai_runtime.bfs = cpu_bfs;
+ rtd->cpu_dai->dai_runtime.bfs = cpu_dai_mode->bfs;
+ } else
+ rtd->cpu_dai->dai_runtime.bfs = 0;
+ break;
+ case CODEC_CPU(SND_SOC_DAI_BFS_RATE, SND_SOC_DAI_BFS_RCW):
+ /* normalise cpu bfs rate rcw multiplier & codec const mult */
+ codec_bfs = soc_bfs_rate_to_rcw(codec_dai_mode->bfs, rate,
+ mclk, rtd->codec_dai->dai_runtime.pcmfmt, chn);
+ if(cpu_dai_mode->bfs & codec_bfs) {
+ rtd->cpu_dai->dai_runtime.bfs = codec_bfs;
+ rtd->codec_dai->dai_runtime.bfs = codec_dai_mode->bfs;
+ } else
+ rtd->cpu_dai->dai_runtime.bfs = 0;
+ break;
+ case CODEC_CPU(SND_SOC_DAI_BFS_RATE, SND_SOC_DAI_BFS_DIV):
+ /* normalise cpu bfs div & codec const mult */
+ codec_bfs = soc_bfs_rate_to_div(codec_dai_mode->bfs, rate,
+ mclk, rtd->codec_dai->dai_runtime.pcmfmt, chn);
+ if(codec_dai_mode->bfs & codec_bfs) {
+ rtd->cpu_dai->dai_runtime.bfs = codec_bfs;
+ rtd->codec_dai->dai_runtime.bfs = codec_dai_mode->bfs;
+ } else
+ rtd->cpu_dai->dai_runtime.bfs = 0;
+ break;
+ case CODEC_CPU(SND_SOC_DAI_BFS_RATE, SND_SOC_DAI_BFS_RATE):
+ /* cpu & codec constant mult */
+ if(codec_dai_mode->bfs == cpu_dai_mode->bfs)
+ rtd->cpu_dai->dai_runtime.bfs =
+ rtd->codec_dai->dai_runtime.bfs =
+ codec_dai_mode->bfs;
+ else
+ rtd->cpu_dai->dai_runtime.bfs =
+ rtd->codec_dai->dai_runtime.bfs = 0;
+ break;
}
/* make sure the bit clock speed is acceptable */
if (!rtd->cpu_dai->dai_runtime.bfs ||
!rtd->codec_dai->dai_runtime.bfs) {
dbgc("asoc: DAI[%d:%d] failed to match BFS\n", j, k);
- dbgc("asoc: cpu_dai %x codec %x\n",
+ dbgc("asoc: cpu_dai %llu codec %llu\n",
rtd->cpu_dai->dai_runtime.bfs,
rtd->codec_dai->dai_runtime.bfs);
dbgc("asoc: mclk %d hwfmt %x\n", mclk, fmt);
@@ -378,26 +478,41 @@ found:
dbg("asoc: codec fs %d mclk %d bfs div %d bclk %d\n",
rtd->codec_dai->dai_runtime.fs, mclk,
SND_SOC_FSBD_REAL(rtd->codec_dai->dai_runtime.bfs), codec_bclk);
- } else {
- codec_bclk = params_rate(params) *
- SND_SOC_FSB_REAL(rtd->codec_dai->dai_runtime.bfs);
- dbg("asoc: codec fs %d mclk %d bfs mult %d bclk %d\n",
+ } else if(rtd->codec_dai->dai_runtime.flags == SND_SOC_DAI_BFS_RATE) {
+ codec_bclk = params_rate(params) * rtd->codec_dai->dai_runtime.bfs;
+ dbg("asoc: codec fs %d mclk %d bfs rate mult %llu bclk %d\n",
rtd->codec_dai->dai_runtime.fs, mclk,
- SND_SOC_FSB_REAL(rtd->codec_dai->dai_runtime.bfs), codec_bclk);
- }
+ rtd->codec_dai->dai_runtime.bfs, codec_bclk);
+ } else if (rtd->cpu_dai->dai_runtime.flags == SND_SOC_DAI_BFS_RCW) {
+ codec_bclk = params_rate(params) * params_channels(params) *
+ snd_pcm_format_physical_width(rtd->codec_dai->dai_runtime.pcmfmt) *
+ SND_SOC_FSBW_REAL(rtd->codec_dai->dai_runtime.bfs);
+ dbg("asoc: codec fs %d mclk %d bfs rcw mult %d bclk %d\n",
+ rtd->codec_dai->dai_runtime.fs, mclk,
+ SND_SOC_FSBW_REAL(rtd->codec_dai->dai_runtime.bfs), codec_bclk);
+ } else
+ codec_bclk = 0;
+
if (rtd->cpu_dai->dai_runtime.flags == SND_SOC_DAI_BFS_DIV) {
cpu_bclk = (rtd->cpu_dai->dai_runtime.fs * params_rate(params)) /
SND_SOC_FSBD_REAL(rtd->cpu_dai->dai_runtime.bfs);
dbg("asoc: cpu fs %d mclk %d bfs div %d bclk %d\n",
rtd->cpu_dai->dai_runtime.fs, mclk,
SND_SOC_FSBD_REAL(rtd->cpu_dai->dai_runtime.bfs), cpu_bclk);
- } else {
- cpu_bclk = params_rate(params) *
- SND_SOC_FSB_REAL(rtd->cpu_dai->dai_runtime.bfs);
- dbg("asoc: cpu fs %d mclk %d bfs mult %d bclk %d\n",
+ } else if (rtd->cpu_dai->dai_runtime.flags == SND_SOC_DAI_BFS_RATE) {
+ cpu_bclk = params_rate(params) * rtd->cpu_dai->dai_runtime.bfs;
+ dbg("asoc: cpu fs %d mclk %d bfs rate mult %llu bclk %d\n",
rtd->cpu_dai->dai_runtime.fs, mclk,
- SND_SOC_FSB_REAL(rtd->cpu_dai->dai_runtime.bfs), cpu_bclk);
- }
+ rtd->cpu_dai->dai_runtime.bfs, cpu_bclk);
+ } else if (rtd->cpu_dai->dai_runtime.flags == SND_SOC_DAI_BFS_RCW) {
+ cpu_bclk = params_rate(params) * params_channels(params) *
+ snd_pcm_format_physical_width(rtd->cpu_dai->dai_runtime.pcmfmt) *
+ SND_SOC_FSBW_REAL(rtd->cpu_dai->dai_runtime.bfs);
+ dbg("asoc: cpu fs %d mclk %d bfs mult rcw %d bclk %d\n",
+ rtd->cpu_dai->dai_runtime.fs, mclk,
+ SND_SOC_FSBW_REAL(rtd->cpu_dai->dai_runtime.bfs), cpu_bclk);
+ } else
+ cpu_bclk = 0;
/*
* Check we have matching bitclocks. If we don't then it means the
@@ -405,7 +520,7 @@ found:
* machine sysclock function) is wrong compared with the supported DAI
* modes for the codec or cpu DAI.
*/
- if (cpu_bclk != codec_bclk){
+ if (cpu_bclk != codec_bclk && cpu_bclk){
printk(KERN_ERR
"asoc: codec and cpu bitclocks differ, audio may be wrong speed\n"
);
@@ -723,14 +838,18 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
mutex_lock(&pcm_mutex);
if (platform->pcm_ops->prepare) {
ret = platform->pcm_ops->prepare(substream);
- if (ret < 0)
+ if (ret < 0) {
+ printk(KERN_ERR "asoc: platform prepare error\n");
goto out;
+ }
}
if (rtd->codec_dai->ops.prepare) {
ret = rtd->codec_dai->ops.prepare(substream);
- if (ret < 0)
+ if (ret < 0) {
+ printk(KERN_ERR "asoc: codec DAI prepare error\n");
goto out;
+ }
}
if (rtd->cpu_dai->ops.prepare)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-23 05:22:31 +0000