Commit a110f4ef authored by Marek Belisko's avatar Marek Belisko Committed by Mark Brown

ASoC: mini2440: Fix uda134x codec problem.

ASoC audio for mini2440 platform in current kenrel doesn't work.
First problem is samsung_asoc_dma device is missing in initialization.
Next problem is with codec. Codec is initialized but never probed
because no platform_device exist for codec driver. It leads to errors
during codec binding to asoc dai. Next problem was platform data which
was passed from board to asoc main driver but not passed to codec when
called codec_soc_probe().

Following patch should fix issues. But not sure if in correct way.
Please review.
Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent 27380fb8
...@@ -506,6 +506,11 @@ static struct i2c_board_info mini2440_i2c_devs[] __initdata = { ...@@ -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 = { static struct platform_device *mini2440_devices[] __initdata = {
&s3c_device_ohci, &s3c_device_ohci,
&s3c_device_wdt, &s3c_device_wdt,
...@@ -521,7 +526,9 @@ static struct platform_device *mini2440_devices[] __initdata = { ...@@ -521,7 +526,9 @@ static struct platform_device *mini2440_devices[] __initdata = {
&s3c_device_nand, &s3c_device_nand,
&s3c_device_sdi, &s3c_device_sdi,
&s3c_device_iis, &s3c_device_iis,
&uda1340_codec,
&mini2440_audio, &mini2440_audio,
&samsung_asoc_dma,
}; };
static void __init mini2440_map_io(void) static void __init mini2440_map_io(void)
......
...@@ -486,7 +486,8 @@ static struct snd_soc_dai_driver uda134x_dai = { ...@@ -486,7 +486,8 @@ static struct snd_soc_dai_driver uda134x_dai = {
static int uda134x_soc_probe(struct snd_soc_codec *codec) static int uda134x_soc_probe(struct snd_soc_codec *codec)
{ {
struct uda134x_priv *uda134x; 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; int ret;
printk(KERN_INFO "UDA134X SoC Audio Codec\n"); printk(KERN_INFO "UDA134X SoC Audio Codec\n");
......
...@@ -219,7 +219,7 @@ static struct snd_soc_ops s3c24xx_uda134x_ops = { ...@@ -219,7 +219,7 @@ static struct snd_soc_ops s3c24xx_uda134x_ops = {
static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
.name = "UDA134X", .name = "UDA134X",
.stream_name = "UDA134X", .stream_name = "UDA134X",
.codec_name = "uda134x-hifi", .codec_name = "uda134x-codec",
.codec_dai_name = "uda134x-hifi", .codec_dai_name = "uda134x-hifi",
.cpu_dai_name = "s3c24xx-iis", .cpu_dai_name = "s3c24xx-iis",
.ops = &s3c24xx_uda134x_ops, .ops = &s3c24xx_uda134x_ops,
...@@ -314,6 +314,7 @@ static int s3c24xx_uda134x_probe(struct platform_device *pdev) ...@@ -314,6 +314,7 @@ static int s3c24xx_uda134x_probe(struct platform_device *pdev)
platform_set_drvdata(s3c24xx_uda134x_snd_device, platform_set_drvdata(s3c24xx_uda134x_snd_device,
&snd_soc_s3c24xx_uda134x); &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); ret = platform_device_add(s3c24xx_uda134x_snd_device);
if (ret) { if (ret) {
printk(KERN_ERR "S3C24XX_UDA134X SoC Audio: Unable to add\n"); printk(KERN_ERR "S3C24XX_UDA134X SoC Audio: Unable to add\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment