[PATCH 1/2] ASoC: tegra+alc5632: Swap MICBIAS1 and MIC1 dapm widgets

[PATCH 1/2] ASoC: tegra+alc5632: Swap MICBIAS1 and MIC1 dapm widgets

[Marc Dietrich]

From: Andrey Danin <danindrey@mail.ru>

MICBIAS1 is an internal widget. If MICBIAS1 is connected to the board
driver instead of the MIC1 ASoC core, it enables widgets even if the
capture stream isn't active.

Cc: Leon Romanovsky <leon@leon.nu>
Signed-off-by: Andrey Danin <danindrey@mail.ru>
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
---
 sound/soc/codecs/alc5632.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index 7dd0242..8609a86 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -551,8 +551,10 @@ static const struct snd_soc_dapm_route alc5632_dapm_routes[] = {
 	{"Left LineIn", NULL,				"LINEINL"},
 	{"Right LineIn", NULL,				"LINEINR"},
 	{"Phone", NULL,				"PHONEP"},
-	{"MIC1 Pre Amp", NULL,				"MIC1"},
-	{"MIC2 Pre Amp", NULL,				"MIC2"},
+	{"MICBIAS1", NULL,				"MIC1"},
+	{"MIC1 Pre Amp", NULL,				"MICBIAS1"},
+	{"MICBIAS2", NULL,				"MIC2"},
+	{"MIC2 Pre Amp", NULL,				"MICBIAS2"},
 	{"MIC1 PGA", NULL,				"MIC1 Pre Amp"},
 	{"MIC2 PGA", NULL,				"MIC2 Pre Amp"},
 
-- 
1.7.9.5

[PATCH 2/2] ARM: dt: documentation: tegra+alc5632: don't use MICBIAS1 in external dapm linkage

[Marc Dietrich]

From: Andrey Danin <danindrey@mail.ru>

Remove MICBIAS1 from the user configurable widgets because it is only used
internally.

Cc: Leon Romanovsky <leon@leon.nu>
Signed-off-by: Andrey Danin <danindrey@mail.ru>
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
---
 .../bindings/sound/nvidia,tegra-audio-alc5632.txt  |    2 --
 arch/arm/boot/dts/tegra20-paz00.dts                |    1 -
 2 files changed, 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
index b77a97c..fad1ba1 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
@@ -24,7 +24,6 @@ Required properties:
   * MIC1_N
   * MIC2_P
   * MIC2_N
-  * MICBIAS1
   * DMICDAT
 
   Board connectors:
@@ -48,7 +47,6 @@ sound {
 	nvidia,audio-routing =
 				"Int Spk", "SPK_OUTP",
 				"Int Spk", "SPK_OUTN",
-				"Headset Mic","MICBIAS1",
 				"MIC1_N", "Headset Mic",
 				"MIC1_P", "Headset Mic",
 				"Headset Stereophone", "HP_OUT_R",
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index abeb7fb..580906a 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -481,7 +481,6 @@
 		nvidia,audio-routing =
 			"Int Spk", "SPKOUT",
 			"Int Spk", "SPKOUTN",
-			"Headset Mic", "MICBIAS1",
 			"MIC1", "Headset Mic",
 			"Headset Stereophone", "HPR",
 			"Headset Stereophone", "HPL",
-- 
1.7.9.5

Re: [PATCH 1/2] ASoC: tegra+alc5632: Swap MICBIAS1 and MIC1 dapm widgets

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 350 bytes --]

On Sat, Jul 07, 2012 at 03:36:29PM +0200, Marc Dietrich wrote:
> From: Andrey Danin <danindrey@mail.ru>
> 
> MICBIAS1 is an internal widget. If MICBIAS1 is connected to the board
> driver instead of the MIC1 ASoC core, it enables widgets even if the
> capture stream isn't active.

What exactly is MICBIAS1 then?  It sounds horribly named...

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 1/2] ASoC: tegra+alc5632: Swap MICBIAS1 and MIC1 dapm widgets

[Andrey Danin]

Mon, 9 Jul 2012 17:44:41 +0100 от Mark Brown <broonie@opensource.wolfsonmicro.com>:
>   
> On Sat, Jul 07, 2012 at 03:36:29PM +0200, Marc Dietrich wrote:
>  > From: Andrey Danin <danindrey@mail.ru>
>  > 
>  > MICBIAS1 is an internal widget. If MICBIAS1 is connected to the board
>  > driver instead of the MIC1 ASoC core, it enables widgets even if the
>  > capture stream isn't active.
> 
>  What exactly is MICBIAS1 then? It sounds horribly named...
> 

According to alc5632 documentation alc5632 has one physical pin named MICBIAS (MIC BIAS Voltage Output).
MICBIAS1 is declared as SND_SOC_DAPM_SUPPLY. It describes "MICBIAS1 Power" bit in power management register.
Should "MICBIAS1/2" be renamed to "MICBIAS1/2 Power" ?

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 1/2] ASoC: tegra+alc5632: Swap MICBIAS1 and MIC1 dapm widgets

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 953 bytes --]

On Tue, Jul 10, 2012 at 10:17:09AM +0400, Andrey Danin wrote:
> Mon, 9 Jul 2012 17:44:41 +0100 от Mark Brown <broonie@opensource.wolfsonmicro.com>:
> > On Sat, Jul 07, 2012 at 03:36:29PM +0200, Marc Dietrich wrote:

Please fix your mailer to word wrap within paragraph.

> >  > MICBIAS1 is an internal widget. If MICBIAS1 is connected to the board
> >  > driver instead of the MIC1 ASoC core, it enables widgets even if the
> >  > capture stream isn't active.

> >  What exactly is MICBIAS1 then? It sounds horribly named...

> According to alc5632 documentation alc5632 has one physical pin named
> MICBIAS (MIC BIAS Voltage Output).  MICBIAS1 is declared as
> SND_SOC_DAPM_SUPPLY. It describes "MICBIAS1 Power" bit in power
> management register.  Should "MICBIAS1/2" be renamed to "MICBIAS1/2
> Power" ?

Sounds like it might be plausible, and whatever controls the external
MICBIAS pin probably ought to be renamed to MICBIAS.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]