3 files changed, 34 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f128ffabf5e5..91779f3d0ceb 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -716,7 +716,7 @@ config SND_SOC_HDAC_HDA
 	select SND_HDA
 
 config SND_SOC_ICS43432
-	tristate
+	tristate "InvenSense ICS43432 I2S microphone codec"
 
 config SND_SOC_INNO_RK3036
 	tristate "Inno codec driver for RK3036 SoC"
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index f5b59305c957..6539c38280cd 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1514,8 +1514,34 @@ err:
 	return ret;
 }
 
+static int sgtl5000_suspend(struct snd_soc_component *component)
+{
+	struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component);
+
+	clk_disable_unprepare(sgtl5000->mclk);
+
+	return 0;
+}
+
+static int sgtl5000_resume(struct snd_soc_component *component)
+{
+	int ret;
+	struct sgtl5000_priv *sgtl5000 = snd_soc_component_get_drvdata(component);
+
+	ret = clk_prepare_enable(sgtl5000->mclk);
+	if (ret)
+		dev_err(component->dev, "Error enabling clock %d\n", ret);
+
+	/* Need 8 clocks before I2C accesses */
+	udelay(1);
+
+	return ret;
+}
+
 static const struct snd_soc_component_driver sgtl5000_driver = {
 	.probe			= sgtl5000_probe,
+	.suspend		= sgtl5000_suspend,
+	.resume			= sgtl5000_resume,
 	.set_bias_level		= sgtl5000_set_bias_level,
 	.controls		= sgtl5000_snd_controls,
 	.num_controls		= ARRAY_SIZE(sgtl5000_snd_controls),
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 9e8c564f6e9c..b174a9381c0c 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1417,6 +1417,13 @@ static int wm8904_set_sysclk(struct snd_soc_dai *dai, int clk_id,
 	struct snd_soc_component *component = dai->component;
 	struct wm8904_priv *priv = snd_soc_component_get_drvdata(component);
 
+	/*
+	 * If using sound-simple-card this is called with clk_id fixed to 0.
+	 * Assume we want WM8904_CLK_MCLK for now in that case.
+	 */
+	if (clk_id == 0)
+		clk_id = WM8904_CLK_MCLK;
+
 	switch (clk_id) {
 	case WM8904_CLK_MCLK:
 		priv->sysclk_src = clk_id;