12 files changed, 21 insertions, 157 deletions

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 2434b6d61675..39cea80846c3 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -140,7 +140,7 @@ config SND_PXA910_SOC
           Marvell PXA910 reference platform.
 
 config SND_SOC_TTC_DKB
-        bool "SoC Audio support for TTC DKB"
+        tristate "SoC Audio support for TTC DKB"
         depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y
         select PXA_SSP
         select SND_PXA_SOC_SSP
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index b7cd0a71fd70..3580d10c9f28 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -259,20 +259,6 @@ static const struct snd_kcontrol_new wm8731_corgi_controls[] = {
                 corgi_set_spk),
 };
 
-/*
- * Logic for a wm8731 as connected on a Sharp SL-C7x0 Device
- */
-static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_nc_pin(dapm, "LLINEIN");
-        snd_soc_dapm_nc_pin(dapm, "RLINEIN");
-
-        return 0;
-}
-
 /* corgi digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link corgi_dai = {
         .name = "WM8731",
@@ -281,7 +267,6 @@ static struct snd_soc_dai_link corgi_dai = {
         .codec_dai_name = "wm8731-hifi",
         .platform_name = "pxa-pcm-audio",
         .codec_name = "wm8731.0-001b",
-        .init = corgi_wm8731_init,
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                    SND_SOC_DAIFMT_CBS_CFS,
         .ops = &corgi_ops,
@@ -300,6 +285,7 @@ static struct snd_soc_card corgi = {
         .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
         .dapm_routes = corgi_audio_map,
         .num_dapm_routes = ARRAY_SIZE(corgi_audio_map),
+        .fully_routed = true,
 };
 
 static int corgi_probe(struct platform_device *pdev)
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c
index 7c691aae8af2..d72e124a3676 100644
--- a/sound/soc/pxa/e740_wm9705.c
+++ b/sound/soc/pxa/e740_wm9705.c
@@ -88,24 +88,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"Mic Amp", NULL, "Mic (Internal)"},
 };
 
-static int e740_ac97_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_nc_pin(dapm, "HPOUTL");
-        snd_soc_dapm_nc_pin(dapm, "HPOUTR");
-        snd_soc_dapm_nc_pin(dapm, "PHONE");
-        snd_soc_dapm_nc_pin(dapm, "LINEINL");
-        snd_soc_dapm_nc_pin(dapm, "LINEINR");
-        snd_soc_dapm_nc_pin(dapm, "CDINL");
-        snd_soc_dapm_nc_pin(dapm, "CDINR");
-        snd_soc_dapm_nc_pin(dapm, "PCBEEP");
-        snd_soc_dapm_nc_pin(dapm, "MIC2");
-
-        return 0;
-}
-
 static struct snd_soc_dai_link e740_dai[] = {
         {
                 .name = "AC97",
@@ -114,7 +96,6 @@ static struct snd_soc_dai_link e740_dai[] = {
                 .codec_dai_name = "wm9705-hifi",
                 .platform_name = "pxa-pcm-audio",
                 .codec_name = "wm9705-codec",
-                .init = e740_ac97_init,
         },
         {
                 .name = "AC97 Aux",
@@ -136,6 +117,7 @@ static struct snd_soc_card e740 = {
         .num_dapm_widgets = ARRAY_SIZE(e740_dapm_widgets),
         .dapm_routes = audio_map,
         .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed = true,
 };
 
 static struct gpio e740_audio_gpios[] = {
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index 30544b65b5a8..48f2d7c2e68c 100644
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -70,24 +70,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"MIC1", NULL, "Mic (Internal)"},
 };
 
-static int e750_ac97_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_nc_pin(dapm, "LOUT");
-        snd_soc_dapm_nc_pin(dapm, "ROUT");
-        snd_soc_dapm_nc_pin(dapm, "PHONE");
-        snd_soc_dapm_nc_pin(dapm, "LINEINL");
-        snd_soc_dapm_nc_pin(dapm, "LINEINR");
-        snd_soc_dapm_nc_pin(dapm, "CDINL");
-        snd_soc_dapm_nc_pin(dapm, "CDINR");
-        snd_soc_dapm_nc_pin(dapm, "PCBEEP");
-        snd_soc_dapm_nc_pin(dapm, "MIC2");
-
-        return 0;
-}
-
 static struct snd_soc_dai_link e750_dai[] = {
         {
                 .name = "AC97",
@@ -96,7 +78,6 @@ static struct snd_soc_dai_link e750_dai[] = {
                 .codec_dai_name = "wm9705-hifi",
                 .platform_name = "pxa-pcm-audio",
                 .codec_name = "wm9705-codec",
-                .init = e750_ac97_init,
                 /* use ops to check startup state */
         },
         {
@@ -119,6 +100,7 @@ static struct snd_soc_card e750 = {
         .num_dapm_widgets = ARRAY_SIZE(e750_dapm_widgets),
         .dapm_routes = audio_map,
         .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed = true,
 };
 
 static struct gpio e750_audio_gpios[] = {
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index ce26551052a3..73eb5ddf9753 100644
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -127,15 +127,8 @@ static const struct snd_soc_dapm_route hx4700_audio_map[] = {
 static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
-        /* NC codec pins */
-        /* FIXME: is anything connected here? */
-        snd_soc_dapm_nc_pin(dapm, "MOUT1");
-        snd_soc_dapm_nc_pin(dapm, "MICEXT");
-        snd_soc_dapm_nc_pin(dapm, "AUX");
-
         /* Jack detection API stuff */
         err = snd_soc_jack_new(codec, "Headphone Jack",
                                 SND_JACK_HEADPHONE, &hs_jack);
@@ -184,6 +177,7 @@ static struct snd_soc_card snd_soc_card_hx4700 = {
         .num_dapm_widgets       = ARRAY_SIZE(hx4700_dapm_widgets),
         .dapm_routes            = hx4700_audio_map,
         .num_dapm_routes        = ARRAY_SIZE(hx4700_audio_map),
+        .fully_routed           = true,
 };
 
 static struct gpio hx4700_audio_gpios[] = {
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 259e048681c0..241d0be42d7a 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -391,25 +391,6 @@ static const struct snd_kcontrol_new uda1380_magician_controls[] = {
                         magician_get_input, magician_set_input),
 };
 
-/*
- * Logic for a uda1380 as connected on a HTC Magician
- */
-static int magician_uda1380_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        /* NC codec pins */
-        snd_soc_dapm_nc_pin(dapm, "VOUTLHP");
-        snd_soc_dapm_nc_pin(dapm, "VOUTRHP");
-
-        /* FIXME: is anything connected here? */
-        snd_soc_dapm_nc_pin(dapm, "VINL");
-        snd_soc_dapm_nc_pin(dapm, "VINR");
-
-        return 0;
-}
-
 /* magician digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link magician_dai[] = {
 {
@@ -419,7 +400,6 @@ static struct snd_soc_dai_link magician_dai[] = {
         .codec_dai_name = "uda1380-hifi-playback",
         .platform_name = "pxa-pcm-audio",
         .codec_name = "uda1380-codec.0-0018",
-        .init = magician_uda1380_init,
         .ops = &magician_playback_ops,
 },
 {
@@ -446,6 +426,7 @@ static struct snd_soc_card snd_soc_card_magician = {
         .num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets),
         .dapm_routes = audio_map,
         .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed = true,
 };
 
 static struct platform_device *magician_snd_device;
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index 396dbd51a64f..a9615a574546 100644
--- a/sound/soc/pxa/mioa701_wm9713.c
+++ b/sound/soc/pxa/mioa701_wm9713.c
@@ -81,7 +81,7 @@ static int rear_amp_power(struct snd_soc_codec *codec, int power)
 static int rear_amp_event(struct snd_soc_dapm_widget *widget,
                           struct snd_kcontrol *kctl, int event)
 {
-        struct snd_soc_codec *codec = widget->codec;
+        struct snd_soc_codec *codec = widget->dapm->card->rtd[0].codec;
 
         return rear_amp_power(codec, SND_SOC_DAPM_EVENT_ON(event));
 }
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index 1eebca2f0a97..910336c5ebeb 100644
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -68,7 +68,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"Ext. Speaker", NULL, "ROUT2"},
 
         /* mic connected to MIC1 */
-        {"Ext. Microphone", NULL, "MIC1"},
+        {"MIC1", NULL, "Ext. Microphone"},
 };
 
 static struct snd_soc_card palm27x_asoc;
@@ -76,18 +76,8 @@ static struct snd_soc_card palm27x_asoc;
 static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
-        /* not connected pins */
-        snd_soc_dapm_nc_pin(dapm, "OUT3");
-        snd_soc_dapm_nc_pin(dapm, "MONOOUT");
-        snd_soc_dapm_nc_pin(dapm, "LINEINL");
-        snd_soc_dapm_nc_pin(dapm, "LINEINR");
-        snd_soc_dapm_nc_pin(dapm, "PCBEEP");
-        snd_soc_dapm_nc_pin(dapm, "PHONE");
-        snd_soc_dapm_nc_pin(dapm, "MIC2");
-
         /* Jack detection API stuff */
         err = snd_soc_jack_new(codec, "Headphone Jack",
                                 SND_JACK_HEADPHONE, &hs_jack);
@@ -133,7 +123,8 @@ static struct snd_soc_card palm27x_asoc = {
         .dapm_widgets = palm27x_dapm_widgets,
         .num_dapm_widgets = ARRAY_SIZE(palm27x_dapm_widgets),
         .dapm_routes = audio_map,
-        .num_dapm_routes = ARRAY_SIZE(audio_map)
+        .num_dapm_routes = ARRAY_SIZE(audio_map),
+        .fully_routed = true,
 };
 
 static int palm27x_asoc_probe(struct platform_device *pdev)
diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c
index 083706595495..552b763005ed 100644
--- a/sound/soc/pxa/raumfeld.c
+++ b/sound/soc/pxa/raumfeld.c
@@ -88,7 +88,7 @@ static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,
         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 fmt, clk = 0;
+        unsigned int clk = 0;
         int ret = 0;
 
         switch (params_rate(params)) {
@@ -112,15 +112,6 @@ static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        fmt = SND_SOC_DAIFMT_I2S |
-              SND_SOC_DAIFMT_NB_NF |
-              SND_SOC_DAIFMT_CBS_CFS;
-
-        /* setup the CODEC DAI */
-        ret = snd_soc_dai_set_fmt(codec_dai, fmt);
-        if (ret < 0)
-                return ret;
-
         ret = snd_soc_dai_set_sysclk(codec_dai, 0, clk, 0);
         if (ret < 0)
                 return ret;
@@ -130,10 +121,6 @@ static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
-        if (ret < 0)
-                return ret;
-
         ret = snd_soc_dai_set_clkdiv(cpu_dai, PXA_SSP_DIV_SCR, 4);
         if (ret < 0)
                 return ret;
@@ -169,9 +156,8 @@ static int raumfeld_ak4104_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;
-        int fmt, ret = 0, clk = 0;
+        int ret = 0, clk = 0;
 
         switch (params_rate(params)) {
         case 44100:
@@ -194,22 +180,11 @@ static int raumfeld_ak4104_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF;
-
-        /* setup the CODEC DAI */
-        ret = snd_soc_dai_set_fmt(codec_dai, fmt | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         /* setup the CPU DAI */
         ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, 0, clk);
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dai_set_fmt(cpu_dai, fmt | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         ret = snd_soc_dai_set_clkdiv(cpu_dai, PXA_SSP_DIV_SCR, 4);
         if (ret < 0)
                 return ret;
@@ -233,6 +208,9 @@ static struct snd_soc_ops raumfeld_ak4104_ops = {
         .platform_name  = "pxa-pcm-audio",              \
         .codec_dai_name = "cs4270-hifi",                \
         .codec_name     = "cs4270.0-0048",      \
+        .dai_fmt        = SND_SOC_DAIFMT_I2S |          \
+                          SND_SOC_DAIFMT_NB_NF |        \
+                          SND_SOC_DAIFMT_CBS_CFS,       \
         .ops            = &raumfeld_cs4270_ops,         \
 }
 
@@ -243,6 +221,9 @@ static struct snd_soc_ops raumfeld_ak4104_ops = {
         .cpu_dai_name   = "pxa-ssp-dai.1",              \
         .codec_dai_name = "ak4104-hifi",                \
         .platform_name  = "pxa-pcm-audio",              \
+        .dai_fmt        = SND_SOC_DAIFMT_I2S |          \
+                          SND_SOC_DAIFMT_NB_NF |        \
+                          SND_SOC_DAIFMT_CBS_CFS,       \
         .ops            = &raumfeld_ak4104_ops,         \
         .codec_name     = "spi0.0",                     \
 }
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index d7d5fb20ea6f..461123ad5ff2 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -256,26 +256,6 @@ static const struct snd_kcontrol_new wm8750_spitz_controls[] = {
                 spitz_set_spk),
 };
 
-/*
- * Logic for a wm8750 as connected on a Sharp SL-Cxx00 Device
- */
-static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
-{
-        struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        /* NC codec pins */
-        snd_soc_dapm_nc_pin(dapm, "RINPUT1");
-        snd_soc_dapm_nc_pin(dapm, "LINPUT2");
-        snd_soc_dapm_nc_pin(dapm, "RINPUT2");
-        snd_soc_dapm_nc_pin(dapm, "LINPUT3");
-        snd_soc_dapm_nc_pin(dapm, "RINPUT3");
-        snd_soc_dapm_nc_pin(dapm, "OUT3");
-        snd_soc_dapm_nc_pin(dapm, "MONO1");
-
-        return 0;
-}
-
 /* spitz digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link spitz_dai = {
         .name = "wm8750",
@@ -284,7 +264,6 @@ static struct snd_soc_dai_link spitz_dai = {
         .codec_dai_name = "wm8750-hifi",
         .platform_name = "pxa-pcm-audio",
         .codec_name = "wm8750.0-001b",
-        .init = spitz_wm8750_init,
         .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                    SND_SOC_DAIFMT_CBS_CFS,
         .ops = &spitz_ops,
@@ -303,6 +282,7 @@ static struct snd_soc_card snd_soc_spitz = {
         .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
         .dapm_routes = spitz_audio_map,
         .num_dapm_routes = ARRAY_SIZE(spitz_audio_map),
+        .fully_routed = true,
 };
 
 static int spitz_probe(struct platform_device *pdev)
@@ -352,7 +332,6 @@ static int spitz_remove(struct platform_device *pdev)
 static struct platform_driver spitz_driver = {
         .driver         = {
                 .name   = "spitz-audio",
-                .owner  = THIS_MODULE,
                 .pm     = &snd_soc_pm_ops,
         },
         .probe          = spitz_probe,
diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c
index e3d7257ad09c..5001dbb9b257 100644
--- a/sound/soc/pxa/ttc-dkb.c
+++ b/sound/soc/pxa/ttc-dkb.c
@@ -76,10 +76,6 @@ static const struct snd_soc_dapm_route ttc_audio_map[] = {
 static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-        snd_soc_dapm_disable_pin(dapm, "Headset Mic 2");
-        snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
 
         /* Headset jack detection */
         snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 23bf991e95d5..8f301c72ee5e 100644
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -130,16 +130,6 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
-        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
-                SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-        if (ret < 0)
-                return ret;
-
         return 0;
 }
 
@@ -172,6 +162,8 @@ static struct snd_soc_dai_link zylonite_dai[] = {
         .platform_name = "pxa-pcm-audio",
         .cpu_dai_name = "pxa-ssp-dai.2",
         .codec_dai_name = "wm9713-voice",
+        .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                   SND_SOC_DAIFMT_CBS_CFS,
         .ops = &zylonite_voice_ops,
 },
 };