Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 53640650ffe07f6201ecae0b0dca078b97327247

Authored by Liam Girdwood
Committed by Jaroslav Kysela
1 parent 1992a6fbd9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ALSA: asoc: sh - 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 SuperH platform.

Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

Showing 4 changed files with 7 additions and 7 deletions Side-by-side Diff

sound/soc/sh/dma-sh7760.c
Diff comments   View file @ 5364065
... ... @@ -326,7 +326,7 @@
326 326 }
327 327  
328 328 static int camelot_pcm_new(struct snd_card *card,
329   - struct snd_soc_codec_dai *dai,
  329 + struct snd_soc_dai *dai,
330 330 struct snd_pcm *pcm)
331 331 {
332 332 /* dont use SNDRV_DMA_TYPE_DEV, since it will oops the SH kernel
... ... @@ -266,7 +266,7 @@
266 266 #define AC97_FMTS \
267 267 SNDRV_PCM_FMTBIT_S16_LE
268 268  
269   -struct snd_soc_cpu_dai sh4_hac_dai[] = {
  269 +struct snd_soc_dai sh4_hac_dai[] = {
270 270 {
271 271 .name = "HAC0",
272 272 .id = 0,
sound/soc/sh/sh7760-ac97.c
Diff comments   View file @ 5364065
... ... @@ -20,7 +20,7 @@
20 20 #define IPSEL 0xFE400034
21 21  
22 22 /* platform specific structs can be declared here */
23   -extern struct snd_soc_cpu_dai sh4_hac_dai[2];
  23 +extern struct snd_soc_dai sh4_hac_dai[2];
24 24 extern struct snd_soc_platform sh7760_soc_platform;
25 25  
26 26 static int machine_init(struct snd_soc_codec *codec)
... ... @@ -208,7 +208,7 @@
208 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 212 unsigned int freq, int dir)
213 213 {
214 214 struct ssi_priv *ssi = &ssi_cpu_data[cpu_dai->id];
... ... @@ -222,7 +222,7 @@
222 222 * This divider is used to generate the SSI_SCK (I2S bitclock) from the
223 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 227 struct ssi_priv *ssi = &ssi_cpu_data[dai->id];
228 228 unsigned long ssicr;
... ... @@ -245,7 +245,7 @@
245 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 250 struct ssi_priv *ssi = &ssi_cpu_data[dai->id];
251 251 unsigned long ssicr = SSIREG(SSICR);
... ... @@ -332,7 +332,7 @@
332 332 SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_U24_3LE | \
333 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 337 .name = "SSI0",
338 338 .id = 0,