[alsa-devel] [PATCH 2/2] ASoC: sdp4430: Fix Panda support

[Peter Ujfalusi]

Panda supposed to be using the same driver (Kconfig selects
sdp4430 for panda board as well), but due to the wrong
machine_is check the Panda board support was broken.

Fix the Panda board support, and use different card name for
the SDP4430/Panda.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi at ti.com>
---
 sound/soc/omap/sdp4430.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index eef80b5..5b633b6 100644
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -162,7 +162,6 @@ static struct snd_soc_dai_link sdp4430_dai = {
 
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_sdp4430 = {
-	.name = "SDP4430",
 	.dai_link = &sdp4430_dai,
 	.num_links = 1,
 
@@ -178,7 +177,11 @@ static int __init sdp4430_soc_init(void)
 {
 	int ret;
 
-	if (!machine_is_omap_4430sdp())
+	if (machine_is_omap_4430sdp())
+		snd_soc_sdp4430.name = "OMAP4 SDP";
+	else if (machine_is_omap4_panda())
+		snd_soc_sdp4430.name = "OMAP4 Panda";
+	else
 		return -ENODEV;
 
 	sdp4430_snd_device = platform_device_alloc("soc-audio", -1);
-- 
1.7.8.rc3