Merge branch 'fix/asoc' into for-linus

4 files changed, 15 insertions, 13 deletions

diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig
index 3abeeddc67d3..ae403597fd31 100644
--- a/sound/soc/blackfin/Kconfig
+++ b/sound/soc/blackfin/Kconfig
@@ -1,6 +1,7 @@
 config SND_BF5XX_I2S
         tristate "SoC I2S Audio for the ADI BF5xx chip"
         depends on BLACKFIN
+        select SND_BF5XX_SOC_SPORT
         help
           Say Y or M if you want to add support for codecs attached to
           the Blackfin SPORT (synchronous serial ports) interface in I2S
@@ -35,6 +36,7 @@ config SND_BFIN_AD73311_SE
 config SND_BF5XX_TDM
         tristate "SoC I2S(TDM mode) Audio for the ADI BF5xx chip"
         depends on (BLACKFIN && SND_SOC)
+        select SND_BF5XX_SOC_SPORT
         help
           Say Y or M if you want to add support for codecs attached to
           the Blackfin SPORT (synchronous serial ports) interface in TDM
@@ -61,6 +63,10 @@ config SND_BF5XX_SOC_AD193X
 config SND_BF5XX_AC97
         tristate "SoC AC97 Audio for the ADI BF5xx chip"
         depends on BLACKFIN
+        select AC97_BUS
+        select SND_SOC_AC97_BUS
+        select SND_BF5XX_SOC_SPORT
+        select SND_BF5XX_SOC_AC97
         help
           Say Y or M if you want to add support for codecs attached to
           the Blackfin SPORT (synchronous serial ports) interface in slot 16
@@ -122,17 +128,12 @@ config SND_BF5XX_SOC_SPORT
 
 config SND_BF5XX_SOC_I2S
         tristate
-        select SND_BF5XX_SOC_SPORT
 
 config SND_BF5XX_SOC_TDM
         tristate
-        select SND_BF5XX_SOC_SPORT
 
 config SND_BF5XX_SOC_AC97
         tristate
-        select AC97_BUS
-        select SND_SOC_AC97_BUS
-        select SND_BF5XX_SOC_SPORT
 
 config SND_BF5XX_SPORT_NUM
         int "Set a SPORT for Sound chip"
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index c5f856ec27ca..ffbac26b9bce 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -260,9 +260,9 @@ static int bf5xx_ac97_suspend(struct snd_soc_dai *dai)
         pr_debug("%s : sport %d\n", __func__, dai->id);
         if (!dai->active)
                 return 0;
-        if (dai->capture.active)
+        if (dai->capture_active)
                 sport_rx_stop(sport);
-        if (dai->playback.active)
+        if (dai->playback_active)
                 sport_tx_stop(sport);
         return 0;
 }
diff --git a/sound/soc/blackfin/bf5xx-tdm.c b/sound/soc/blackfin/bf5xx-tdm.c
index 125123929f16..5515ac9e05c7 100644
--- a/sound/soc/blackfin/bf5xx-tdm.c
+++ b/sound/soc/blackfin/bf5xx-tdm.c
@@ -210,7 +210,7 @@ static int bf5xx_tdm_set_channel_map(struct snd_soc_dai *dai,
 #ifdef CONFIG_PM
 static int bf5xx_tdm_suspend(struct snd_soc_dai *dai)
 {
-        struct sport_device *sport = dai->private_data;
+        struct sport_device *sport = snd_soc_dai_get_drvdata(dai);
 
         if (!dai->active)
                 return 0;
@@ -235,13 +235,13 @@ static int bf5xx_tdm_resume(struct snd_soc_dai *dai)
                 ret = -EBUSY;
         }
 
-        ret = sport_config_rx(sport, IRFS, 0x1F, 0, 0);
+        ret = sport_config_rx(sport, 0, 0x1F, 0, 0);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
         }
 
-        ret = sport_config_tx(sport, ITFS, 0x1F, 0, 0);
+        ret = sport_config_tx(sport, 0, 0x1F, 0, 0);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
@@ -303,14 +303,14 @@ static int __devinit bfin_tdm_probe(struct platform_device *pdev)
                 goto sport_config_err;
         }
 
-        ret = sport_config_rx(sport_handle, IRFS, 0x1F, 0, 0);
+        ret = sport_config_rx(sport_handle, 0, 0x1F, 0, 0);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
                 goto sport_config_err;
         }
 
-        ret = sport_config_tx(sport_handle, ITFS, 0x1F, 0, 0);
+        ret = sport_config_tx(sport_handle, 0, 0x1F, 0, 0);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index 2d4f896d7fec..3ceaef68e01d 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -104,6 +104,7 @@ static struct snd_soc_jack_gpio hs_jack_gpios[] = {
                 .name           = "hsdet-gpio",
                 .report         = SND_JACK_HEADSET,
                 .debounce_time  = 200,
+                .invert         = 1,
         },
 };
 
@@ -192,7 +193,7 @@ static struct snd_soc_dai_link z2_dai = {
         .cpu_dai_name   = "pxa2xx-i2s",
         .codec_dai_name = "wm8750-hifi",
         .platform_name = "pxa-pcm-audio",
-        .codec_name     = "wm8750-codec.0-001a",
+        .codec_name     = "wm8750-codec.0-001b",
         .init           = z2_wm8750_init,
         .ops            = &z2_ops,
 };