1 files changed, 5 insertions, 44 deletions

diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index a63b65cdc04d..9bea4d8a523d 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -200,39 +200,6 @@ static void dump_reg(struct snd_soc_codec *codec)
 }
 #endif
 
-static int dac_mux_put(struct snd_kcontrol *kcontrol,
-		       struct snd_ctl_elem_value *ucontrol)
-{
-	struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
-	struct snd_soc_codec *codec = widget->codec;
-	unsigned int reg;
-
-	if (ucontrol->value.enumerated.item[0]) {
-		reg = sgtl5000_read(codec, SGTL5000_CHIP_CLK_TOP_CTRL);
-		reg |= SGTL5000_INT_OSC_EN;
-		sgtl5000_write(codec, SGTL5000_CHIP_CLK_TOP_CTRL, reg);
-
-		if (codec->bias_level != SND_SOC_BIAS_ON) {
-			sgtl5000_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
-			snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
-			sgtl5000_set_bias_level(codec, SND_SOC_BIAS_ON);
-		} else
-			snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
-
-		reg = sgtl5000_read(codec, SGTL5000_CHIP_ANA_CTRL);
-		reg &= ~(SGTL5000_LINE_OUT_MUTE | SGTL5000_HP_MUTE);
-		sgtl5000_write(codec, SGTL5000_CHIP_ANA_CTRL, reg);
-	} else {
-		reg = sgtl5000_read(codec, SGTL5000_CHIP_CLK_TOP_CTRL);
-		reg &= ~SGTL5000_INT_OSC_EN;
-		sgtl5000_write(codec, SGTL5000_CHIP_CLK_TOP_CTRL, reg);
-
-		snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
-		sgtl5000_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-	}
-	return 0;
-}
-
 static const char *adc_mux_text[] = {
 	"MIC_IN", "LINE_IN"
 };
@@ -250,16 +217,8 @@ SOC_ENUM_SINGLE(SGTL5000_CHIP_ANA_CTRL, 6, 2, dac_mux_text);
 static const struct snd_kcontrol_new adc_mux =
 SOC_DAPM_ENUM("ADC Mux", adc_enum);
 
-static const struct snd_kcontrol_new dac_mux = {
-	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-	.name = "DAC Mux",
-	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE
-	    | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-	.info = snd_soc_info_enum_double,
-	.get = snd_soc_dapm_get_enum_double,
-	.put = dac_mux_put,
-	.private_value = (unsigned long)&dac_enum,
-};
+static const struct snd_kcontrol_new dac_mux =
+SOC_DAPM_ENUM("DAC Mux", dac_enum);
 
 static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = {
 	SND_SOC_DAPM_INPUT("LINE_IN"),
@@ -649,6 +608,8 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
 	fs = sgtl5000->lrclk;
 	/* SGTL5000 rev1 has a IC bug to prevent switching to MCLK from PLL. */
 	if (!sgtl5000->master) {
+		sys_fs = sgtl5000->lrclk;
+		clk_ctl = SGTL5000_RATE_MODE_DIV_1 << SGTL5000_RATE_MODE_SHIFT;
 		if (fs * 256 == sgtl5000->sysclk)
 			clk_ctl |= SGTL5000_MCLK_FREQ_256FS << \
 				SGTL5000_MCLK_FREQ_SHIFT;
@@ -783,7 +744,7 @@ static int sgtl5000_set_bias_level(struct snd_soc_codec *codec,
 		   avoid pops. */
 		reg = sgtl5000_read(codec, SGTL5000_CHIP_ANA_POWER);
 		if (reg & SGTL5000_VAG_POWERUP)
-			delay = 400;
+			delay = 600;
 		reg &= ~SGTL5000_VAG_POWERUP;
 		reg |= SGTL5000_DAC_POWERUP;
 		reg |= SGTL5000_HP_POWERUP;