[ALSA] soc - ASoC 0.13 WM8750 codec driver
This patch updates the WM8750 codec driver to the new API in ASoC 0.13. Changes:- o Removed DAI capabilities matching code in favour of manual matching in the machine drivers. o Added DAI operations for codec and CPU interfaces. o Removed config_sysclk() function and struct snd_soc_clock_info. No longer needed as clocking is now configured manually in the machine drivers. Also removed other clocking data from structures. Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Родитель
b36d61d456
Коммит
4422b606bc
|
@ -30,7 +30,7 @@
|
|||
#include "wm8750.h"
|
||||
|
||||
#define AUDIO_NAME "WM8750"
|
||||
#define WM8750_VERSION "0.11"
|
||||
#define WM8750_VERSION "0.12"
|
||||
|
||||
/*
|
||||
* Debug
|
||||
|
@ -51,6 +51,11 @@
|
|||
#define warn(format, arg...) \
|
||||
printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg)
|
||||
|
||||
/* codec private data */
|
||||
struct wm8750_priv {
|
||||
unsigned int sysclk;
|
||||
};
|
||||
|
||||
/*
|
||||
* wm8750 register cache
|
||||
* We can't read the WM8750 register space when we
|
||||
|
@ -70,280 +75,6 @@ static const u16 wm8750_reg[] = {
|
|||
0x0079, 0x0079, 0x0079, /* 40 */
|
||||
};
|
||||
|
||||
#define WM8750_HIFI_DAIFMT \
|
||||
(SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_RIGHT_J | \
|
||||
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_IB_NF | \
|
||||
SND_SOC_DAIFMT_IB_IF)
|
||||
|
||||
#define WM8750_DIR \
|
||||
(SND_SOC_DAIDIR_PLAYBACK | SND_SOC_DAIDIR_CAPTURE)
|
||||
|
||||
#define WM8750_HIFI_FSB \
|
||||
(SND_SOC_FSBD(1) | SND_SOC_FSBD(2) | SND_SOC_FSBD(4) | \
|
||||
SND_SOC_FSBD(8) | SND_SOC_FSBD(16))
|
||||
|
||||
#define WM8750_HIFI_RATES \
|
||||
(SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \
|
||||
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
|
||||
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
|
||||
|
||||
#define WM8750_HIFI_BITS \
|
||||
(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
|
||||
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
|
||||
|
||||
static struct snd_soc_dai_mode wm8750_modes[] = {
|
||||
/* common codec frame and clock master modes */
|
||||
/* 8k */
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_8000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 1536,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_8000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 1408,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_8000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 2304,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_8000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 2112,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_8000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 1500,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
|
||||
/* 11.025k */
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_11025,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 1024,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_11025,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 1536,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_11025,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 1088,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
|
||||
/* 16k */
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_16000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 768,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_16000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 1152,
|
||||
.bfs = WM8750_HIFI_FSB
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_16000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 750,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
|
||||
/* 22.05k */
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_22050,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 512,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_22050,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 768,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_22050,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 544,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
|
||||
/* 32k */
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_32000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 384,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_32000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 576,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_32000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 375,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
|
||||
/* 44.1k & 48k */
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 256,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 384,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_44100,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 272,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_48000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 250,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
|
||||
/* 88.2k & 96k */
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 128,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 192,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_88200,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 136,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = SNDRV_PCM_RATE_96000,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = 125,
|
||||
.bfs = WM8750_HIFI_FSB,
|
||||
},
|
||||
|
||||
/* codec frame and clock slave modes */
|
||||
{
|
||||
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
|
||||
.pcmfmt = WM8750_HIFI_BITS,
|
||||
.pcmrate = WM8750_HIFI_RATES,
|
||||
.pcmdir = WM8750_DIR,
|
||||
.flags = SND_SOC_DAI_BFS_DIV,
|
||||
.fs = SND_SOC_FS_ALL,
|
||||
.bfs = SND_SOC_FSB_ALL,
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
* read wm8750 register cache
|
||||
*/
|
||||
|
@ -834,40 +565,43 @@ static inline int get_coeff(int mclk, int rate)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* WM8750 supports numerous input clocks per sample rate */
|
||||
static unsigned int wm8750_config_sysclk(struct snd_soc_codec_dai *dai,
|
||||
struct snd_soc_clock_info *info, unsigned int clk)
|
||||
static int wm8750_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
|
||||
int clk_id, unsigned int freq, int dir)
|
||||
{
|
||||
dai->mclk = clk;
|
||||
return dai->mclk;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct wm8750_priv *wm8750 = codec->private_data;
|
||||
|
||||
switch (freq) {
|
||||
case 11289600:
|
||||
case 12000000:
|
||||
case 12288000:
|
||||
case 16934400:
|
||||
case 18432000:
|
||||
wm8750->sysclk = freq;
|
||||
return 0;
|
||||
}
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int wm8750_pcm_prepare(struct snd_pcm_substream *substream)
|
||||
static int wm8750_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
|
||||
unsigned int fmt)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_device *socdev = rtd->socdev;
|
||||
struct snd_soc_codec *codec = socdev->codec;
|
||||
u16 iface = 0, bfs, srate = 0;
|
||||
int i = get_coeff(rtd->codec_dai->mclk,
|
||||
snd_soc_get_rate(rtd->codec_dai->dai_runtime.pcmrate));
|
||||
|
||||
/* is coefficient valid ? */
|
||||
if (i < 0)
|
||||
return i;
|
||||
|
||||
bfs = SND_SOC_FSBD_REAL(rtd->codec_dai->dai_runtime.bfs);
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
u16 iface = 0;
|
||||
|
||||
/* set master/slave audio interface */
|
||||
switch (rtd->codec_dai->dai_runtime.fmt & SND_SOC_DAIFMT_CLOCK_MASK) {
|
||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
case SND_SOC_DAIFMT_CBM_CFM:
|
||||
iface = 0x0040;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFS:
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* interface format */
|
||||
switch (rtd->codec_dai->dai_runtime.fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
|
||||
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
|
||||
case SND_SOC_DAIFMT_I2S:
|
||||
iface |= 0x0002;
|
||||
break;
|
||||
|
@ -882,25 +616,12 @@ static int wm8750_pcm_prepare(struct snd_pcm_substream *substream)
|
|||
case SND_SOC_DAIFMT_DSP_B:
|
||||
iface |= 0x0013;
|
||||
break;
|
||||
}
|
||||
|
||||
/* bit size */
|
||||
switch (rtd->codec_dai->dai_runtime.pcmfmt) {
|
||||
case SNDRV_PCM_FMTBIT_S16_LE:
|
||||
break;
|
||||
case SNDRV_PCM_FMTBIT_S20_3LE:
|
||||
iface |= 0x0004;
|
||||
break;
|
||||
case SNDRV_PCM_FMTBIT_S24_LE:
|
||||
iface |= 0x0008;
|
||||
break;
|
||||
case SNDRV_PCM_FMTBIT_S32_LE:
|
||||
iface |= 0x000c;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* clock inversion */
|
||||
switch (rtd->codec_dai->dai_runtime.fmt & SND_SOC_DAIFMT_INV_MASK) {
|
||||
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
|
||||
case SND_SOC_DAIFMT_NB_NF:
|
||||
break;
|
||||
case SND_SOC_DAIFMT_IB_IF:
|
||||
|
@ -912,35 +633,54 @@ static int wm8750_pcm_prepare(struct snd_pcm_substream *substream)
|
|||
case SND_SOC_DAIFMT_NB_IF:
|
||||
iface |= 0x0010;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* set bclk divisor rate */
|
||||
switch (bfs) {
|
||||
case 1:
|
||||
wm8750_write(codec, WM8750_IFACE, iface);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wm8750_pcm_hw_params(struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_hw_params *params)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_device *socdev = rtd->socdev;
|
||||
struct snd_soc_codec *codec = socdev->codec;
|
||||
struct wm8750_priv *wm8750 = codec->private_data;
|
||||
u16 iface = wm8750_read_reg_cache(codec, WM8750_IFACE) & 0x1f3;
|
||||
u16 srate = wm8750_read_reg_cache(codec, WM8750_SRATE) & 0x1c0;
|
||||
int coeff = get_coeff(wm8750->sysclk, params_rate(params));
|
||||
|
||||
/* bit size */
|
||||
switch (params_format(params)) {
|
||||
case SNDRV_PCM_FORMAT_S16_LE:
|
||||
break;
|
||||
case 4:
|
||||
srate |= (0x1 << 7);
|
||||
case SNDRV_PCM_FORMAT_S20_3LE:
|
||||
iface |= 0x0004;
|
||||
break;
|
||||
case 8:
|
||||
srate |= (0x2 << 7);
|
||||
case SNDRV_PCM_FORMAT_S24_LE:
|
||||
iface |= 0x0008;
|
||||
break;
|
||||
case 16:
|
||||
srate |= (0x3 << 7);
|
||||
case SNDRV_PCM_FORMAT_S32_LE:
|
||||
iface |= 0x000c;
|
||||
break;
|
||||
}
|
||||
|
||||
/* set iface & srate */
|
||||
wm8750_write(codec, WM8750_IFACE, iface);
|
||||
wm8750_write(codec, WM8750_SRATE, srate |
|
||||
(coeff_div[i].sr << 1) | coeff_div[i].usb);
|
||||
if (coeff >= 0)
|
||||
wm8750_write(codec, WM8750_SRATE, srate |
|
||||
(coeff_div[coeff].sr << 1) | coeff_div[coeff].usb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wm8750_mute(struct snd_soc_codec *codec,
|
||||
struct snd_soc_codec_dai *dai, int mute)
|
||||
static int wm8750_mute(struct snd_soc_codec_dai *dai, int mute)
|
||||
{
|
||||
struct snd_soc_codec *codec = dai->codec;
|
||||
u16 mute_reg = wm8750_read_reg_cache(codec, WM8750_ADCDAC) & 0xfff7;
|
||||
|
||||
if (mute)
|
||||
wm8750_write(codec, WM8750_ADCDAC, mute_reg | 0x8);
|
||||
else
|
||||
|
@ -974,26 +714,34 @@ static int wm8750_dapm_event(struct snd_soc_codec *codec, int event)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#define WM8750_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
|
||||
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
|
||||
SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
|
||||
|
||||
#define WM8750_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
|
||||
SNDRV_PCM_FMTBIT_S24_LE)
|
||||
|
||||
struct snd_soc_codec_dai wm8750_dai = {
|
||||
.name = "WM8750",
|
||||
.playback = {
|
||||
.stream_name = "Playback",
|
||||
.channels_min = 1,
|
||||
.channels_max = 2,
|
||||
},
|
||||
.rates = WM8750_RATES,
|
||||
.formats = WM8750_FORMATS,},
|
||||
.capture = {
|
||||
.stream_name = "Capture",
|
||||
.channels_min = 1,
|
||||
.channels_max = 2,
|
||||
},
|
||||
.config_sysclk = wm8750_config_sysclk,
|
||||
.digital_mute = wm8750_mute,
|
||||
.rates = WM8750_RATES,
|
||||
.formats = WM8750_FORMATS,},
|
||||
.ops = {
|
||||
.prepare = wm8750_pcm_prepare,
|
||||
.hw_params = wm8750_pcm_hw_params,
|
||||
},
|
||||
.caps = {
|
||||
.num_modes = ARRAY_SIZE(wm8750_modes),
|
||||
.mode = wm8750_modes,
|
||||
.dai_ops = {
|
||||
.digital_mute = wm8750_mute,
|
||||
.set_fmt = wm8750_set_dai_fmt,
|
||||
.set_sysclk = wm8750_set_dai_sysclk,
|
||||
},
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(wm8750_dai);
|
||||
|
@ -1037,8 +785,7 @@ static int wm8750_resume(struct platform_device *pdev)
|
|||
if (codec->suspend_dapm_state == SNDRV_CTL_POWER_D0) {
|
||||
wm8750_dapm_event(codec, SNDRV_CTL_POWER_D2);
|
||||
codec->dapm_state = SNDRV_CTL_POWER_D0;
|
||||
schedule_delayed_work(&codec->delayed_work,
|
||||
msecs_to_jiffies(1000));
|
||||
schedule_delayed_work(&codec->delayed_work, msecs_to_jiffies(1000));
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -1218,6 +965,7 @@ static int wm8750_probe(struct platform_device *pdev)
|
|||
struct snd_soc_device *socdev = platform_get_drvdata(pdev);
|
||||
struct wm8750_setup_data *setup = socdev->codec_data;
|
||||
struct snd_soc_codec *codec;
|
||||
struct wm8750_priv *wm8750;
|
||||
int ret = 0;
|
||||
|
||||
info("WM8750 Audio Codec %s", WM8750_VERSION);
|
||||
|
@ -1225,12 +973,20 @@ static int wm8750_probe(struct platform_device *pdev)
|
|||
if (codec == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
wm8750 = kzalloc(sizeof(struct wm8750_priv), GFP_KERNEL);
|
||||
if (wm8750 == NULL) {
|
||||
kfree(codec);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
codec->private_data = wm8750;
|
||||
socdev->codec = codec;
|
||||
mutex_init(&codec->mutex);
|
||||
INIT_LIST_HEAD(&codec->dapm_widgets);
|
||||
INIT_LIST_HEAD(&codec->dapm_paths);
|
||||
wm8750_socdev = socdev;
|
||||
INIT_DELAYED_WORK(&codec->delayed_work, wm8750_work);
|
||||
|
||||
#if defined (CONFIG_I2C) || defined (CONFIG_I2C_MODULE)
|
||||
if (setup->i2c_address) {
|
||||
normal_i2c[0] = setup->i2c_address;
|
||||
|
@ -1246,6 +1002,25 @@ static int wm8750_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* This function forces any delayed work to be queued and run.
|
||||
*/
|
||||
static int run_delayed_work(struct delayed_work *dwork)
|
||||
{
|
||||
int ret;
|
||||
|
||||
/* cancel any work waiting to be queued. */
|
||||
ret = cancel_delayed_work(dwork);
|
||||
|
||||
/* if there was any work waiting then we run it now and
|
||||
* wait for it's completion */
|
||||
if (ret) {
|
||||
schedule_delayed_work(dwork, 0);
|
||||
flush_scheduled_work();
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* power down chip */
|
||||
static int wm8750_remove(struct platform_device *pdev)
|
||||
{
|
||||
|
@ -1254,12 +1029,13 @@ static int wm8750_remove(struct platform_device *pdev)
|
|||
|
||||
if (codec->control_data)
|
||||
wm8750_dapm_event(codec, SNDRV_CTL_POWER_D3cold);
|
||||
flush_scheduled_work();
|
||||
run_delayed_work(&codec->delayed_work);
|
||||
snd_soc_free_pcms(socdev);
|
||||
snd_soc_dapm_free(socdev);
|
||||
#if defined (CONFIG_I2C) || defined (CONFIG_I2C_MODULE)
|
||||
i2c_del_driver(&wm8750_i2c_driver);
|
||||
#endif
|
||||
kfree(codec->private_data);
|
||||
kfree(codec);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -55,9 +55,10 @@
|
|||
|
||||
#define WM8750_CACHE_REGNUM 0x2a
|
||||
|
||||
#define WM8750_SYSCLK 0
|
||||
|
||||
struct wm8750_setup_data {
|
||||
unsigned short i2c_address;
|
||||
unsigned int mclk;
|
||||
};
|
||||
|
||||
extern struct snd_soc_codec_dai wm8750_dai;
|
||||
|
|
Загрузка…
Ссылка в новой задаче