diff options
| author | Misael Lopez Cruz <misael.lopez@ti.com> | 2011-05-31 09:23:19 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-31 11:04:48 +0100 |
| commit | 4ad02571ac347522e9cd3fcf68f5c251847c141a (patch) | |
| tree | 4438d2e394bbb05e33611969839bd5aa22b6a103 /sound | |
| parent | 64aadf83d26a9b8bb4c097ddaae674ac72f66124 (diff) | |
ASoC: DMIC: Remove explicit bias setting for DMics
Digital microphone bias is now supplied through SoC DAPM,
it's not required anymore to explicitly enable/disable bias
in DMIC PCM ops.
Change-Id: If6681ea7b1830ea95f68f23ec52220944821f4b5
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-dmic.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 8f5d7e9211a..886ca9bfb29 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -33,8 +33,6 @@ #include <linux/err.h> #include <linux/clk.h> #include <linux/delay.h> -#include <linux/i2c.h> -#include <linux/i2c/twl.h> #include <linux/io.h> #include <linux/irq.h> #include <linux/slab.h> @@ -234,12 +232,8 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream, { struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai); - if (!dmic->active++) { + if (!dmic->active++) pm_runtime_get_sync(dmic->dev); - /* Enable DMIC bias */ - /* TODO: convert this over to DAPM */ - twl_i2c_write_u8(TWL_MODULE_AUDIO_VOICE, 0x55, 0x0B); - } return 0; } @@ -249,12 +243,8 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream, { struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai); - if (!--dmic->active) { - /* Disable DMIC bias */ - /* TODO: convert this over to DAPM */ - twl_i2c_write_u8(TWL_MODULE_AUDIO_VOICE, 0x44, 0x0B); + if (!--dmic->active) pm_runtime_put_sync(dmic->dev); - } } static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream, |