ASoC: OMAP: Update contact addresses

[pandora-kernel.git] / sound / soc / omap / osk5912.c

diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index 0fe7337..a4e149b 100644 (file)
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -61,8 +61,8 @@ static int osk_hw_params(struct snd_pcm_substream *substream,
 
        /* Set codec DAI configuration */
        err = snd_soc_dai_set_fmt(codec_dai,
-                                 SND_SOC_DAIFMT_DSP_A |
-                                 SND_SOC_DAIFMT_NB_IF |
+                                 SND_SOC_DAIFMT_DSP_B |
+                                 SND_SOC_DAIFMT_NB_NF |
                                  SND_SOC_DAIFMT_CBM_CFM);
        if (err < 0) {
                printk(KERN_ERR "can't set codec DAI configuration\n");
@@ -71,8 +71,8 @@ static int osk_hw_params(struct snd_pcm_substream *substream,
 
        /* Set cpu DAI configuration */
        err = snd_soc_dai_set_fmt(cpu_dai,
-                                 SND_SOC_DAIFMT_DSP_A |
-                                 SND_SOC_DAIFMT_NB_IF |
+                                 SND_SOC_DAIFMT_DSP_B |
+                                 SND_SOC_DAIFMT_NB_NF |
                                  SND_SOC_DAIFMT_CBM_CFM);
        if (err < 0) {
                printk(KERN_ERR "can't set cpu DAI configuration\n");
@@ -143,16 +143,16 @@ static struct snd_soc_dai_link osk_dai = {
 };
 
 /* Audio machine driver */
-static struct snd_soc_machine snd_soc_machine_osk = {
+static struct snd_soc_card snd_soc_card_osk = {
        .name = "OSK5912",
+       .platform = &omap_soc_platform,
        .dai_link = &osk_dai,
        .num_links = 1,
 };
 
 /* Audio subsystem */
 static struct snd_soc_device osk_snd_devdata = {
-       .machine = &snd_soc_machine_osk,
-       .platform = &omap_soc_platform,
+       .card = &snd_soc_card_osk,
        .codec_dev = &soc_codec_dev_tlv320aic23,
 };
 
@@ -186,13 +186,6 @@ static int __init osk_soc_init(void)
                return -ENODEV;
        }
 
-       if (clk_get_usecount(tlv320aic23_mclk) > 0) {
-               /* MCLK is already in use */
-               printk(KERN_WARNING
-                      "MCLK in use at %d Hz. We change it to %d Hz\n",
-                      (uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK);
-       }
-
        /*
         * Configure 12 MHz output on MCLK.
         */
@@ -205,9 +198,8 @@ static int __init osk_soc_init(void)
                }
        }
 
-       printk(KERN_INFO "MCLK = %d [%d], usecount = %d\n",
-              (uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK,
-              clk_get_usecount(tlv320aic23_mclk));
+       printk(KERN_INFO "MCLK = %d [%d]\n",
+              (uint) clk_get_rate(tlv320aic23_mclk), CODEC_CLOCK);
 
        return 0;
 err1: