gistfile1.diff

diff --git a/linux-2.6/arch/arm/mach-s3c2440/mach-mini2440.c b/linux-2.6/arch/arm/mach-s3c2440/mach-mini2440.c
index 20da524..7baf3b2 100644
--- a/linux-2.6/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/linux-2.6/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -545,6 +545,12 @@ 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/linux-2.6/sound/soc/codecs/uda134x.c b/linux-2.6/sound/soc/codecs/uda134x.c
index e76847a..528aea8 100644
--- a/linux-2.6/sound/soc/codecs/uda134x.c
+++ b/linux-2.6/sound/soc/codecs/uda134x.c
@@ -27,6 +27,7 @@
 #include "uda134x.h"
 
 
+#define POWER_OFF_ON_STANDBY 1
 #define UDA134X_RATES SNDRV_PCM_RATE_8000_48000
 #define UDA134X_FORMATS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE | \
 		SNDRV_PCM_FMTBIT_S18_3LE | SNDRV_PCM_FMTBIT_S20_3LE)
@@ -486,7 +487,7 @@ 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/linux-2.6/sound/soc/samsung/dma.c b/linux-2.6/sound/soc/samsung/dma.c
index 2124019..e5f2a11 100644
--- a/linux-2.6/sound/soc/samsung/dma.c
+++ b/linux-2.6/sound/soc/samsung/dma.c
@@ -463,7 +463,7 @@ static struct snd_soc_platform_driver samsung_asoc_platform = {
 	.pcm_free	= dma_free_dma_buffers,
 };
 
-static int __devinit samsung_asoc_platform_probe(struct platform_device *pdev)
+static int samsung_asoc_platform_probe(struct platform_device *pdev)
 {
 	return snd_soc_register_platform(&pdev->dev, &samsung_asoc_platform);
 }
diff --git a/linux-2.6/sound/soc/samsung/s3c24xx_uda134x.c b/linux-2.6/sound/soc/samsung/s3c24xx_uda134x.c
index 2c09e93..86f1dc4 100644
--- a/linux-2.6/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/linux-2.6/sound/soc/samsung/s3c24xx_uda134x.c
@@ -226,7 +226,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,
@@ -321,6 +321,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");