Disable regulators for sound codec, as they prevent suspend

ayufan · ayufan · commit 741e917b3e74 · 2017-05-02T11:14:42.000+02:00
diff --git a/sound/soc/sunxi/sunxi_codec.c b/sound/soc/sunxi/sunxi_codec.c
@@ -2040,13 +2040,15 @@ static int codec_suspend(struct snd_soc_codec *codec)
 		audio_gpio_iodisable(spk_gpio.gpio);
 	}
 
+#ifdef SUSPEND_REGULATORS
 	if (sunxi_internal_codec->vol_supply.cpvdd){
 		regulator_disable(sunxi_internal_codec->vol_supply.cpvdd);
 	}
 
 	if (sunxi_internal_codec->vol_supply.avcc) {
 		regulator_disable(sunxi_internal_codec->vol_supply.avcc);
 	}
+#endif
 
 	pr_debug("[audio codec]:suspend end..\n");
 
@@ -2059,6 +2061,8 @@ static int codec_resume(struct snd_soc_codec *codec)
 	struct sunxi_codec *sunxi_internal_codec = snd_soc_codec_get_drvdata(codec);
 
 	pr_debug("[audio codec]:resume start\n");
+
+#ifdef SUSPEND_REGULATORS
 	if (sunxi_internal_codec->vol_supply.cpvdd){
 		ret = regulator_enable(sunxi_internal_codec->vol_supply.cpvdd);
 		if (ret) {
@@ -2072,6 +2076,7 @@ static int codec_resume(struct snd_soc_codec *codec)
 			pr_err("[%s]: avcc:regulator_enable() failed!\n",__func__);
 		}
 	}
+#endif
 
 	codec_init(sunxi_internal_codec);
 	if (spk_gpio.cfg) {

Original file line number	Diff line number	Diff line change
`@@ -2040,13 +2040,15 @@ static int codec_suspend(struct snd_soc_codec *codec)`
`2040`	`2040`	`audio_gpio_iodisable(spk_gpio.gpio);`
`2041`	`2041`	`}`
`2042`	`2042`
	`2043`	`+#ifdef SUSPEND_REGULATORS`
`2043`	`2044`	`if (sunxi_internal_codec->vol_supply.cpvdd){`
`2044`	`2045`	`regulator_disable(sunxi_internal_codec->vol_supply.cpvdd);`
`2045`	`2046`	`}`
`2046`	`2047`
`2047`	`2048`	`if (sunxi_internal_codec->vol_supply.avcc) {`
`2048`	`2049`	`regulator_disable(sunxi_internal_codec->vol_supply.avcc);`
`2049`	`2050`	`}`
	`2051`	`+#endif`
`2050`	`2052`
`2051`	`2053`	`pr_debug("[audio codec]:suspend end..\n");`
`2052`	`2054`
`@@ -2059,6 +2061,8 @@ static int codec_resume(struct snd_soc_codec *codec)`
`2059`	`2061`	`struct sunxi_codec *sunxi_internal_codec = snd_soc_codec_get_drvdata(codec);`
`2060`	`2062`
`2061`	`2063`	`pr_debug("[audio codec]:resume start\n");`
	`2064`	`+`
	`2065`	`+#ifdef SUSPEND_REGULATORS`
`2062`	`2066`	`if (sunxi_internal_codec->vol_supply.cpvdd){`
`2063`	`2067`	`ret = regulator_enable(sunxi_internal_codec->vol_supply.cpvdd);`
`2064`	`2068`	`if (ret) {`
`@@ -2072,6 +2076,7 @@ static int codec_resume(struct snd_soc_codec *codec)`
`2072`	`2076`	`pr_err("[%s]: avcc:regulator_enable() failed!\n",__func__);`
`2073`	`2077`	`}`
`2074`	`2078`	`}`
	`2079`	`+#endif`
`2075`	`2080`
`2076`	`2081`	`codec_init(sunxi_internal_codec);`
`2077`	`2082`	`if (spk_gpio.cfg) {`