Skip to content

L
linux
Commit e550e17f authored by Liam Girdwood's avatar Liam Girdwood Committed by Jaroslav Kysela
Browse files
Options

ALSA: asoc: codecs - merge structs snd_soc_codec_dai and snd_soc_cpu_dai. 

This patch merges struct snd_soc_codec_dai and struct
snd_soc_cpu_dai into struct snd_soc_dai for the codec drivers.
Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 9cb132d7
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 67 deletions
sound/soc/codecs/ac97.c
View file @ e550e17f
...@@ -41,7 +41,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream) ...@@ -41,7 +41,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream)
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\
SNDRV_PCM_RATE_48000) SNDRV_PCM_RATE_48000)
struct snd_soc_codec_dai ac97_dai = { struct snd_soc_dai ac97_dai = {
.name = "AC97 HiFi", .name = "AC97 HiFi",
.type = SND_SOC_DAI_AC97, .type = SND_SOC_DAI_AC97,
.playback = { .playback = {
......
sound/soc/codecs/ac97.h
View file @ e550e17f
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
#define __LINUX_SND_SOC_AC97_H #define __LINUX_SND_SOC_AC97_H
extern struct snd_soc_codec_device soc_codec_dev_ac97; extern struct snd_soc_codec_device soc_codec_dev_ac97;
extern struct snd_soc_codec_dai ac97_dai; extern struct snd_soc_dai ac97_dai;
#endif #endif
sound/soc/codecs/ak4535.c
View file @ e550e17f
...@@ -329,7 +329,7 @@ static int ak4535_add_widgets(struct snd_soc_codec *codec) ...@@ -329,7 +329,7 @@ static int ak4535_add_widgets(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int ak4535_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, static int ak4535_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -369,7 +369,7 @@ static int ak4535_hw_params(struct snd_pcm_substream *substream, ...@@ -369,7 +369,7 @@ static int ak4535_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int ak4535_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int ak4535_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -394,7 +394,7 @@ static int ak4535_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ...@@ -394,7 +394,7 @@ static int ak4535_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
return 0; return 0;
} }
static int ak4535_mute(struct snd_soc_codec_dai *dai, int mute) static int ak4535_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
u16 mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC) & 0xffdf; u16 mute_reg = ak4535_read_reg_cache(codec, AK4535_DAC) & 0xffdf;
...@@ -436,7 +436,7 @@ static int ak4535_set_bias_level(struct snd_soc_codec *codec, ...@@ -436,7 +436,7 @@ static int ak4535_set_bias_level(struct snd_soc_codec *codec,
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\ SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
struct snd_soc_codec_dai ak4535_dai = { struct snd_soc_dai ak4535_dai = {
.name = "AK4535", .name = "AK4535",
.playback = { .playback = {
.stream_name = "Playback", .stream_name = "Playback",
......
sound/soc/codecs/ak4535.h
View file @ e550e17f
...@@ -40,7 +40,7 @@ struct ak4535_setup_data { ...@@ -40,7 +40,7 @@ struct ak4535_setup_data {
unsigned short i2c_address; unsigned short i2c_address;
}; };
extern struct snd_soc_codec_dai ak4535_dai; extern struct snd_soc_dai ak4535_dai;
extern struct snd_soc_codec_device soc_codec_dev_ak4535; extern struct snd_soc_codec_device soc_codec_dev_ak4535;
#endif #endif
sound/soc/codecs/cs4270.c
View file @ e550e17f
...@@ -201,7 +201,7 @@ static struct { ...@@ -201,7 +201,7 @@ static struct {
* driver what the input settings can be. This would need to be implemented * driver what the input settings can be. This would need to be implemented
* for stand-alone mode to work. * for stand-alone mode to work.
*/ */
static int cs4270_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, static int cs4270_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -251,7 +251,7 @@ static int cs4270_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, ...@@ -251,7 +251,7 @@ static int cs4270_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
* data for playback only, but ASoC currently does not support different * data for playback only, but ASoC currently does not support different
* formats for playback vs. record. * formats for playback vs. record.
*/ */
static int cs4270_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int cs4270_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int format) unsigned int format)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -471,7 +471,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, ...@@ -471,7 +471,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream,
* board does not have the MUTEA or MUTEB pins connected to such circuitry, * board does not have the MUTEA or MUTEB pins connected to such circuitry,
* then this function will do nothing. * then this function will do nothing.
*/ */
static int cs4270_mute(struct snd_soc_codec_dai *dai, int mute) static int cs4270_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
int reg6; int reg6;
...@@ -667,7 +667,7 @@ static int cs4270_i2c_probe(struct i2c_adapter *adapter, int addr, int kind) ...@@ -667,7 +667,7 @@ static int cs4270_i2c_probe(struct i2c_adapter *adapter, int addr, int kind)
#endif /* USE_I2C*/ #endif /* USE_I2C*/
struct snd_soc_codec_dai cs4270_dai = { struct snd_soc_dai cs4270_dai = {
.name = "CS4270", .name = "CS4270",
.playback = { .playback = {
.stream_name = "Playback", .stream_name = "Playback",
......
sound/soc/codecs/cs4270.h
View file @ e550e17f
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* The ASoC codec DAI structure for the CS4270. Assign this structure to * The ASoC codec DAI structure for the CS4270. Assign this structure to
* the .codec_dai field of your machine driver's snd_soc_dai_link structure. * the .codec_dai field of your machine driver's snd_soc_dai_link structure.
*/ */
extern struct snd_soc_codec_dai cs4270_dai; extern struct snd_soc_dai cs4270_dai;
/* /*
* The ASoC codec device structure for the CS4270. Assign this structure * The ASoC codec device structure for the CS4270. Assign this structure
......
sound/soc/codecs/tlv320aic3x.c
View file @ e550e17f
...@@ -814,7 +814,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream, ...@@ -814,7 +814,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int aic3x_mute(struct snd_soc_codec_dai *dai, int mute) static int aic3x_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
u8 ldac_reg = aic3x_read_reg_cache(codec, LDAC_VOL) & ~MUTE_ON; u8 ldac_reg = aic3x_read_reg_cache(codec, LDAC_VOL) & ~MUTE_ON;
...@@ -831,7 +831,7 @@ static int aic3x_mute(struct snd_soc_codec_dai *dai, int mute) ...@@ -831,7 +831,7 @@ static int aic3x_mute(struct snd_soc_codec_dai *dai, int mute)
return 0; return 0;
} }
static int aic3x_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, static int aic3x_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -841,7 +841,7 @@ static int aic3x_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, ...@@ -841,7 +841,7 @@ static int aic3x_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
return 0; return 0;
} }
static int aic3x_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -990,7 +990,7 @@ EXPORT_SYMBOL_GPL(aic3x_headset_detected); ...@@ -990,7 +990,7 @@ EXPORT_SYMBOL_GPL(aic3x_headset_detected);
#define AIC3X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ #define AIC3X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE) SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
struct snd_soc_codec_dai aic3x_dai = { struct snd_soc_dai aic3x_dai = {
.name = "aic3x", .name = "aic3x",
.playback = { .playback = {
.stream_name = "Playback", .stream_name = "Playback",
......
sound/soc/codecs/tlv320aic3x.h
View file @ e550e17f
...@@ -228,7 +228,7 @@ struct aic3x_setup_data { ...@@ -228,7 +228,7 @@ struct aic3x_setup_data {
unsigned int gpio_func[2]; unsigned int gpio_func[2];
}; };
extern struct snd_soc_codec_dai aic3x_dai; extern struct snd_soc_dai aic3x_dai;
extern struct snd_soc_codec_device soc_codec_dev_aic3x; extern struct snd_soc_codec_device soc_codec_dev_aic3x;
#endif /* _AIC3X_H */ #endif /* _AIC3X_H */
sound/soc/codecs/uda1380.c
View file @ e550e17f
...@@ -372,7 +372,7 @@ static int uda1380_add_widgets(struct snd_soc_codec *codec) ...@@ -372,7 +372,7 @@ static int uda1380_add_widgets(struct snd_soc_codec *codec)
return 0; return 0;
} }
static int uda1380_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int uda1380_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -499,7 +499,7 @@ static void uda1380_pcm_shutdown(struct snd_pcm_substream *substream) ...@@ -499,7 +499,7 @@ static void uda1380_pcm_shutdown(struct snd_pcm_substream *substream)
uda1380_write(codec, UDA1380_CLK, clk); uda1380_write(codec, UDA1380_CLK, clk);
} }
static int uda1380_mute(struct snd_soc_codec_dai *codec_dai, int mute) static int uda1380_mute(struct snd_soc_dai *codec_dai, int mute)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
u16 mute_reg = uda1380_read_reg_cache(codec, UDA1380_DEEMP) & ~R13_MTM; u16 mute_reg = uda1380_read_reg_cache(codec, UDA1380_DEEMP) & ~R13_MTM;
...@@ -542,7 +542,7 @@ static int uda1380_set_bias_level(struct snd_soc_codec *codec, ...@@ -542,7 +542,7 @@ static int uda1380_set_bias_level(struct snd_soc_codec *codec,
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\ SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000)
struct snd_soc_codec_dai uda1380_dai[] = { struct snd_soc_dai uda1380_dai[] = {
{ {
.name = "UDA1380", .name = "UDA1380",
.playback = { .playback = {
......
sound/soc/codecs/uda1380.h
View file @ e550e17f
...@@ -83,7 +83,7 @@ struct uda1380_setup_data { ...@@ -83,7 +83,7 @@ struct uda1380_setup_data {
#define UDA1380_DAI_PLAYBACK 1 /* playback DAI */ #define UDA1380_DAI_PLAYBACK 1 /* playback DAI */
#define UDA1380_DAI_CAPTURE 2 /* capture DAI */ #define UDA1380_DAI_CAPTURE 2 /* capture DAI */
extern struct snd_soc_codec_dai uda1380_dai[3]; extern struct snd_soc_dai uda1380_dai[3];
extern struct snd_soc_codec_device soc_codec_dev_uda1380; extern struct snd_soc_codec_device soc_codec_dev_uda1380;
#endif /* _UDA1380_H */ #endif /* _UDA1380_H */
sound/soc/codecs/wm8510.c
View file @ e550e17f
...@@ -332,7 +332,7 @@ static void pll_factors(unsigned int target, unsigned int source) ...@@ -332,7 +332,7 @@ static void pll_factors(unsigned int target, unsigned int source)
pll_div.k = K; pll_div.k = K;
} }
static int wm8510_set_dai_pll(struct snd_soc_codec_dai *codec_dai, static int wm8510_set_dai_pll(struct snd_soc_dai *codec_dai,
int pll_id, unsigned int freq_in, unsigned int freq_out) int pll_id, unsigned int freq_in, unsigned int freq_out)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -368,7 +368,7 @@ static int wm8510_set_dai_pll(struct snd_soc_codec_dai *codec_dai, ...@@ -368,7 +368,7 @@ static int wm8510_set_dai_pll(struct snd_soc_codec_dai *codec_dai,
/* /*
* Configure WM8510 clock dividers. * Configure WM8510 clock dividers.
*/ */
static int wm8510_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, static int wm8510_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
int div_id, int div) int div_id, int div)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -402,7 +402,7 @@ static int wm8510_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, ...@@ -402,7 +402,7 @@ static int wm8510_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai,
return 0; return 0;
} }
static int wm8510_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8510_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -510,7 +510,7 @@ static int wm8510_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -510,7 +510,7 @@ static int wm8510_pcm_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int wm8510_mute(struct snd_soc_codec_dai *dai, int mute) static int wm8510_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
u16 mute_reg = wm8510_read_reg_cache(codec, WM8510_DAC) & 0xffbf; u16 mute_reg = wm8510_read_reg_cache(codec, WM8510_DAC) & 0xffbf;
...@@ -554,7 +554,7 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec, ...@@ -554,7 +554,7 @@ static int wm8510_set_bias_level(struct snd_soc_codec *codec,
#define WM8510_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ #define WM8510_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
struct snd_soc_codec_dai wm8510_dai = { struct snd_soc_dai wm8510_dai = {
.name = "WM8510 HiFi", .name = "WM8510 HiFi",
.playback = { .playback = {
.stream_name = "Playback", .stream_name = "Playback",
......
sound/soc/codecs/wm8510.h
View file @ e550e17f
...@@ -97,7 +97,7 @@ struct wm8510_setup_data { ...@@ -97,7 +97,7 @@ struct wm8510_setup_data {
unsigned short i2c_address; unsigned short i2c_address;
}; };
extern struct snd_soc_codec_dai wm8510_dai; extern struct snd_soc_dai wm8510_dai;
extern struct snd_soc_codec_device soc_codec_dev_wm8510; extern struct snd_soc_codec_device soc_codec_dev_wm8510;
#endif #endif
sound/soc/codecs/wm8731.c
View file @ e550e17f
...@@ -318,7 +318,7 @@ static void wm8731_shutdown(struct snd_pcm_substream *substream) ...@@ -318,7 +318,7 @@ static void wm8731_shutdown(struct snd_pcm_substream *substream)
} }
} }
static int wm8731_mute(struct snd_soc_codec_dai *dai, int mute) static int wm8731_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
u16 mute_reg = wm8731_read_reg_cache(codec, WM8731_APDIGI) & 0xfff7; u16 mute_reg = wm8731_read_reg_cache(codec, WM8731_APDIGI) & 0xfff7;
...@@ -330,7 +330,7 @@ static int wm8731_mute(struct snd_soc_codec_dai *dai, int mute) ...@@ -330,7 +330,7 @@ static int wm8731_mute(struct snd_soc_codec_dai *dai, int mute)
return 0; return 0;
} }
static int wm8731_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -349,7 +349,7 @@ static int wm8731_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, ...@@ -349,7 +349,7 @@ static int wm8731_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
} }
static int wm8731_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -443,7 +443,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec, ...@@ -443,7 +443,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
#define WM8731_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ #define WM8731_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
SNDRV_PCM_FMTBIT_S24_LE) SNDRV_PCM_FMTBIT_S24_LE)
struct snd_soc_codec_dai wm8731_dai = { struct snd_soc_dai wm8731_dai = {
.name = "WM8731", .name = "WM8731",
.playback = { .playback = {
.stream_name = "Playback", .stream_name = "Playback",
......
sound/soc/codecs/wm8731.h
View file @ e550e17f
...@@ -38,7 +38,7 @@ struct wm8731_setup_data { ...@@ -38,7 +38,7 @@ struct wm8731_setup_data {
unsigned short i2c_address; unsigned short i2c_address;
}; };
extern struct snd_soc_codec_dai wm8731_dai; extern struct snd_soc_dai wm8731_dai;
extern struct snd_soc_codec_device soc_codec_dev_wm8731; extern struct snd_soc_codec_device soc_codec_dev_wm8731;
#endif #endif
sound/soc/codecs/wm8750.c
View file @ e550e17f
...@@ -536,7 +536,7 @@ static inline int get_coeff(int mclk, int rate) ...@@ -536,7 +536,7 @@ static inline int get_coeff(int mclk, int rate)
return -EINVAL; return -EINVAL;
} }
static int wm8750_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, static int wm8750_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -554,7 +554,7 @@ static int wm8750_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, ...@@ -554,7 +554,7 @@ static int wm8750_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
return -EINVAL; return -EINVAL;
} }
static int wm8750_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8750_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -647,7 +647,7 @@ static int wm8750_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -647,7 +647,7 @@ static int wm8750_pcm_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int wm8750_mute(struct snd_soc_codec_dai *dai, int mute) static int wm8750_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
u16 mute_reg = wm8750_read_reg_cache(codec, WM8750_ADCDAC) & 0xfff7; u16 mute_reg = wm8750_read_reg_cache(codec, WM8750_ADCDAC) & 0xfff7;
...@@ -692,7 +692,7 @@ static int wm8750_set_bias_level(struct snd_soc_codec *codec, ...@@ -692,7 +692,7 @@ static int wm8750_set_bias_level(struct snd_soc_codec *codec,
#define WM8750_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ #define WM8750_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
SNDRV_PCM_FMTBIT_S24_LE) SNDRV_PCM_FMTBIT_S24_LE)
struct snd_soc_codec_dai wm8750_dai = { struct snd_soc_dai wm8750_dai = {
.name = "WM8750", .name = "WM8750",
.playback = { .playback = {
.stream_name = "Playback", .stream_name = "Playback",
......
sound/soc/codecs/wm8750.h
View file @ e550e17f
...@@ -61,7 +61,7 @@ struct wm8750_setup_data { ...@@ -61,7 +61,7 @@ struct wm8750_setup_data {
unsigned short i2c_address; unsigned short i2c_address;
}; };
extern struct snd_soc_codec_dai wm8750_dai; extern struct snd_soc_dai wm8750_dai;
extern struct snd_soc_codec_device soc_codec_dev_wm8750; extern struct snd_soc_codec_device soc_codec_dev_wm8750;
#endif #endif
sound/soc/codecs/wm8753.c
View file @ e550e17f
...@@ -740,7 +740,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target, ...@@ -740,7 +740,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
pll_div->k = K; pll_div->k = K;
} }
static int wm8753_set_dai_pll(struct snd_soc_codec_dai *codec_dai, static int wm8753_set_dai_pll(struct snd_soc_dai *codec_dai,
int pll_id, unsigned int freq_in, unsigned int freq_out) int pll_id, unsigned int freq_in, unsigned int freq_out)
{ {
u16 reg, enable; u16 reg, enable;
...@@ -863,7 +863,7 @@ static int get_coeff(int mclk, int rate) ...@@ -863,7 +863,7 @@ static int get_coeff(int mclk, int rate)
/* /*
* Clock after PLL and dividers * Clock after PLL and dividers
*/ */
static int wm8753_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, static int wm8753_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -890,7 +890,7 @@ static int wm8753_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, ...@@ -890,7 +890,7 @@ static int wm8753_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
/* /*
* Set's ADC and Voice DAC format. * Set's ADC and Voice DAC format.
*/ */
static int wm8753_vdac_adc_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8753_vdac_adc_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -960,7 +960,7 @@ static int wm8753_pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -960,7 +960,7 @@ static int wm8753_pcm_hw_params(struct snd_pcm_substream *substream,
/* /*
* Set's PCM dai fmt and BCLK. * Set's PCM dai fmt and BCLK.
*/ */
static int wm8753_pcm_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8753_pcm_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1026,7 +1026,7 @@ static int wm8753_pcm_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ...@@ -1026,7 +1026,7 @@ static int wm8753_pcm_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
return 0; return 0;
} }
static int wm8753_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, static int wm8753_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
int div_id, int div) int div_id, int div)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1054,7 +1054,7 @@ static int wm8753_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, ...@@ -1054,7 +1054,7 @@ static int wm8753_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai,
/* /*
* Set's HiFi DAC format. * Set's HiFi DAC format.
*/ */
static int wm8753_hdac_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8753_hdac_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1087,7 +1087,7 @@ static int wm8753_hdac_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ...@@ -1087,7 +1087,7 @@ static int wm8753_hdac_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
/* /*
* Set's I2S DAI format. * Set's I2S DAI format.
*/ */
static int wm8753_i2s_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8753_i2s_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1195,7 +1195,7 @@ static int wm8753_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -1195,7 +1195,7 @@ static int wm8753_i2s_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int wm8753_mode1v_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8753_mode1v_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1210,7 +1210,7 @@ static int wm8753_mode1v_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ...@@ -1210,7 +1210,7 @@ static int wm8753_mode1v_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
return wm8753_pcm_set_dai_fmt(codec_dai, fmt); return wm8753_pcm_set_dai_fmt(codec_dai, fmt);
} }
static int wm8753_mode1h_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8753_mode1h_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
if (wm8753_hdac_set_dai_fmt(codec_dai, fmt) < 0) if (wm8753_hdac_set_dai_fmt(codec_dai, fmt) < 0)
...@@ -1218,7 +1218,7 @@ static int wm8753_mode1h_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ...@@ -1218,7 +1218,7 @@ static int wm8753_mode1h_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
return wm8753_i2s_set_dai_fmt(codec_dai, fmt); return wm8753_i2s_set_dai_fmt(codec_dai, fmt);
} }
static int wm8753_mode2_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8753_mode2_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1233,7 +1233,7 @@ static int wm8753_mode2_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ...@@ -1233,7 +1233,7 @@ static int wm8753_mode2_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
return wm8753_i2s_set_dai_fmt(codec_dai, fmt); return wm8753_i2s_set_dai_fmt(codec_dai, fmt);
} }
static int wm8753_mode3_4_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8753_mode3_4_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1250,7 +1250,7 @@ static int wm8753_mode3_4_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ...@@ -1250,7 +1250,7 @@ static int wm8753_mode3_4_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
return wm8753_i2s_set_dai_fmt(codec_dai, fmt); return wm8753_i2s_set_dai_fmt(codec_dai, fmt);
} }
static int wm8753_mute(struct snd_soc_codec_dai *dai, int mute) static int wm8753_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
u16 mute_reg = wm8753_read_reg_cache(codec, WM8753_DAC) & 0xfff7; u16 mute_reg = wm8753_read_reg_cache(codec, WM8753_DAC) & 0xfff7;
...@@ -1316,7 +1316,7 @@ static int wm8753_set_bias_level(struct snd_soc_codec *codec, ...@@ -1316,7 +1316,7 @@ static int wm8753_set_bias_level(struct snd_soc_codec *codec,
* 3. Voice disabled - HIFI over HIFI * 3. Voice disabled - HIFI over HIFI
* 4. Voice disabled - HIFI over HIFI, uses voice DAI LRC for capture * 4. Voice disabled - HIFI over HIFI, uses voice DAI LRC for capture
*/ */
static const struct snd_soc_codec_dai wm8753_all_dai[] = { static const struct snd_soc_dai wm8753_all_dai[] = {
/* DAI HiFi mode 1 */ /* DAI HiFi mode 1 */
{ .name = "WM8753 HiFi", { .name = "WM8753 HiFi",
.id = 1, .id = 1,
...@@ -1456,7 +1456,7 @@ static const struct snd_soc_codec_dai wm8753_all_dai[] = { ...@@ -1456,7 +1456,7 @@ static const struct snd_soc_codec_dai wm8753_all_dai[] = {
}, },
}; };
struct snd_soc_codec_dai wm8753_dai[2]; struct snd_soc_dai wm8753_dai[2];
EXPORT_SYMBOL_GPL(wm8753_dai); EXPORT_SYMBOL_GPL(wm8753_dai);
static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode) static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode)
......
sound/soc/codecs/wm8753.h
View file @ e550e17f
...@@ -120,7 +120,7 @@ struct wm8753_setup_data { ...@@ -120,7 +120,7 @@ struct wm8753_setup_data {
#define WM8753_DAI_HIFI 0 #define WM8753_DAI_HIFI 0
#define WM8753_DAI_VOICE 1 #define WM8753_DAI_VOICE 1
extern struct snd_soc_codec_dai wm8753_dai[2]; extern struct snd_soc_dai wm8753_dai[2];
extern struct snd_soc_codec_device soc_codec_dev_wm8753; extern struct snd_soc_codec_device soc_codec_dev_wm8753;
#endif #endif
sound/soc/codecs/wm8990.c
View file @ e550e17f
...@@ -1029,7 +1029,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target, ...@@ -1029,7 +1029,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
pll_div->k = K; pll_div->k = K;
} }
static int wm8990_set_dai_pll(struct snd_soc_codec_dai *codec_dai, static int wm8990_set_dai_pll(struct snd_soc_dai *codec_dai,
int pll_id, unsigned int freq_in, unsigned int freq_out) int pll_id, unsigned int freq_in, unsigned int freq_out)
{ {
u16 reg; u16 reg;
...@@ -1065,7 +1065,7 @@ static int wm8990_set_dai_pll(struct snd_soc_codec_dai *codec_dai, ...@@ -1065,7 +1065,7 @@ static int wm8990_set_dai_pll(struct snd_soc_codec_dai *codec_dai,
/* /*
* Clock after PLL and dividers * Clock after PLL and dividers
*/ */
static int wm8990_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, static int wm8990_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1078,7 +1078,7 @@ static int wm8990_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai, ...@@ -1078,7 +1078,7 @@ static int wm8990_set_dai_sysclk(struct snd_soc_codec_dai *codec_dai,
/* /*
* Set's ADC and Voice DAC format. * Set's ADC and Voice DAC format.
*/ */
static int wm8990_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm8990_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1131,7 +1131,7 @@ static int wm8990_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ...@@ -1131,7 +1131,7 @@ static int wm8990_set_dai_fmt(struct snd_soc_codec_dai *codec_dai,
return 0; return 0;
} }
static int wm8990_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, static int wm8990_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
int div_id, int div) int div_id, int div)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1196,7 +1196,7 @@ static int wm8990_hw_params(struct snd_pcm_substream *substream, ...@@ -1196,7 +1196,7 @@ static int wm8990_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int wm8990_mute(struct snd_soc_codec_dai *dai, int mute) static int wm8990_mute(struct snd_soc_dai *dai, int mute)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
u16 val; u16 val;
...@@ -1329,7 +1329,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec, ...@@ -1329,7 +1329,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
* 1. ADC/DAC on Primary Interface * 1. ADC/DAC on Primary Interface
* 2. ADC on Primary Interface/DAC on secondary * 2. ADC on Primary Interface/DAC on secondary
*/ */
struct snd_soc_codec_dai wm8990_dai = { struct snd_soc_dai wm8990_dai = {
/* ADC/DAC on primary */ /* ADC/DAC on primary */
.name = "WM8990 ADC/DAC Primary", .name = "WM8990 ADC/DAC Primary",
.id = 1, .id = 1,
......
sound/soc/codecs/wm8990.h
View file @ e550e17f
...@@ -825,7 +825,7 @@ struct wm8990_setup_data { ...@@ -825,7 +825,7 @@ struct wm8990_setup_data {
#define WM8990_ADCCLK_DIV 2 #define WM8990_ADCCLK_DIV 2
#define WM8990_BCLK_DIV 3 #define WM8990_BCLK_DIV 3
extern struct snd_soc_codec_dai wm8990_dai; extern struct snd_soc_dai wm8990_dai;
extern struct snd_soc_codec_device soc_codec_dev_wm8990; extern struct snd_soc_codec_device soc_codec_dev_wm8990;
#endif /* __WM8990REGISTERDEFS_H__ */ #endif /* __WM8990REGISTERDEFS_H__ */
......
sound/soc/codecs/wm9712.c
View file @ e550e17f
...@@ -532,7 +532,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream) ...@@ -532,7 +532,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream)
SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\ SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 |\
SNDRV_PCM_RATE_48000) SNDRV_PCM_RATE_48000)
struct snd_soc_codec_dai wm9712_dai[] = { struct snd_soc_dai wm9712_dai[] = {
{ {
.name = "AC97 HiFi", .name = "AC97 HiFi",
.type = SND_SOC_DAI_AC97_BUS, .type = SND_SOC_DAI_AC97_BUS,
......
sound/soc/codecs/wm9712.h
View file @ e550e17f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#define WM9712_DAI_AC97_HIFI 0 #define WM9712_DAI_AC97_HIFI 0
#define WM9712_DAI_AC97_AUX 1 #define WM9712_DAI_AC97_AUX 1
extern struct snd_soc_codec_dai wm9712_dai[2]; extern struct snd_soc_dai wm9712_dai[2];
extern struct snd_soc_codec_device soc_codec_dev_wm9712; extern struct snd_soc_codec_device soc_codec_dev_wm9712;
#endif #endif
sound/soc/codecs/wm9713.c
View file @ e550e17f
...@@ -789,7 +789,7 @@ static int wm9713_set_pll(struct snd_soc_codec *codec, ...@@ -789,7 +789,7 @@ static int wm9713_set_pll(struct snd_soc_codec *codec,
return 0; return 0;
} }
static int wm9713_set_dai_pll(struct snd_soc_codec_dai *codec_dai, static int wm9713_set_dai_pll(struct snd_soc_dai *codec_dai,
int pll_id, unsigned int freq_in, unsigned int freq_out) int pll_id, unsigned int freq_in, unsigned int freq_out)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -800,7 +800,7 @@ static int wm9713_set_dai_pll(struct snd_soc_codec_dai *codec_dai, ...@@ -800,7 +800,7 @@ static int wm9713_set_dai_pll(struct snd_soc_codec_dai *codec_dai,
* Tristate the PCM DAI lines, tristate can be disabled by calling * Tristate the PCM DAI lines, tristate can be disabled by calling
* wm9713_set_dai_fmt() * wm9713_set_dai_fmt()
*/ */
static int wm9713_set_dai_tristate(struct snd_soc_codec_dai *codec_dai, static int wm9713_set_dai_tristate(struct snd_soc_dai *codec_dai,
int tristate) int tristate)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -816,7 +816,7 @@ static int wm9713_set_dai_tristate(struct snd_soc_codec_dai *codec_dai, ...@@ -816,7 +816,7 @@ static int wm9713_set_dai_tristate(struct snd_soc_codec_dai *codec_dai,
* Configure WM9713 clock dividers. * Configure WM9713 clock dividers.
* Voice DAC needs 256 FS * Voice DAC needs 256 FS
*/ */
static int wm9713_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, static int wm9713_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
int div_id, int div) int div_id, int div)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -858,7 +858,7 @@ static int wm9713_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai, ...@@ -858,7 +858,7 @@ static int wm9713_set_dai_clkdiv(struct snd_soc_codec_dai *codec_dai,
return 0; return 0;
} }
static int wm9713_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, static int wm9713_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
...@@ -1018,7 +1018,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream) ...@@ -1018,7 +1018,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream)
(SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \ (SNDRV_PCM_FORMAT_S16_LE | SNDRV_PCM_FORMAT_S20_3LE | \
SNDRV_PCM_FORMAT_S24_LE) SNDRV_PCM_FORMAT_S24_LE)
struct snd_soc_codec_dai wm9713_dai[] = { struct snd_soc_dai wm9713_dai[] = {
{ {
.name = "AC97 HiFi", .name = "AC97 HiFi",
.type = SND_SOC_DAI_AC97_BUS, .type = SND_SOC_DAI_AC97_BUS,
......
sound/soc/codecs/wm9713.h
View file @ e550e17f
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#define WM9713_DAI_PCM_VOICE 2 #define WM9713_DAI_PCM_VOICE 2
extern struct snd_soc_codec_device soc_codec_dev_wm9713; extern struct snd_soc_codec_device soc_codec_dev_wm9713;
extern struct snd_soc_codec_dai wm9713_dai[3]; extern struct snd_soc_dai wm9713_dai[3];
int wm9713_reset(struct snd_soc_codec *codec, int try_warm); int wm9713_reset(struct snd_soc_codec *codec, int try_warm);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7