diff options
Diffstat (limited to 'sound/soc/sh/hac.c')
| -rw-r--r-- | sound/soc/sh/hac.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index df7bc345c320..eab31838badf 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c | |||
| @@ -236,7 +236,8 @@ struct snd_ac97_bus_ops soc_ac97_ops = { | |||
| 236 | EXPORT_SYMBOL_GPL(soc_ac97_ops); | 236 | EXPORT_SYMBOL_GPL(soc_ac97_ops); |
| 237 | 237 | ||
| 238 | static int hac_hw_params(struct snd_pcm_substream *substream, | 238 | static int hac_hw_params(struct snd_pcm_substream *substream, |
| 239 | struct snd_pcm_hw_params *params) | 239 | struct snd_pcm_hw_params *params, |
| 240 | struct snd_soc_dai *dai) | ||
| 240 | { | 241 | { |
| 241 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 242 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
| 242 | struct hac_priv *hac = &hac_cpu_data[rtd->dai->cpu_dai->id]; | 243 | struct hac_priv *hac = &hac_cpu_data[rtd->dai->cpu_dai->id]; |
| @@ -270,7 +271,7 @@ struct snd_soc_dai sh4_hac_dai[] = { | |||
| 270 | { | 271 | { |
| 271 | .name = "HAC0", | 272 | .name = "HAC0", |
| 272 | .id = 0, | 273 | .id = 0, |
| 273 | .type = SND_SOC_DAI_AC97, | 274 | .ac97_control = 1, |
| 274 | .playback = { | 275 | .playback = { |
| 275 | .rates = AC97_RATES, | 276 | .rates = AC97_RATES, |
| 276 | .formats = AC97_FMTS, | 277 | .formats = AC97_FMTS, |
| @@ -290,8 +291,8 @@ struct snd_soc_dai sh4_hac_dai[] = { | |||
| 290 | #ifdef CONFIG_CPU_SUBTYPE_SH7760 | 291 | #ifdef CONFIG_CPU_SUBTYPE_SH7760 |
| 291 | { | 292 | { |
| 292 | .name = "HAC1", | 293 | .name = "HAC1", |
| 294 | .ac97_control = 1, | ||
| 293 | .id = 1, | 295 | .id = 1, |
| 294 | .type = SND_SOC_DAI_AC97, | ||
| 295 | .playback = { | 296 | .playback = { |
| 296 | .rates = AC97_RATES, | 297 | .rates = AC97_RATES, |
| 297 | .formats = AC97_FMTS, | 298 | .formats = AC97_FMTS, |
| @@ -313,6 +314,18 @@ struct snd_soc_dai sh4_hac_dai[] = { | |||
| 313 | }; | 314 | }; |
| 314 | EXPORT_SYMBOL_GPL(sh4_hac_dai); | 315 | EXPORT_SYMBOL_GPL(sh4_hac_dai); |
| 315 | 316 | ||
| 317 | static int __init sh4_hac_init(void) | ||
| 318 | { | ||
| 319 | return snd_soc_register_dais(sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai)); | ||
| 320 | } | ||
| 321 | module_init(sh4_hac_init); | ||
| 322 | |||
| 323 | static void __exit sh4_hac_exit(void) | ||
| 324 | { | ||
| 325 | snd_soc_unregister_dais(sh4_hac_dai, ARRAY_SIZE(sh4_hac_dai)); | ||
| 326 | } | ||
| 327 | module_exit(sh4_hac_exit); | ||
| 328 | |||
| 316 | MODULE_LICENSE("GPL"); | 329 | MODULE_LICENSE("GPL"); |
| 317 | MODULE_DESCRIPTION("SuperH onchip HAC (AC97) audio driver"); | 330 | MODULE_DESCRIPTION("SuperH onchip HAC (AC97) audio driver"); |
| 318 | MODULE_AUTHOR("Manuel Lauss <mano@roarinelk.homelinux.net>"); | 331 | MODULE_AUTHOR("Manuel Lauss <mano@roarinelk.homelinux.net>"); |
