Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...

[net-next-2.6.git] / arch / arm / mach-s3c64xx / dev-audio.c

diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c
index e4bb02395d9e2a26673e636c80840e4a34773071..76426a32c013947aabffafc97d22b68efe63e54b 100644 (file)
--- a/arch/arm/mach-s3c64xx/dev-audio.c
+++ b/arch/arm/mach-s3c64xx/dev-audio.c
@@ -34,7 +34,8 @@ static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev)
                base = S3C64XX_GPE(0);
                break;
        default:
-               printk(KERN_DEBUG "Invalid I2S Controller number!");
+               printk(KERN_DEBUG "Invalid I2S Controller number: %d\n",
+                       pdev->id);
                return -EINVAL;
        }
 
@@ -48,7 +49,7 @@ static int s3c64xx_i2sv4_cfg_gpio(struct platform_device *pdev)
        s3c_gpio_cfgpin(S3C64XX_GPC(4), S3C_GPIO_SFN(5));
        s3c_gpio_cfgpin(S3C64XX_GPC(5), S3C_GPIO_SFN(5));
        s3c_gpio_cfgpin(S3C64XX_GPC(7), S3C_GPIO_SFN(5));
-       s3c_gpio_cfgpin_range(S3C64XX_GPH(6), 4, S3C_GPIO_SFN(4));
+       s3c_gpio_cfgpin_range(S3C64XX_GPH(6), 4, S3C_GPIO_SFN(5));
 
        return 0;
 }
@@ -167,7 +168,8 @@ static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev)
                base = S3C64XX_GPE(0);
                break;
        default:
-               printk(KERN_DEBUG "Invalid PCM Controller number!");
+               printk(KERN_DEBUG "Invalid PCM Controller number: %d\n",
+                       pdev->id);
                return -EINVAL;
        }
 
@@ -305,3 +307,16 @@ void __init s3c64xx_ac97_setup_gpio(int num)
        else
                s3c_ac97_pdata.cfg_gpio = s3c64xx_ac97_cfg_gpe;
 }
+
+static u64 s3c_device_audio_dmamask = 0xffffffffUL;
+
+struct platform_device s3c_device_pcm = {
+       .name             = "s3c24xx-pcm-audio",
+       .id               = -1,
+       .dev              = {
+               .dma_mask = &s3c_device_audio_dmamask,
+               .coherent_dma_mask = 0xffffffffUL
+       }
+};
+EXPORT_SYMBOL(s3c_device_pcm);
+