add new config(CONFIG_RK616_USE_MCLK_12M) for HDMI using 12M, use fromdos correct...
author陈金泉 <chenjq@rock-chips.com>
Tue, 9 Jul 2013 03:06:36 +0000 (11:06 +0800)
committer陈金泉 <chenjq@rock-chips.com>
Tue, 9 Jul 2013 03:06:36 +0000 (11:06 +0800)
sound/soc/rk29/Kconfig
sound/soc/rk29/rk_rk616.c

index f6cf9f110cb1fbafbd6575aa4434da30b5827b19..bf7975f6f120097ddb5bd50e59303d02f167f934 100755 (executable)
@@ -74,6 +74,7 @@ choice
   bool "Set audio support for HDMI"
   default SND_RK_SOC_HDMI_I2S
        config SND_RK_SOC_HDMI_I2S
+               depends on !RK616_USE_MCLK_12M || !SND_RK_SOC_RK616
                select SND_RK29_SOC_I2S
                select SND_SOC_HDMI_I2S
                tristate  "HDMI use I2S"
index ff06fc5ab3a615fc9e13be6d9e8dd6efdc8251f0..eb69177cdd1306cf11ec1b3ce7bed7278dcc0f98 100755 (executable)
-/*\r
- * rk_rk616.c  --  SoC audio for rockchip\r
- *\r
- * Driver for rockchip rk616 audio\r
- *\r
- *  This program is free software; you can redistribute  it and/or modify it\r
- *  under  the terms of  the GNU General  Public License as published by the\r
- *  Free Software Foundation;  either version 2 of the  License, or (at your\r
- *  option) any later version.\r
- *\r
- *\r
- */\r
-\r
-#include <linux/module.h>\r
-#include <linux/device.h>\r
-#include <sound/core.h>\r
-#include <sound/pcm.h>\r
-#include <sound/soc.h>\r
-#include <sound/soc-dapm.h>\r
-#include <asm/io.h>\r
-#include <mach/hardware.h>\r
-#include "../codecs/rk616_codec.h"\r
-#include "rk29_pcm.h"\r
-#include "rk29_i2s.h"\r
-\r
-#if 1\r
-#define        DBG(x...)       printk(KERN_INFO x)\r
-#else\r
-#define        DBG(x...)\r
-#endif\r
-\r
-static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {\r
-       SND_SOC_DAPM_MIC("Mic Jack", NULL),\r
-       SND_SOC_DAPM_MIC("Headset Jack", NULL), \r
-       SND_SOC_DAPM_SPK("Ext Spk", NULL),\r
-       SND_SOC_DAPM_HP("Headphone Jack", NULL),\r
-};\r
-\r
-static const struct snd_soc_dapm_route rk_audio_map[]={\r
-\r
-       /* Mic Jack --> MIC_IN*/\r
-       {"Mic1 Bias", NULL, "Mic Jack"},\r
-       {"MIC1P", NULL, "Mic1 Bias"},\r
-       {"MIC1N", NULL, "Mic1 Bias"},\r
-\r
-       // HP MIC\r
-       {"Mic2 Bias", NULL, "Headset Jack"},\r
-       {"MIC2P", NULL, "Mic2 Bias"},\r
-       {"MIC2N", NULL, "Mic2 Bias"},\r
-\r
-       {"Ext Spk", NULL, "SPKOUTR"},\r
-       {"Ext Spk", NULL, "SPKOUTL"},\r
-\r
-       {"Headphone Jack", NULL, "HPOUTR"},\r
-       {"Headphone Jack", NULL, "HPOUTL"},\r
-} ;\r
-\r
-static const struct snd_kcontrol_new rk_controls[] = {\r
-       SOC_DAPM_PIN_SWITCH("Mic Jack"),\r
-       SOC_DAPM_PIN_SWITCH("Headset Jack"),\r
-       SOC_DAPM_PIN_SWITCH("Ext Spk"),\r
-       SOC_DAPM_PIN_SWITCH("Headphone Jack"),\r
-};\r
-\r
-static int rk616_init(struct snd_soc_pcm_runtime *rtd)\r
-{\r
-       struct snd_soc_codec *codec = rtd->codec;\r
-       struct snd_soc_dapm_context *dapm = &codec->dapm;\r
-\r
-       DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__);\r
-\r
-       snd_soc_add_controls(codec, rk_controls,\r
-                       ARRAY_SIZE(rk_controls));\r
-\r
-       /* Add specific widgets */\r
-       snd_soc_dapm_new_controls(dapm, rk_dapm_widgets,\r
-                                 ARRAY_SIZE(rk_dapm_widgets));\r
-       /* Set up specific audio path audio_mapnects */\r
-       snd_soc_dapm_add_routes(dapm, rk_audio_map, ARRAY_SIZE(rk_audio_map));\r
-\r
-       snd_soc_dapm_enable_pin(dapm, "Mic Jack");\r
-       snd_soc_dapm_enable_pin(dapm, "Headset Jack");\r
-       snd_soc_dapm_enable_pin(dapm, "Ext Spk");\r
-       snd_soc_dapm_enable_pin(dapm, "Headphone Jack");\r
-\r
-       snd_soc_dapm_sync(dapm);\r
-\r
-       return 0;\r
-}\r
-\r
-void rk_hifi_shutdown(struct snd_pcm_substream *substream)\r
-{\r
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;\r
-       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;\r
-\r
-       snd_soc_dai_set_sysclk(cpu_dai, 0, 12000000, 0);\r
-}\r
-\r
-static int rk_hifi_hw_params(struct snd_pcm_substream *substream,\r
-       struct snd_pcm_hw_params *params)\r
-{\r
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;\r
-       struct snd_soc_dai *codec_dai = rtd->codec_dai;\r
-       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;\r
-       unsigned int pll_out = 0;\r
-       int ret;\r
-\r
-       DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__);\r
-\r
-       #if defined(CONFIG_SND_RK_SOC_SPDIF)\r
-       /* MCLK must be 12M when HDMI is in */\r
-       if (get_hdmi_state()) {\r
-               DBG("%s : HDMI is in, do not set sys clk\n",__FUNCTION__);\r
-               return 0;\r
-       }\r
-       #endif\r
-\r
-       /* set codec DAI configuration */\r
-       #if defined (CONFIG_SND_RK29_CODEC_SOC_SLAVE) \r
-\r
-       ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |\r
-                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);\r
-       #endif  \r
-       #if defined (CONFIG_SND_RK29_CODEC_SOC_MASTER) \r
-\r
-       ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |\r
-                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM ); \r
-       #endif\r
-       if (ret < 0)\r
-               return ret;\r
-\r
-       /* set cpu DAI configuration */\r
-       #if defined (CONFIG_SND_RK29_CODEC_SOC_SLAVE) \r
-       ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |\r
-                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);\r
-       #endif  \r
-       #if defined (CONFIG_SND_RK29_CODEC_SOC_MASTER)\r
-       ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |\r
-                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);\r
-       #endif\r
-       if (ret < 0)\r
-               return ret;\r
-\r
-       switch(params_rate(params)) {\r
-               case 8000:\r
-               case 16000:\r
-               case 24000:\r
-               case 32000:\r
-               case 48000:\r
-                       pll_out = 12288000;\r
-                       break;\r
-               case 11025:\r
-               case 22050:\r
-               case 44100:\r
-                       pll_out = 11289600;\r
-                       break;\r
-               default:\r
-                       DBG("Enter:%s, %d, Error rate=%d\n", __FUNCTION__, __LINE__, params_rate(params));\r
-                       return -EINVAL;\r
-                       break;\r
-       }\r
-\r
-       DBG("Enter:%s, %d, rate=%d\n", __FUNCTION__, __LINE__, params_rate(params));\r
-\r
-       /*Set the system clk for codec*/\r
-       ret = snd_soc_dai_set_sysclk(codec_dai, 0, pll_out, SND_SOC_CLOCK_IN);\r
-       if (ret < 0) {\r
-               DBG("rk_hifi_hw_params:failed to set the sysclk for codec side\n"); \r
-               return ret;\r
-       }\r
-\r
-       snd_soc_dai_set_sysclk(cpu_dai, 0, pll_out, 0);\r
-       snd_soc_dai_set_clkdiv(cpu_dai, ROCKCHIP_DIV_BCLK, (pll_out/4)/params_rate(params)-1);\r
-       snd_soc_dai_set_clkdiv(cpu_dai, ROCKCHIP_DIV_MCLK, 3);\r
-\r
-       DBG("Enter:%s, %d, pll_out/4/params_rate(params) = %d \n", __FUNCTION__, __LINE__, (pll_out/4)/params_rate(params));\r
\r
-       return 0;\r
-}\r
-\r
-static int rk_voice_hw_params(struct snd_pcm_substream *substream,\r
-       struct snd_pcm_hw_params *params)\r
-{\r
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;\r
-       struct snd_soc_dai *codec_dai = rtd->codec_dai;\r
-       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;\r
-       unsigned int pll_out = 0;\r
-       int ret;\r
-\r
-       DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__);\r
-\r
-       /* MCLK must be 12M when HDMI is in */\r
-       #if defined(CONFIG_SND_RK_SOC_SPDIF)\r
-       if (get_hdmi_state()) {\r
-               DBG("%s : HDMI is in, do not set sys clk\n",__FUNCTION__);\r
-               return 0;\r
-       }\r
-       #endif\r
-\r
-       /* set codec DAI configuration */\r
-       ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_A |\r
-                               SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS);\r
-\r
-       switch(params_rate(params)) {\r
-               case 8000:\r
-               case 16000:\r
-               case 24000:\r
-               case 32000:\r
-               case 48000:\r
-                       pll_out = 12288000;\r
-                       break;\r
-               case 11025:\r
-               case 22050:\r
-               case 44100:\r
-                       pll_out = 11289600;\r
-                       break;\r
-               default:\r
-                       DBG("Enter:%s, %d, Error rate=%d\n", __FUNCTION__, __LINE__, params_rate(params));\r
-                       return -EINVAL;\r
-                       break;\r
-       }\r
-\r
-       //snd_soc_dai_set_pll(codec_dai, RT5625_PLL_MCLK_TO_VSYSCLK, 0, pll_out, 24576000);\r
-\r
-       /*Set the system clk for codec*/\r
-       ret = snd_soc_dai_set_sysclk(codec_dai, 0, pll_out, SND_SOC_CLOCK_IN);\r
-\r
-       if (ret < 0) {\r
-               printk("rk_voice_hw_params:failed to set the sysclk for codec side\n");\r
-               return ret;\r
-       }\r
-\r
-       ret = snd_soc_dai_set_sysclk(cpu_dai, 0, pll_out, 0);\r
-\r
-       return 0;\r
-}\r
-\r
-static struct snd_soc_ops rk616_hifi_ops = {\r
-       .shutdown = rk_hifi_shutdown,\r
-       .hw_params = rk_hifi_hw_params,\r
-};\r
-\r
-static struct snd_soc_ops rk616_voice_ops = {\r
-       .hw_params = rk_voice_hw_params,\r
-};\r
-\r
-static struct snd_soc_dai_link rk_dai[] = {\r
-       {\r
-               .name = "RK616 I2S1",\r
-               .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
-       },\r
-       {\r
-               .name = "RK616 I2S2",\r
-               .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
-};\r
-\r
-static struct snd_soc_card snd_soc_card_rk = {\r
-       .name = "RK_RK616",\r
-       .dai_link = rk_dai,\r
-       .num_links = 2,\r
-};\r
-\r
-static struct platform_device *rk_snd_device;\r
-\r
-static int __init audio_card_init(void)\r
-{\r
-       int ret =0;\r
-\r
-       DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__);\r
-\r
-       rk_snd_device = platform_device_alloc("soc-audio", -1);\r
-       if (!rk_snd_device) {\r
-                 printk("platform device allocation failed\n");\r
-                 return -ENOMEM;\r
-       }\r
-\r
-       platform_set_drvdata(rk_snd_device, &snd_soc_card_rk);\r
-       ret = platform_device_add(rk_snd_device);\r
-       if (ret) {\r
-               printk("platform device add failed\n");\r
-\r
-               platform_device_put(rk_snd_device);\r
-               return ret;\r
-       }\r
-\r
-        return ret;\r
-}\r
-\r
-static void __exit audio_card_exit(void)\r
-{\r
-       platform_device_unregister(rk_snd_device);\r
-}\r
-\r
-module_init(audio_card_init);\r
-module_exit(audio_card_exit);\r
-/* Module information */\r
-MODULE_AUTHOR("rockchip");\r
-MODULE_DESCRIPTION("ROCKCHIP i2s ASoC Interface");\r
-MODULE_LICENSE("GPL");\r
+/*
+ * rk_rk616.c  --  SoC audio for rockchip
+ *
+ * Driver for rockchip rk616 audio
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <asm/io.h>
+#include <mach/hardware.h>
+#include "../codecs/rk616_codec.h"
+#include "rk29_pcm.h"
+#include "rk29_i2s.h"
+
+#if 1
+#define        DBG(x...)       printk(KERN_INFO x)
+#else
+#define        DBG(x...)
+#endif
+
+static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {
+       SND_SOC_DAPM_MIC("Mic Jack", NULL),
+       SND_SOC_DAPM_MIC("Headset Jack", NULL),
+       SND_SOC_DAPM_SPK("Ext Spk", NULL),
+       SND_SOC_DAPM_HP("Headphone Jack", NULL),
+};
+
+static const struct snd_soc_dapm_route rk_audio_map[]={
+
+       /* Mic Jack --> MIC_IN*/
+       {"Mic1 Bias", NULL, "Mic Jack"},
+       {"MIC1P", NULL, "Mic1 Bias"},
+       {"MIC1N", NULL, "Mic1 Bias"},
+
+       // HP MIC
+       {"Mic2 Bias", NULL, "Headset Jack"},
+       {"MIC2P", NULL, "Mic2 Bias"},
+       {"MIC2N", NULL, "Mic2 Bias"},
+
+       {"Ext Spk", NULL, "SPKOUTR"},
+       {"Ext Spk", NULL, "SPKOUTL"},
+
+       {"Headphone Jack", NULL, "HPOUTR"},
+       {"Headphone Jack", NULL, "HPOUTL"},
+} ;
+
+static const struct snd_kcontrol_new rk_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Mic Jack"),
+       SOC_DAPM_PIN_SWITCH("Headset Jack"),
+       SOC_DAPM_PIN_SWITCH("Ext Spk"),
+       SOC_DAPM_PIN_SWITCH("Headphone Jack"),
+};
+
+static int rk616_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_codec *codec = rtd->codec;
+       struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+       DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__);
+
+       snd_soc_add_controls(codec, rk_controls,
+                       ARRAY_SIZE(rk_controls));
+
+       /* Add specific widgets */
+       snd_soc_dapm_new_controls(dapm, rk_dapm_widgets,
+                                 ARRAY_SIZE(rk_dapm_widgets));
+       /* Set up specific audio path audio_mapnects */
+       snd_soc_dapm_add_routes(dapm, rk_audio_map, ARRAY_SIZE(rk_audio_map));
+
+       snd_soc_dapm_enable_pin(dapm, "Mic Jack");
+       snd_soc_dapm_enable_pin(dapm, "Headset Jack");
+       snd_soc_dapm_enable_pin(dapm, "Ext Spk");
+       snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+
+       snd_soc_dapm_sync(dapm);
+
+       return 0;
+}
+
+static int rk_hifi_hw_params(struct snd_pcm_substream *substream,
+       struct snd_pcm_hw_params *params)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+       unsigned int pll_out = 0;
+       int ret;
+
+       DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__);
+
+       /* set codec DAI configuration */
+       #if defined (CONFIG_SND_RK29_CODEC_SOC_SLAVE)
+
+       ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
+                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
+       #endif
+       #if defined (CONFIG_SND_RK29_CODEC_SOC_MASTER)
+
+       ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
+                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM );
+       #endif
+       if (ret < 0)
+               return ret;
+
+       /* set cpu DAI configuration */
+       #if defined (CONFIG_SND_RK29_CODEC_SOC_SLAVE)
+       ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
+                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
+       #endif
+       #if defined (CONFIG_SND_RK29_CODEC_SOC_MASTER)
+       ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
+                       SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
+       #endif
+       if (ret < 0)
+               return ret;
+
+       switch(params_rate(params)) {
+               case 8000:
+               case 16000:
+               case 24000:
+               case 32000:
+               case 48000:
+                       pll_out = 12288000;
+                       break;
+               case 11025:
+               case 22050:
+               case 44100:
+                       pll_out = 11289600;
+                       break;
+               default:
+                       DBG("Enter:%s, %d, Error rate=%d\n", __FUNCTION__, __LINE__, params_rate(params));
+                       return -EINVAL;
+                       break;
+       }
+
+       #if defined(CONFIG_RK616_USE_MCLK_12M)
+       /* MCLK must be 12M when HDMI is in */
+       if (get_hdmi_state() && pll_out != 12000000) {
+               DBG("%s : HDMI is in, don't set sys clk\n",__FUNCTION__);
+               return 0;
+       }
+       #endif
+
+       DBG("Enter:%s, %d, rate=%d\n", __FUNCTION__, __LINE__, params_rate(params));
+
+       /*Set the system clk for codec*/
+       ret = snd_soc_dai_set_sysclk(codec_dai, 0, pll_out, SND_SOC_CLOCK_IN);
+       if (ret < 0) {
+               DBG("rk_hifi_hw_params:failed to set the sysclk for codec side\n");
+               return ret;
+       }
+
+       snd_soc_dai_set_sysclk(cpu_dai, 0, pll_out, 0);
+       snd_soc_dai_set_clkdiv(cpu_dai, ROCKCHIP_DIV_BCLK, (pll_out/4)/params_rate(params)-1);
+       snd_soc_dai_set_clkdiv(cpu_dai, ROCKCHIP_DIV_MCLK, 3);
+
+       DBG("Enter:%s, %d, pll_out/4/params_rate(params) = %d \n", __FUNCTION__, __LINE__, (pll_out/4)/params_rate(params));
+
+       return 0;
+}
+
+static int rk_voice_hw_params(struct snd_pcm_substream *substream,
+       struct snd_pcm_hw_params *params)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+       unsigned int pll_out = 0;
+       int ret;
+
+       DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__);
+
+       /* set codec DAI configuration */
+       ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_A |
+                               SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS);
+
+       switch(params_rate(params)) {
+               case 8000:
+               case 16000:
+               case 24000:
+               case 32000:
+               case 48000:
+                       pll_out = 12288000;
+                       break;
+               case 11025:
+               case 22050:
+               case 44100:
+                       pll_out = 11289600;
+                       break;
+               default:
+                       DBG("Enter:%s, %d, Error rate=%d\n", __FUNCTION__, __LINE__, params_rate(params));
+                       return -EINVAL;
+                       break;
+       }
+
+       /* MCLK must be 12M when HDMI is in */
+       #if defined(CONFIG_RK616_USE_MCLK_12M)
+       if (get_hdmi_state() && pll_out != 12000000) {
+               DBG("%s : HDMI is in, don't set sys clk\n",__FUNCTION__);
+               return 0;
+       }
+       #endif
+
+       //snd_soc_dai_set_pll(codec_dai, RT5625_PLL_MCLK_TO_VSYSCLK, 0, pll_out, 24576000);
+
+       /*Set the system clk for codec*/
+       ret = snd_soc_dai_set_sysclk(codec_dai, 0, pll_out, SND_SOC_CLOCK_IN);
+
+       if (ret < 0) {
+               printk("rk_voice_hw_params:failed to set the sysclk for codec side\n");
+               return ret;
+       }
+
+       ret = snd_soc_dai_set_sysclk(cpu_dai, 0, pll_out, 0);
+
+       return 0;
+}
+
+static struct snd_soc_ops rk616_hifi_ops = {
+       .hw_params = rk_hifi_hw_params,
+};
+
+static struct snd_soc_ops rk616_voice_ops = {
+       .hw_params = rk_voice_hw_params,
+};
+
+static struct snd_soc_dai_link rk_dai[] = {
+       {
+               .name = "RK616 I2S1",
+               .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,
+       },
+       {
+               .name = "RK616 I2S2",
+               .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,
+       },
+};
+
+static struct snd_soc_card snd_soc_card_rk = {
+       .name = "RK_RK616",
+       .dai_link = rk_dai,
+       .num_links = 2,
+};
+
+static struct platform_device *rk_snd_device;
+
+static int __init audio_card_init(void)
+{
+       int ret =0;
+
+       DBG("Enter::%s----%d\n",__FUNCTION__,__LINE__);
+
+       rk_snd_device = platform_device_alloc("soc-audio", -1);
+       if (!rk_snd_device) {
+                 printk("platform device allocation failed\n");
+                 return -ENOMEM;
+       }
+
+       platform_set_drvdata(rk_snd_device, &snd_soc_card_rk);
+       ret = platform_device_add(rk_snd_device);
+       if (ret) {
+               printk("platform device add failed\n");
+
+               platform_device_put(rk_snd_device);
+               return ret;
+       }
+
+        return ret;
+}
+
+static void __exit audio_card_exit(void)
+{
+       platform_device_unregister(rk_snd_device);
+}
+
+module_init(audio_card_init);
+module_exit(audio_card_exit);
+/* Module information */
+MODULE_AUTHOR("rockchip");
+MODULE_DESCRIPTION("ROCKCHIP i2s ASoC Interface");
+MODULE_LICENSE("GPL");