3 files changed, 11 insertions, 2 deletions

diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
index f62bb4c793bd..7c3fb071ddd6 100644
--- a/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -506,6 +506,11 @@ static struct i2c_board_info mini2440_i2c_devs[] __initdata = {
         },
 };
 
+static struct platform_device uda1340_codec = {
+                .name = "uda134x-codec",
+                .id = -1,
+};
+
 static struct platform_device *mini2440_devices[] __initdata = {
         &s3c_device_ohci,
         &s3c_device_wdt,
@@ -521,7 +526,9 @@ static struct platform_device *mini2440_devices[] __initdata = {
         &s3c_device_nand,
         &s3c_device_sdi,
         &s3c_device_iis,
+        &uda1340_codec,
         &mini2440_audio,
+        &samsung_asoc_dma,
 };
 
 static void __init mini2440_map_io(void)
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index e76847a9438b..48ffd406a71d 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -486,7 +486,8 @@ static struct snd_soc_dai_driver uda134x_dai = {
 static int uda134x_soc_probe(struct snd_soc_codec *codec)
 {
         struct uda134x_priv *uda134x;
-        struct uda134x_platform_data *pd = dev_get_drvdata(codec->card->dev);
+        struct uda134x_platform_data *pd = codec->card->dev->platform_data;
+
         int ret;
 
         printk(KERN_INFO "UDA134X SoC Audio Codec\n");
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c
index 3cb700751078..dc9d551f6788 100644
--- a/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/sound/soc/samsung/s3c24xx_uda134x.c
@@ -219,7 +219,7 @@ static struct snd_soc_ops s3c24xx_uda134x_ops = {
 static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
         .name = "UDA134X",
         .stream_name = "UDA134X",
-        .codec_name = "uda134x-hifi",
+        .codec_name = "uda134x-codec",
         .codec_dai_name = "uda134x-hifi",
         .cpu_dai_name = "s3c24xx-iis",
         .ops = &s3c24xx_uda134x_ops,
@@ -314,6 +314,7 @@ static int s3c24xx_uda134x_probe(struct platform_device *pdev)
 
         platform_set_drvdata(s3c24xx_uda134x_snd_device,
                              &snd_soc_s3c24xx_uda134x);
+        platform_device_add_data(s3c24xx_uda134x_snd_device, &s3c24xx_uda134x, sizeof(s3c24xx_uda134x));
         ret = platform_device_add(s3c24xx_uda134x_snd_device);
         if (ret) {
                 printk(KERN_ERR "S3C24XX_UDA134X SoC Audio: Unable to add\n");