8 files changed, 64 insertions, 58 deletions

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index bc21944851c4..863367ad89ce 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -45,10 +45,8 @@
 static int corgi_jack_func;
 static int corgi_spk_func;
 
-static void corgi_ext_control(struct snd_soc_codec *codec)
+static void corgi_ext_control(struct snd_soc_dapm_context *dapm)
 {
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
         /* set up jack connection */
         switch (corgi_jack_func) {
         case CORGI_HP:
@@ -104,7 +102,7 @@ static int corgi_startup(struct snd_pcm_substream *substream)
         mutex_lock(&codec->mutex);
 
         /* check the jack status at stream startup */
-        corgi_ext_control(codec);
+        corgi_ext_control(&codec->dapm);
 
         mutex_unlock(&codec->mutex);
 
@@ -173,13 +171,13 @@ static int corgi_get_jack(struct snd_kcontrol *kcontrol,
 static int corgi_set_jack(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
 
         if (corgi_jack_func == ucontrol->value.integer.value[0])
                 return 0;
 
         corgi_jack_func = ucontrol->value.integer.value[0];
-        corgi_ext_control(codec);
+        corgi_ext_control(&card->dapm);
         return 1;
 }
 
@@ -193,13 +191,13 @@ static int corgi_get_spk(struct snd_kcontrol *kcontrol,
 static int corgi_set_spk(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+        struct snd_soc_card *card =  snd_kcontrol_chip(kcontrol);
 
         if (corgi_spk_func == ucontrol->value.integer.value[0])
                 return 0;
 
         corgi_spk_func = ucontrol->value.integer.value[0];
-        corgi_ext_control(codec);
+        corgi_ext_control(&card->dapm);
         return 1;
 }
 
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 3f7a8ecb9720..aace19e0fe2c 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -411,7 +411,7 @@ static int magician_uda1380_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "VINR");
 
         /* Add magician specific controls */
-        err = snd_soc_add_controls(codec, uda1380_magician_controls,
+        err = snd_soc_add_codec_controls(codec, uda1380_magician_controls,
                                 ARRAY_SIZE(uda1380_magician_controls));
         if (err < 0)
                 return err;
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index fd0ed10c6fe7..d2cc81735036 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -43,10 +43,8 @@
 static int poodle_jack_func;
 static int poodle_spk_func;
 
-static void poodle_ext_control(struct snd_soc_codec *codec)
+static void poodle_ext_control(struct snd_soc_dapm_context *dapm)
 {
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
         /* set up jack connection */
         if (poodle_jack_func == POODLE_HP) {
                 /* set = unmute headphone */
@@ -81,7 +79,7 @@ static int poodle_startup(struct snd_pcm_substream *substream)
         mutex_lock(&codec->mutex);
 
         /* check the jack status at stream startup */
-        poodle_ext_control(codec);
+        poodle_ext_control(&codec->dapm);
 
         mutex_unlock(&codec->mutex);
 
@@ -152,13 +150,13 @@ static int poodle_get_jack(struct snd_kcontrol *kcontrol,
 static int poodle_set_jack(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+        struct snd_soc_card *card =  snd_kcontrol_chip(kcontrol);
 
         if (poodle_jack_func == ucontrol->value.integer.value[0])
                 return 0;
 
         poodle_jack_func = ucontrol->value.integer.value[0];
-        poodle_ext_control(codec);
+        poodle_ext_control(&card->dapm);
         return 1;
 }
 
@@ -172,13 +170,13 @@ static int poodle_get_spk(struct snd_kcontrol *kcontrol,
 static int poodle_set_spk(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+        struct snd_soc_card *card =  snd_kcontrol_chip(kcontrol);
 
         if (poodle_spk_func == ucontrol->value.integer.value[0])
                 return 0;
 
         poodle_spk_func = ucontrol->value.integer.value[0];
-        poodle_ext_control(codec);
+        poodle_ext_control(&card->dapm);
         return 1;
 }
 
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index a57cfbc038e3..fd04ce139031 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -668,6 +668,38 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
         return 0;
 }
 
+static void pxa_ssp_set_running_bit(struct snd_pcm_substream *substream,
+                                    struct ssp_device *ssp, int value)
+{
+        uint32_t sscr0 = pxa_ssp_read_reg(ssp, SSCR0);
+        uint32_t sscr1 = pxa_ssp_read_reg(ssp, SSCR1);
+        uint32_t sspsp = pxa_ssp_read_reg(ssp, SSPSP);
+        uint32_t sssr = pxa_ssp_read_reg(ssp, SSSR);
+
+        if (value && (sscr0 & SSCR0_SSE))
+                pxa_ssp_write_reg(ssp, SSCR0, sscr0 & ~SSCR0_SSE);
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                if (value)
+                        sscr1 |= SSCR1_TSRE;
+                else
+                        sscr1 &= ~SSCR1_TSRE;
+        } else {
+                if (value)
+                        sscr1 |= SSCR1_RSRE;
+                else
+                        sscr1 &= ~SSCR1_RSRE;
+        }
+
+        pxa_ssp_write_reg(ssp, SSCR1, sscr1);
+
+        if (value) {
+                pxa_ssp_write_reg(ssp, SSSR, sssr);
+                pxa_ssp_write_reg(ssp, SSPSP, sspsp);
+                pxa_ssp_write_reg(ssp, SSCR0, sscr0 | SSCR0_SSE);
+        }
+}
+
 static int pxa_ssp_trigger(struct snd_pcm_substream *substream, int cmd,
                            struct snd_soc_dai *cpu_dai)
 {
@@ -681,42 +713,21 @@ static int pxa_ssp_trigger(struct snd_pcm_substream *substream, int cmd,
                 pxa_ssp_enable(ssp);
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                val = pxa_ssp_read_reg(ssp, SSCR1);
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                        val |= SSCR1_TSRE;
-                else
-                        val |= SSCR1_RSRE;
-                pxa_ssp_write_reg(ssp, SSCR1, val);
+                pxa_ssp_set_running_bit(substream, ssp, 1);
                 val = pxa_ssp_read_reg(ssp, SSSR);
                 pxa_ssp_write_reg(ssp, SSSR, val);
                 break;
         case SNDRV_PCM_TRIGGER_START:
-                val = pxa_ssp_read_reg(ssp, SSCR1);
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                        val |= SSCR1_TSRE;
-                else
-                        val |= SSCR1_RSRE;
-                pxa_ssp_write_reg(ssp, SSCR1, val);
-                pxa_ssp_enable(ssp);
+                pxa_ssp_set_running_bit(substream, ssp, 1);
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
-                val = pxa_ssp_read_reg(ssp, SSCR1);
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                        val &= ~SSCR1_TSRE;
-                else
-                        val &= ~SSCR1_RSRE;
-                pxa_ssp_write_reg(ssp, SSCR1, val);
+                pxa_ssp_set_running_bit(substream, ssp, 0);
                 break;
         case SNDRV_PCM_TRIGGER_SUSPEND:
                 pxa_ssp_disable(ssp);
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                val = pxa_ssp_read_reg(ssp, SSCR1);
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                        val &= ~SSCR1_TSRE;
-                else
-                        val &= ~SSCR1_RSRE;
-                pxa_ssp_write_reg(ssp, SSCR1, val);
+                pxa_ssp_set_running_bit(substream, ssp, 0);
                 break;
 
         default:
@@ -764,7 +775,8 @@ static int pxa_ssp_remove(struct snd_soc_dai *dai)
 
 #define PXA_SSP_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
                           SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \
-                          SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | \
+                          SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
+                          SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | \
                           SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
 
 #define PXA_SSP_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 837ff341fd6d..4800d5fe568d 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -103,7 +103,7 @@ static int pxa2xx_ac97_resume(struct snd_soc_dai *dai)
 #define pxa2xx_ac97_resume      NULL
 #endif
 
-static int pxa2xx_ac97_probe(struct snd_soc_dai *dai)
+static int __devinit pxa2xx_ac97_probe(struct snd_soc_dai *dai)
 {
         return pxa2xx_ac97_hw_probe(to_platform_device(dai->dev));
 }
@@ -179,7 +179,7 @@ static const struct snd_soc_dai_ops pxa_ac97_mic_dai_ops = {
  * There is only 1 physical AC97 interface for pxa2xx, but it
  * has extra fifo's that can be used for aux DACs and ADCs.
  */
-static struct snd_soc_dai_driver pxa_ac97_dai[] = {
+static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = {
 {
         .name = "pxa2xx-ac97",
         .ac97_control = 1,
@@ -244,13 +244,13 @@ static __devinit int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
          * driver to do interesting things with the clocking to get us up
          * and running.
          */
-        return snd_soc_register_dais(&pdev->dev, pxa_ac97_dai,
-                        ARRAY_SIZE(pxa_ac97_dai));
+        return snd_soc_register_dais(&pdev->dev, pxa_ac97_dai_driver,
+                        ARRAY_SIZE(pxa_ac97_dai_driver));
 }
 
 static int __devexit pxa2xx_ac97_dev_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(pxa_ac97_dai));
+        snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(pxa_ac97_dai_driver));
         return 0;
 }
 
diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c
index ba1545188ec6..083706595495 100644
--- a/sound/soc/pxa/raumfeld.c
+++ b/sound/soc/pxa/raumfeld.c
@@ -232,7 +232,7 @@ static struct snd_soc_ops raumfeld_ak4104_ops = {
         .cpu_dai_name   = "pxa-ssp-dai.0",              \
         .platform_name  = "pxa-pcm-audio",              \
         .codec_dai_name = "cs4270-hifi",                \
-        .codec_name     = "cs4270-codec.0-0048",        \
+        .codec_name     = "cs4270.0-0048",      \
         .ops            = &raumfeld_cs4270_ops,         \
 }
 
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 90c5245c4742..fc052d8247ff 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -44,10 +44,8 @@ static int spitz_jack_func;
 static int spitz_spk_func;
 static int spitz_mic_gpio;
 
-static void spitz_ext_control(struct snd_soc_codec *codec)
+static void spitz_ext_control(struct snd_soc_dapm_context *dapm)
 {
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
         if (spitz_spk_func == SPITZ_SPK_ON)
                 snd_soc_dapm_enable_pin(dapm, "Ext Spk");
         else
@@ -113,7 +111,7 @@ static int spitz_startup(struct snd_pcm_substream *substream)
         mutex_lock(&codec->mutex);
 
         /* check the jack status at stream startup */
-        spitz_ext_control(codec);
+        spitz_ext_control(&codec->dapm);
 
         mutex_unlock(&codec->mutex);
 
@@ -173,13 +171,13 @@ static int spitz_get_jack(struct snd_kcontrol *kcontrol,
 static int spitz_set_jack(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
 
         if (spitz_jack_func == ucontrol->value.integer.value[0])
                 return 0;
 
         spitz_jack_func = ucontrol->value.integer.value[0];
-        spitz_ext_control(codec);
+        spitz_ext_control(&card->dapm);
         return 1;
 }
 
@@ -193,13 +191,13 @@ static int spitz_get_spk(struct snd_kcontrol *kcontrol,
 static int spitz_set_spk(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+        struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
 
         if (spitz_spk_func == ucontrol->value.integer.value[0])
                 return 0;
 
         spitz_spk_func = ucontrol->value.integer.value[0];
-        spitz_ext_control(codec);
+        spitz_ext_control(&card->dapm);
         return 1;
 }
 
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 564ef08a89f2..2aec63f3706a 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -197,7 +197,7 @@ static int tosa_ac97_init(struct snd_soc_pcm_runtime *rtd)
         snd_soc_dapm_nc_pin(dapm, "MONOOUT");
 
         /* add tosa specific controls */
-        err = snd_soc_add_controls(codec, tosa_controls,
+        err = snd_soc_add_codec_controls(codec, tosa_controls,
                                 ARRAY_SIZE(tosa_controls));
         if (err < 0)
                 return err;