redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[ALSA] Remove trailing whitespaces from soc/* files 

Remove trailing whitespaces from soc/* files added by the
conversion to C99-style initialization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
hifive-unleashed-5.1
Takashi Iwai 2006-10-13 20:09:59 +02:00 committed by Jaroslav Kysela
parent b5c5fd24b9
commit b3b9c1cbb3
4 changed files with 198 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/at91/at91rm9200-i2s.c
View File

@ -52,9 +52,9 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
/* 8k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */ /* 8k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
{ {
.fmt = AT91RM9200_I2S_DAIFMT, .fmt = AT91RM9200_I2S_DAIFMT,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = AT91RM9200_I2S_DIR, .pcmdir = AT91RM9200_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 1500, .fs = 1500,
@ -63,38 +63,38 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
}, },
/* 16k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */ /* 16k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */
{ {
.fmt = AT91RM9200_I2S_DAIFMT, .fmt = AT91RM9200_I2S_DAIFMT,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_16000, .pcmrate = SNDRV_PCM_RATE_16000,
.pcmdir = AT91RM9200_I2S_DIR, .pcmdir = AT91RM9200_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 750, .fs = 750,
.bfs = SND_SOC_FSBD(3), .bfs = SND_SOC_FSBD(3),
.flags (7 << 16 | 133), .flags (7 << 16 | 133),
}, },
/* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */ /* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
{ {
.fmt = AT91RM9200_I2S_DAIFMT, .fmt = AT91RM9200_I2S_DAIFMT,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_22050, .pcmrate = SNDRV_PCM_RATE_22050,
.pcmdir = AT91RM9200_I2S_DIR, .pcmdir = AT91RM9200_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 500, .fs = 500,
.bfs = SND_SOC_FSBD(10), .bfs = SND_SOC_FSBD(10),
.priv = (25 << 16 | 24), .priv = (25 << 16 | 24),
}, },
/* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */ /* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */
{ {
.fmt = AT91RM9200_I2S_DAIFMT, .fmt = AT91RM9200_I2S_DAIFMT,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_48000, .pcmrate = SNDRV_PCM_RATE_48000,
.pcmdir = AT91RM9200_I2S_DIR, .pcmdir = AT91RM9200_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 250, .fs = 250,
.bfs SND_SOC_FSBD(5), .bfs SND_SOC_FSBD(5),
.priv = (13 << 16 | 23), .priv = (13 << 16 | 23),
}, },
}; };

94
sound/soc/codecs/wm8731.c
View File

@ -87,89 +87,89 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
/* 8k */ /* 8k */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 1536, .fs = 1536,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 2304, .fs = 2304,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 1408, .fs = 1408,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 2112, .fs = 2112,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
/* 32k */ /* 32k */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_32000, .pcmrate = SNDRV_PCM_RATE_32000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 384, .fs = 384,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_32000, .pcmrate = SNDRV_PCM_RATE_32000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 576, .fs = 576,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
/* 44.1k & 48k */ /* 44.1k & 48k */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 256, .fs = 256,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 384, .fs = 384,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
/* 88.2 & 96k */ /* 88.2 & 96k */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 128, .fs = 128,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.fs = 192, .fs = 192,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
}, },
@ -177,66 +177,66 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
/* 8k */ /* 8k */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 1500, .fs = 1500,
.bfs = SND_SOC_FSBD(1), .bfs = SND_SOC_FSBD(1),
}, },
/* 44.1k */ /* 44.1k */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_44100, .pcmrate = SNDRV_PCM_RATE_44100,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 272, .fs = 272,
.bfs = SND_SOC_FSBD(1), .bfs = SND_SOC_FSBD(1),
}, },
/* 48k */ /* 48k */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_48000, .pcmrate = SNDRV_PCM_RATE_48000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 250, .fs = 250,
.bfs = SND_SOC_FSBD(1), .bfs = SND_SOC_FSBD(1),
}, },
/* 88.2k */ /* 88.2k */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_88200, .pcmrate = SNDRV_PCM_RATE_88200,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 136, .fs = 136,
.bfs = SND_SOC_FSBD(1), .bfs = SND_SOC_FSBD(1),
}, },
/* 96k */ /* 96k */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_96000, .pcmrate = SNDRV_PCM_RATE_96000,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 125, .fs = 125,
.bfs = SND_SOC_FSBD(1), .bfs = SND_SOC_FSBD(1),
}, },
/* codec frame and clock slave modes */ /* codec frame and clock slave modes */
{ {
.fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
.pcmfmt = WM8731_HIFI_BITS, .pcmfmt = WM8731_HIFI_BITS,
.pcmrate = WM8731_RATES, .pcmrate = WM8731_RATES,
.pcmdir = WM8731_DIR, .pcmdir = WM8731_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = SND_SOC_FS_ALL, .fs = SND_SOC_FS_ALL,
.bfs = SND_SOC_FSBD_ALL, .bfs = SND_SOC_FSBD_ALL,
}, },
}; };

210
sound/soc/codecs/wm8750.c
View File

@ -99,250 +99,250 @@ static struct snd_soc_dai_mode wm8750_modes[] = {
/* 8k */ /* 8k */
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 1536, .fs = 1536,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 1408, .fs = 1408,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 2304, .fs = 2304,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 2112, .fs = 2112,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 1500, .fs = 1500,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
/* 11.025k */ /* 11.025k */
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_11025, .pcmrate = SNDRV_PCM_RATE_11025,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 1024, .fs = 1024,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_11025, .pcmrate = SNDRV_PCM_RATE_11025,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 1536, .fs = 1536,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_11025, .pcmrate = SNDRV_PCM_RATE_11025,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 1088, .fs = 1088,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
/* 16k */ /* 16k */
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_16000, .pcmrate = SNDRV_PCM_RATE_16000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 768, .fs = 768,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_16000, .pcmrate = SNDRV_PCM_RATE_16000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 1152, .fs = 1152,
.bfs = WM8750_HIFI_FSB .bfs = WM8750_HIFI_FSB
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_16000, .pcmrate = SNDRV_PCM_RATE_16000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 750, .fs = 750,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
/* 22.05k */ /* 22.05k */
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_22050, .pcmrate = SNDRV_PCM_RATE_22050,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 512, .fs = 512,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_22050, .pcmrate = SNDRV_PCM_RATE_22050,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 768, .fs = 768,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_22050, .pcmrate = SNDRV_PCM_RATE_22050,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 544, .fs = 544,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
/* 32k */ /* 32k */
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_32000, .pcmrate = SNDRV_PCM_RATE_32000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 384, .fs = 384,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_32000, .pcmrate = SNDRV_PCM_RATE_32000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 576, .fs = 576,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_32000, .pcmrate = SNDRV_PCM_RATE_32000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 375, .fs = 375,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
/* 44.1k & 48k */ /* 44.1k & 48k */
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 256, .fs = 256,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 384, .fs = 384,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_44100, .pcmrate = SNDRV_PCM_RATE_44100,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 272, .fs = 272,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_48000, .pcmrate = SNDRV_PCM_RATE_48000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 250, .fs = 250,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
/* 88.2k & 96k */ /* 88.2k & 96k */
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 128, .fs = 128,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 192, .fs = 192,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_88200, .pcmrate = SNDRV_PCM_RATE_88200,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 136, .fs = 136,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = SNDRV_PCM_RATE_96000, .pcmrate = SNDRV_PCM_RATE_96000,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 125, .fs = 125,
.bfs = WM8750_HIFI_FSB, .bfs = WM8750_HIFI_FSB,
}, },
/* codec frame and clock slave modes */ /* codec frame and clock slave modes */
{ {
.fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
.pcmfmt = WM8750_HIFI_BITS, .pcmfmt = WM8750_HIFI_BITS,
.pcmrate = WM8750_HIFI_RATES, .pcmrate = WM8750_HIFI_RATES,
.pcmdir = WM8750_DIR, .pcmdir = WM8750_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = SND_SOC_FS_ALL, .fs = SND_SOC_FS_ALL,
.bfs = SND_SOC_FSBD_ALL, .bfs = SND_SOC_FSBD_ALL,
}, },
}; };

58
sound/soc/pxa/pxa2xx-i2s.c
View File

@ -60,61 +60,61 @@ static struct snd_soc_dai_mode pxa2xx_i2s_modes[] = {
/* pxa2xx I2S frame and clock master modes */ /* pxa2xx I2S frame and clock master modes */
{ {
.fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_8000, .pcmrate = SNDRV_PCM_RATE_8000,
.pcmdir = PXA_I2S_DIR, .pcmdir = PXA_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 256, .fs = 256,
.bfs = SND_SOC_FSBD(4), .bfs = SND_SOC_FSBD(4),
.priv = 0x48, .priv = 0x48,
}, },
{ {
.fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_11025, .pcmrate = SNDRV_PCM_RATE_11025,
.pcmdir = PXA_I2S_DIR, .pcmdir = PXA_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 256, .fs = 256,
.bfs = SND_SOC_FSBD(4), .bfs = SND_SOC_FSBD(4),
.priv = 0x34, .priv = 0x34,
}, },
{ {
.fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_16000, .pcmrate = SNDRV_PCM_RATE_16000,
.pcmdir = PXA_I2S_DIR, .pcmdir = PXA_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 256, .fs = 256,
.bfs = SND_SOC_FSBD(4), .bfs = SND_SOC_FSBD(4),
.priv = 0x24, .priv = 0x24,
}, },
{ {
.fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_22050, .pcmrate = SNDRV_PCM_RATE_22050,
.pcmdir = PXA_I2S_DIR, .pcmdir = PXA_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 256, .fs = 256,
.bfs = SND_SOC_FSBD(4), .bfs = SND_SOC_FSBD(4),
.priv = 0x1a, .priv = 0x1a,
}, },
{ {
.fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_44100, .pcmrate = SNDRV_PCM_RATE_44100,
.pcmdir = PXA_I2S_DIR, .pcmdir = PXA_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 256, .fs = 256,
.bfs = SND_SOC_FSBD(4), .bfs = SND_SOC_FSBD(4),
.priv = 0xd, .priv = 0xd,
}, },
{ {
.fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = SNDRV_PCM_RATE_48000, .pcmrate = SNDRV_PCM_RATE_48000,
.pcmdir = PXA_I2S_DIR, .pcmdir = PXA_I2S_DIR,
.flags = SND_SOC_DAI_BFS_DIV, .flags = SND_SOC_DAI_BFS_DIV,
.fs = 256, .fs = 256,
.bfs = SND_SOC_FSBD(4), .bfs = SND_SOC_FSBD(4),
.priv = 0xc, .priv = 0xc,
}, },
@ -122,11 +122,11 @@ static struct snd_soc_dai_mode pxa2xx_i2s_modes[] = {
/* pxa2xx I2S frame master and clock slave mode */ /* pxa2xx I2S frame master and clock slave mode */
{ {
.fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBM_CFS, .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBM_CFS,
.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
.pcmrate = PXA_I2S_RATES, .pcmrate = PXA_I2S_RATES,
.pcmdir = PXA_I2S_DIR, .pcmdir = PXA_I2S_DIR,
.fs = SND_SOC_FS_ALL, .fs = SND_SOC_FS_ALL,
.bfs = SND_SOC_FSB(64), .bfs = SND_SOC_FSB(64),
.priv = 0x48, .priv = 0x48,
}, },
}; };