rk hdmi i2s: add I2S judgement

diff --git a/sound/soc/rk29/rk_hdmi_i2s.c b/sound/soc/rk29/rk_hdmi_i2s.c
index a41c0bd13ea3447ccd9e8475ad91499861ed1ff8..6665b2bacf8f7ba57ae92d473df636a95b50a749 100644 (file)
--- a/sound/soc/rk29/rk_hdmi_i2s.c
+++ b/sound/soc/rk29/rk_hdmi_i2s.c
@@ -82,7 +82,11 @@ static struct snd_soc_dai_link hdmi_i2s_dai = {
        .stream_name = "HDMI PCM",
        .codec_name = "hdmi-i2s",
        .platform_name = "rockchip-audio",
+#if defined(CONFIG_SND_RK29_SOC_I2S_8CH)
+       .cpu_dai_name = "rk29_i2s.0",
+#elif defined(CONFIG_SND_RK29_SOC_I2S_2CH)
        .cpu_dai_name = "rk29_i2s.1",
+#endif
        .codec_dai_name = "rk-hdmi-i2s-hifi",
        .ops = &hdmi_i2s_hifi_ops,
 };
@@ -116,7 +120,7 @@ static int __init audio_card_init(void)
                platform_device_put(hdmi_i2s_device);
                return ret;
        }
-       DBG("Enter::%s----%d 1\n",__FUNCTION__,__LINE__);
+
        hdmi_i2s_snd_device = platform_device_alloc("soc-audio", -3);
        if (!hdmi_i2s_snd_device) {
                printk("platform device allocation failed\n");

diff --git a/sound/soc/rk29/rk_rk616.c b/sound/soc/rk29/rk_rk616.c
index 2df88e397a7828a66d017ae088b564e4b9bb4639..d28362b63103f5d597d0db1c5b13664754b05684 100755 (executable)
--- a/sound/soc/rk29/rk_rk616.c
+++ b/sound/soc/rk29/rk_rk616.c
@@ -241,7 +241,11 @@ static struct snd_soc_dai_link rk_dai[] = {
                .stream_name = "RK616 PCM",\r
                .codec_name = "rk616-codec.4-0050",\r
                .platform_name = "rockchip-audio",\r
+#if defined(CONFIG_SND_RK29_SOC_I2S_8CH)\r
+               .cpu_dai_name = "rk29_i2s.0",\r
+#elif defined(CONFIG_SND_RK29_SOC_I2S_2CH)\r
                .cpu_dai_name = "rk29_i2s.1",\r
+#endif\r
                .codec_dai_name = "rk616-hifi",\r
                .init = rk616_init,\r
                .ops = &rk616_hifi_ops,\r
@@ -251,7 +255,11 @@ static struct snd_soc_dai_link rk_dai[] = {
                .stream_name = "RK616 PCM",\r
                .codec_name = "rk616-codec.4-0050",\r
                .platform_name = "rockchip-audio",\r
+#if defined(CONFIG_SND_RK29_SOC_I2S_8CH)\r
+               .cpu_dai_name = "rk29_i2s.0",\r
+#elif defined(CONFIG_SND_RK29_SOC_I2S_2CH)\r
                .cpu_dai_name = "rk29_i2s.1",\r
+#endif\r
                .codec_dai_name = "rk616-voice",\r
                .ops = &rk616_voice_ops,\r
        },\r