6 files changed, 39 insertions, 22 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 269dbff70b92..be4df4c6fd56 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1721,7 +1721,9 @@ static void alc_apply_fixup(struct hda_codec *codec, int action)
 {
         struct alc_spec *spec = codec->spec;
         int id = spec->fixup_id;
+#ifdef CONFIG_SND_DEBUG_VERBOSE
         const char *modelname = spec->fixup_name;
+#endif
         int depth = 0;
 
         if (!spec->fixup_list)
@@ -10930,9 +10932,6 @@ static int alc_auto_add_mic_boost(struct hda_codec *codec)
         return 0;
 }
 
-static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
-                                             const struct auto_pin_cfg *cfg);
-
 /* almost identical with ALC880 parser... */
 static int alc882_parse_auto_config(struct hda_codec *codec)
 {
@@ -10950,10 +10949,7 @@ static int alc882_parse_auto_config(struct hda_codec *codec)
         err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
         if (err < 0)
                 return err;
-        if (codec->vendor_id == 0x10ec0887)
-                err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
-        else
-                err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
+        err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
         if (err < 0)
                 return err;
         err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pins[0],
@@ -12635,6 +12631,8 @@ static struct snd_pci_quirk alc262_cfg_tbl[] = {
                            ALC262_HP_BPC),
         SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1300, "HP xw series",
                            ALC262_HP_BPC),
+        SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1500, "HP z series",
+                           ALC262_HP_BPC),
         SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x1700, "HP xw series",
                            ALC262_HP_BPC),
         SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
@@ -14957,6 +14955,7 @@ static struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
         SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
         SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
+        SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
         SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
         SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
@@ -17134,7 +17133,7 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
 #define alc861vd_idx_to_mixer_switch(nid)       ((nid) + 0x0c)
 
 /* add playback controls from the parsed DAC table */
-/* Based on ALC880 version. But ALC861VD and ALC887 have separate,
+/* Based on ALC880 version. But ALC861VD has separate,
  * different NIDs for mute/unmute switch and volume control */
 static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
                                              const struct auto_pin_cfg *cfg)
@@ -19461,6 +19460,7 @@ enum {
         ALC662_FIXUP_ASPIRE,
         ALC662_FIXUP_IDEAPAD,
         ALC272_FIXUP_MARIO,
+        ALC662_FIXUP_CZC_P10T,
 };
 
 static const struct alc_fixup alc662_fixups[] = {
@@ -19481,7 +19481,14 @@ static const struct alc_fixup alc662_fixups[] = {
         [ALC272_FIXUP_MARIO] = {
                 .type = ALC_FIXUP_FUNC,
                 .v.func = alc272_fixup_mario,
-        }
+        },
+        [ALC662_FIXUP_CZC_P10T] = {
+                .type = ALC_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        {0x14, AC_VERB_SET_EAPD_BTLENABLE, 0},
+                        {}
+                }
+        },
 };
 
 static struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -19489,6 +19496,7 @@ static struct snd_pci_quirk alc662_fixup_tbl[] = {
         SND_PCI_QUIRK(0x144d, 0xc051, "Samsung R720", ALC662_FIXUP_IDEAPAD),
         SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD),
         SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD),
+        SND_PCI_QUIRK(0x1b35, 0x2206, "CZC P10T", ALC662_FIXUP_CZC_P10T),
         {}
 };
 
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index 7b62de089fee..20c6b079d0df 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -580,6 +580,7 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
 {
         int err;
         struct snd_akm4xxx *ak;
+        unsigned char tmp;
 
         if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DELTA1010 &&
             ice->eeprom.gpiodir == 0x7b)
@@ -622,6 +623,12 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice)
                 break;
         }
 
+        /* initialize the SPI clock to high */
+        tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA);
+        tmp |= ICE1712_DELTA_AP_CCLK;
+        snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp);
+        udelay(5);
+
         /* initialize spdif */
         switch (ice->eeprom.subvendor) {
         case ICE1712_SUBDEVICE_AUDIOPHILE:
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,
 };