[PATCH 3/4] ASoC: mid-x86: Add support for capture in machine driver

[PATCH 3/4] ASoC: mid-x86: Add support for capture in machine driver

[Harsha Priya]

From: Vinod Koul <vinod.koul@intel.com>

This configures the capture unused pins and sets
the DMIC cfg by default (also done by user)

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/mid-x86/mfld_machine.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
index 1a330be..1cd49a2 100644
--- a/sound/soc/mid-x86/mfld_machine.c
+++ b/sound/soc/mid-x86/mfld_machine.c
@@ -182,6 +182,13 @@ static int mfld_init(struct snd_soc_pcm_runtime *runtime)
 	snd_soc_dapm_disable_pin(dapm, "LINEOUTR");
 	lo_dac = 3;
 	hs_switch = 0;
+	/* we dont use linein in this so set to NC */
+	snd_soc_dapm_disable_pin(dapm, "LINEINL");
+	snd_soc_dapm_disable_pin(dapm, "LINEINR");
+	/* we are using DMICs here so configure how the clock and out pin is set */
+	snd_soc_write(codec, SN95031_DMICBUF0123, 0x85);
+	snd_soc_write(codec, SN95031_DMICBUF45, 0x02);
+	snd_soc_update_bits(codec, SN95031_DMICMUX, 0x7, 0x07);
 	return snd_soc_dapm_sync(dapm);
 }
 
-- 
1.7.2.3

Re: [PATCH 3/4] ASoC: mid-x86: Add support for capture in machine driver

[Mark Brown]

On Wed, Jan 19, 2011 at 06:17:01PM +0530, Harsha Priya wrote:

> +	/* we are using DMICs here so configure how the clock and out pin is set */
> +	snd_soc_write(codec, SN95031_DMICBUF0123, 0x85);
> +	snd_soc_write(codec, SN95031_DMICBUF45, 0x02);
> +	snd_soc_update_bits(codec, SN95031_DMICMUX, 0x7, 0x07);

This looks like something which would more normally be done with
platform data than with writes in the machine driver.

Re: [PATCH 3/4] ASoC: mid-x86: Add support for capture in machine driver

[Koul, Vinod]

> 
> > +	/* we are using DMICs here so configure how the clock and out pin is set
> */
> > +	snd_soc_write(codec, SN95031_DMICBUF0123, 0x85);
> > +	snd_soc_write(codec, SN95031_DMICBUF45, 0x02);
> > +	snd_soc_update_bits(codec, SN95031_DMICMUX, 0x7, 0x07);
> 
> This looks like something which would more normally be done with
> platform data than with writes in the machine driver.
This is actually optional. The DMIC can be used as GPO or DMIC. This is user option.
Wanted to explicitly code here as this machine DMICs are used.

~Vinod

Re: [PATCH 3/4] ASoC: mid-x86: Add support for capture in machine driver

[Mark Brown]

On Wed, Jan 19, 2011 at 09:59:59PM +0530, Koul, Vinod wrote:

> > > +	/* we are using DMICs here so configure how the clock and out pin is set
> > */
> > > +	snd_soc_write(codec, SN95031_DMICBUF0123, 0x85);
> > > +	snd_soc_write(codec, SN95031_DMICBUF45, 0x02);
> > > +	snd_soc_update_bits(codec, SN95031_DMICMUX, 0x7, 0x07);

> > This looks like something which would more normally be done with
> > platform data than with writes in the machine driver.

> This is actually optional. The DMIC can be used as GPO or DMIC. This is user option.
> Wanted to explicitly code here as this machine DMICs are used.

I'm not saying it shouldn't be optional, I'm saying it should be passed
into the driver using platform data instead.

[PATCH 3/4] ASoC: mid-x86: Add support for capture in machine driver

[Harsha Priya]

From: Vinod Koul <vinod.koul@intel.com>

This configures the capture unused pins and sets
the DMIC cfg by default (also done by user)

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/mid-x86/mfld_machine.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
index 1a330be..1cd49a2 100644
--- a/sound/soc/mid-x86/mfld_machine.c
+++ b/sound/soc/mid-x86/mfld_machine.c
@@ -182,6 +182,13 @@ static int mfld_init(struct snd_soc_pcm_runtime *runtime)
 	snd_soc_dapm_disable_pin(dapm, "LINEOUTR");
 	lo_dac = 3;
 	hs_switch = 0;
+	/* we dont use linein in this so set to NC */
+	snd_soc_dapm_disable_pin(dapm, "LINEINL");
+	snd_soc_dapm_disable_pin(dapm, "LINEINR");
+	/* we are using DMICs here so configure how the clock and out pin is set */
+	snd_soc_write(codec, SN95031_DMICBUF0123, 0x85);
+	snd_soc_write(codec, SN95031_DMICBUF45, 0x02);
+	snd_soc_update_bits(codec, SN95031_DMICMUX, 0x7, 0x07);
 	return snd_soc_dapm_sync(dapm);
 }
 
-- 
1.7.2.3