aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/sh/dma-sh7760.c2
-rw-r--r--sound/soc/sh/hac.c2
-rw-r--r--sound/soc/sh/sh7760-ac97.c2
-rw-r--r--sound/soc/sh/ssi.c8
4 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c
index 7a3ce80d6727..9faa12622d09 100644
--- a/sound/soc/sh/dma-sh7760.c
+++ b/sound/soc/sh/dma-sh7760.c
@@ -326,7 +326,7 @@ static void camelot_pcm_free(struct snd_pcm *pcm)
326} 326}
327 327
328static int camelot_pcm_new(struct snd_card *card, 328static int camelot_pcm_new(struct snd_card *card,
329 struct snd_soc_codec_dai *dai, 329 struct snd_soc_dai *dai,
330 struct snd_pcm *pcm) 330 struct snd_pcm *pcm)
331{ 331{
332 /* dont use SNDRV_DMA_TYPE_DEV, since it will oops the SH kernel 332 /* dont use SNDRV_DMA_TYPE_DEV, since it will oops the SH kernel
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
index b7b676b3d671..df7bc345c320 100644
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
@@ -266,7 +266,7 @@ static int hac_hw_params(struct snd_pcm_substream *substream,
266#define AC97_FMTS \ 266#define AC97_FMTS \
267 SNDRV_PCM_FMTBIT_S16_LE 267 SNDRV_PCM_FMTBIT_S16_LE
268 268
269struct snd_soc_cpu_dai sh4_hac_dai[] = { 269struct snd_soc_dai sh4_hac_dai[] = {
270{ 270{
271 .name = "HAC0", 271 .name = "HAC0",
272 .id = 0, 272 .id = 0,
diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c
index 846d1b3a6305..92bfaf4774a7 100644
--- a/sound/soc/sh/sh7760-ac97.c
+++ b/sound/soc/sh/sh7760-ac97.c
@@ -20,7 +20,7 @@
20#define IPSEL 0xFE400034 20#define IPSEL 0xFE400034
21 21
22/* platform specific structs can be declared here */ 22/* platform specific structs can be declared here */
23extern struct snd_soc_cpu_dai sh4_hac_dai[2]; 23extern struct snd_soc_dai sh4_hac_dai[2];
24extern struct snd_soc_platform sh7760_soc_platform; 24extern struct snd_soc_platform sh7760_soc_platform;
25 25
26static int machine_init(struct snd_soc_codec *codec) 26static int machine_init(struct snd_soc_codec *codec)
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
211static int ssi_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, int clk_id, 211static 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 */
225static int ssi_set_clkdiv(struct snd_soc_cpu_dai *dai, int did, int div) 225static 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
248static int ssi_set_fmt(struct snd_soc_cpu_dai *dai, unsigned int fmt) 248static 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
335struct snd_soc_cpu_dai sh4_ssi_dai[] = { 335struct snd_soc_dai sh4_ssi_dai[] = {
336{ 336{
337 .name = "SSI0", 337 .name = "SSI0",
338 .id = 0, 338 .id = 0,