diff options
Diffstat (limited to 'sound/soc/sh/ssi.c')
-rw-r--r-- | sound/soc/sh/ssi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index 3388bc3d62d1..55c3464163ab 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c | |||
@@ -208,7 +208,7 @@ static int ssi_hw_params(struct snd_pcm_substream *substream, | |||
208 | return 0; | 208 | return 0; |
209 | } | 209 | } |
210 | 210 | ||
211 | static int ssi_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, int clk_id, | 211 | static int ssi_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id, |
212 | unsigned int freq, int dir) | 212 | unsigned int freq, int dir) |
213 | { | 213 | { |
214 | struct ssi_priv *ssi = &ssi_cpu_data[cpu_dai->id]; | 214 | struct ssi_priv *ssi = &ssi_cpu_data[cpu_dai->id]; |
@@ -222,7 +222,7 @@ static int ssi_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, int clk_id, | |||
222 | * This divider is used to generate the SSI_SCK (I2S bitclock) from the | 222 | * This divider is used to generate the SSI_SCK (I2S bitclock) from the |
223 | * clock at the HAC_BIT_CLK ("oversampling clock") pin. | 223 | * clock at the HAC_BIT_CLK ("oversampling clock") pin. |
224 | */ | 224 | */ |
225 | static int ssi_set_clkdiv(struct snd_soc_cpu_dai *dai, int did, int div) | 225 | static int ssi_set_clkdiv(struct snd_soc_dai *dai, int did, int div) |
226 | { | 226 | { |
227 | struct ssi_priv *ssi = &ssi_cpu_data[dai->id]; | 227 | struct ssi_priv *ssi = &ssi_cpu_data[dai->id]; |
228 | unsigned long ssicr; | 228 | unsigned long ssicr; |
@@ -245,7 +245,7 @@ static int ssi_set_clkdiv(struct snd_soc_cpu_dai *dai, int did, int div) | |||
245 | return 0; | 245 | return 0; |
246 | } | 246 | } |
247 | 247 | ||
248 | static int ssi_set_fmt(struct snd_soc_cpu_dai *dai, unsigned int fmt) | 248 | static int ssi_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) |
249 | { | 249 | { |
250 | struct ssi_priv *ssi = &ssi_cpu_data[dai->id]; | 250 | struct ssi_priv *ssi = &ssi_cpu_data[dai->id]; |
251 | unsigned long ssicr = SSIREG(SSICR); | 251 | unsigned long ssicr = SSIREG(SSICR); |
@@ -332,7 +332,7 @@ static int ssi_set_fmt(struct snd_soc_cpu_dai *dai, unsigned int fmt) | |||
332 | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_U24_3LE | \ | 332 | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_U24_3LE | \ |
333 | SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_U32_LE) | 333 | SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_U32_LE) |
334 | 334 | ||
335 | struct snd_soc_cpu_dai sh4_ssi_dai[] = { | 335 | struct snd_soc_dai sh4_ssi_dai[] = { |
336 | { | 336 | { |
337 | .name = "SSI0", | 337 | .name = "SSI0", |
338 | .id = 0, | 338 | .id = 0, |