shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk hdmi i2s: add I2S judgement

Browse Source
This commit is contained in:
陈金泉
2013-07-02 16:47:48 +08:00
parent 590a98edfe
commit 95ebffb4bf
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/rk29/rk_hdmi_i2s.c
View File

@@ -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");

8
sound/soc/rk29/rk_rk616.c
View File

@@ -241,7 +241,11 @@ static struct snd_soc_dai_link rk_dai[] = {
.stream_name = "RK616 PCM",
.codec_name = "rk616-codec.4-0050",
.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 = "rk616-hifi",
.init = rk616_init,
.ops = &rk616_hifi_ops,
@@ -251,7 +255,11 @@ static struct snd_soc_dai_link rk_dai[] = {
.stream_name = "RK616 PCM",
.codec_name = "rk616-codec.4-0050",
.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 = "rk616-voice",
.ops = &rk616_voice_ops,
},