diff options
Diffstat (limited to 'arch/arm/mach-s3c64xx/dev-audio.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/dev-audio.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index 9648fbc36eec..3838335f125b 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c | |||
@@ -43,8 +43,10 @@ static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev) | |||
43 | s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK); | 43 | s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK); |
44 | s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI); | 44 | s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI); |
45 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0); | 45 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0); |
46 | break; | ||
46 | default: | 47 | default: |
47 | printk(KERN_DEBUG "Invalid I2S Controller number!"); | 48 | printk(KERN_DEBUG "Invalid I2S Controller number: %d\n", |
49 | pdev->id); | ||
48 | return -EINVAL; | 50 | return -EINVAL; |
49 | } | 51 | } |
50 | 52 | ||
@@ -184,7 +186,8 @@ static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev) | |||
184 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); | 186 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); |
185 | break; | 187 | break; |
186 | default: | 188 | default: |
187 | printk(KERN_DEBUG "Invalid PCM Controller number!"); | 189 | printk(KERN_DEBUG "Invalid PCM Controller number: %d\n", |
190 | pdev->id); | ||
188 | return -EINVAL; | 191 | return -EINVAL; |
189 | } | 192 | } |
190 | 193 | ||
@@ -333,3 +336,16 @@ void __init s3c64xx_ac97_setup_gpio(int num) | |||
333 | else | 336 | else |
334 | s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe; | 337 | s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe; |
335 | } | 338 | } |
339 | |||
340 | static u64 s3c_device_audio_dmamask = 0xffffffffUL; | ||
341 | |||
342 | struct platform_device s3c_device_pcm = { | ||
343 | .name = "s3c24xx-pcm-audio", | ||
344 | .id = -1, | ||
345 | .dev = { | ||
346 | .dma_mask = &s3c_device_audio_dmamask, | ||
347 | .coherent_dma_mask = 0xffffffffUL | ||
348 | } | ||
349 | }; | ||
350 | EXPORT_SYMBOL(s3c_device_pcm); | ||
351 | |||