Merge branch 'for-2.6.34' into for-2.6.35
Mark Brown [Mon, 22 Mar 2010 17:23:46 +0000 (17:23 +0000)]
1  2 
arch/arm/plat-omap/mcbsp.c
drivers/mfd/Kconfig
sound/soc/imx/Kconfig
sound/soc/pxa/pxa-ssp.c
sound/soc/s3c24xx/s3c64xx-i2s.c

Simple merge
Simple merge
Simple merge
@@@ -97,15 -117,14 +117,13 @@@ static int pxa_ssp_startup(struct snd_p
        int ret = 0;
  
        if (!cpu_dai->active) {
-               priv->dev.port = cpu_dai->id + 1;
-               priv->dev.irq = NO_IRQ;
-               clk_enable(priv->dev.ssp->clk);
-               ssp_disable(&priv->dev);
+               clk_enable(ssp->clk);
+               ssp_disable(ssp);
        }
  
 -      if (cpu_dai->dma_data) {
 -              kfree(cpu_dai->dma_data);
 -              cpu_dai->dma_data = NULL;
 -      }
 +      kfree(snd_soc_dai_get_dma_data(cpu_dai, substream));
 +      snd_soc_dai_set_dma_data(cpu_dai, substream, NULL);
 +
        return ret;
  }
  
@@@ -115,14 -134,17 +133,15 @@@ static void pxa_ssp_shutdown(struct snd
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
        struct ssp_priv *priv = cpu_dai->private_data;
+       struct ssp_device *ssp = priv->ssp;
  
        if (!cpu_dai->active) {
-               ssp_disable(&priv->dev);
-               clk_disable(priv->dev.ssp->clk);
+               ssp_disable(ssp);
+               clk_disable(ssp->clk);
        }
  
 -      if (cpu_dai->dma_data) {
 -              kfree(cpu_dai->dma_data);
 -              cpu_dai->dma_data = NULL;
 -      }
 +      kfree(snd_soc_dai_get_dma_data(cpu_dai, substream));
 +      snd_soc_dai_set_dma_data(cpu_dai, substream, NULL);
  }
  
  #ifdef CONFIG_PM
Simple merge