Convert some MICBIAS widgets to supplies

PATCH New Mark Brown 1 participant 14 messages Oct 27, 2011

Subsystems (3)

Sound ASoC Wolfson microelectronics drivers

lore

Share & tools

lore

Mark Brown

author

2011-10-27 07:54 UTC #0 lore raw

cover Convert some MICBIAS widgets to supplies

Since supply widgets are much easier to use than MICBIAS widgets we should really convert existing drivers with MICBIAS widgets to use supply widgets instead. Start this with some easier drivers that don't have any machine drivers.

Mark Brown (13):
ASoC: Convert wm8400 MICBIAS to a supply widget
ASoC: Convert wm8900 MICBIAS to a supply widget
ASoC: Convert wm8904 MICBIAS to a supply widget
ASoC: Convert wm8960 MICBIAS to a supply widget
ASoC: Convert wm8961 MICBIAS to a supply widget
ASoC: Convert wm8971 MICBIAS to a supply widget
ASoC: Convert wm8974 MICBIAS to a supply widget
ASoC: Convert wm8983 MICBIAS to a supply widget
ASoC: Convert wm8985 MICBIAS to a supply widget
ASoC: Convert wm8988 MICBIAS to a supply widget
ASoC: Convert wm8990 MICBIAS to a supply widget
ASoC: Convert wm8991 MICBIAS to a supply widget
ASoC: Convert wm8995 MICBIASes to supply widgets

 sound/soc/codecs/wm8400.c |    4 ++--
 sound/soc/codecs/wm8900.c |    2 +-
 sound/soc/codecs/wm8904.c |    2 +-
 sound/soc/codecs/wm8960.c |    2 +-
 sound/soc/codecs/wm8961.c |    2 +-
 sound/soc/codecs/wm8971.c |    2 +-
 sound/soc/codecs/wm8974.c |    2 +-
 sound/soc/codecs/wm8983.c |    3 ++-
 sound/soc/codecs/wm8985.c |    3 ++-
 sound/soc/codecs/wm8988.c |    2 +-
 sound/soc/codecs/wm8990.c |    4 ++--
 sound/soc/codecs/wm8991.c |    4 ++--
 sound/soc/codecs/wm8995.c |    6 ++++--
 13 files changed, 21 insertions(+), 17 deletions(-)

Mark Brown

author

2011-10-27 07:54 UTC #1 lore raw

PATCH 1/13 ASoC: Convert wm8400 MICBIAS to a supply widget

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8400.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

sound/soc/codecs/wm8400.c +2 -2

index dc13be2..be310ea 100644
@@ -766,8 +766,8 @@ SND_SOC_DAPM_PGA("ROPGA", WM8400_POWER_MANAGEMENT_3, WM8400_ROPGA_ENA_SHIFT, 0,
 	NULL, 0),
 
 /* MICBIAS */
-SND_SOC_DAPM_MICBIAS("MICBIAS", WM8400_POWER_MANAGEMENT_1,
-	WM8400_MIC1BIAS_ENA_SHIFT, 0),
+SND_SOC_DAPM_SUPPLY("MICBIAS", WM8400_POWER_MANAGEMENT_1,
+		    WM8400_MIC1BIAS_ENA_SHIFT, 0, NULL, 0),
 
 SND_SOC_DAPM_OUTPUT("LON"),
 SND_SOC_DAPM_OUTPUT("LOP"),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:54 UTC #2 lore raw

PATCH 2/13 ASoC: Convert wm8900 MICBIAS to a supply widget

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8900.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

sound/soc/codecs/wm8900.c +1 -1

index 3d0dc15..17a12c2 100644
@@ -513,7 +513,7 @@ SND_SOC_DAPM_MIXER("Right Input Mixer", WM8900_REG_POWER2, 4, 0,
 		   wm8900_rinmix_controls,
 		   ARRAY_SIZE(wm8900_rinmix_controls)),
 
-SND_SOC_DAPM_MICBIAS("Mic Bias", WM8900_REG_POWER1, 4, 0),
+SND_SOC_DAPM_SUPPLY("Mic Bias", WM8900_REG_POWER1, 4, 0, NULL, 0),
 
 SND_SOC_DAPM_ADC("ADCL", "Left HiFi Capture", WM8900_REG_POWER2, 1, 0),
 SND_SOC_DAPM_ADC("ADCR", "Right HiFi Capture", WM8900_REG_POWER2, 0, 0),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #3 lore raw

PATCH 3/13 ASoC: Convert wm8904 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8904.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

sound/soc/codecs/wm8904.c +1 -1

index 9fc8f4c..bf325bb 100644
@@ -1196,7 +1196,7 @@ SND_SOC_DAPM_INPUT("IN2R"),
 SND_SOC_DAPM_INPUT("IN3L"),
 SND_SOC_DAPM_INPUT("IN3R"),
 
-SND_SOC_DAPM_MICBIAS("MICBIAS", WM8904_MIC_BIAS_CONTROL_0, 0, 0),
+SND_SOC_DAPM_SUPPLY("MICBIAS", WM8904_MIC_BIAS_CONTROL_0, 0, 0, NULL, 0),
 
 SND_SOC_DAPM_MUX("Left Capture Mux", SND_SOC_NOPM, 0, 0, &lin_mux),
 SND_SOC_DAPM_MUX("Left Capture Inverting Mux", SND_SOC_NOPM, 0, 0,

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #4 lore raw

PATCH 4/13 ASoC: Convert wm8960 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8960.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

sound/soc/codecs/wm8960.c +1 -1

index 2df253c..6e22f9b 100644
@@ -265,7 +265,7 @@ SND_SOC_DAPM_INPUT("RINPUT2"),
 SND_SOC_DAPM_INPUT("LINPUT3"),
 SND_SOC_DAPM_INPUT("RINPUT3"),
 
-SND_SOC_DAPM_MICBIAS("MICB", WM8960_POWER1, 1, 0),
+SND_SOC_DAPM_SUPPLY("MICB", WM8960_POWER1, 1, 0, NULL, 0),
 
 SND_SOC_DAPM_MIXER("Left Boost Mixer", WM8960_POWER1, 5, 0,
 		   wm8960_lin_boost, ARRAY_SIZE(wm8960_lin_boost)),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #5 lore raw

PATCH 5/13 ASoC: Convert wm8961 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8961.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

sound/soc/codecs/wm8961.c +1 -1

index 9568c8a..7f2df7b 100644
@@ -531,7 +531,7 @@ SND_SOC_DAPM_PGA("Right Input", WM8961_PWR_MGMT_1, 4, 0, NULL, 0),
 SND_SOC_DAPM_ADC("ADCL", "HiFi Capture", WM8961_PWR_MGMT_1, 3, 0),
 SND_SOC_DAPM_ADC("ADCR", "HiFi Capture", WM8961_PWR_MGMT_1, 2, 0),
 
-SND_SOC_DAPM_MICBIAS("MICBIAS", WM8961_PWR_MGMT_1, 1, 0),
+SND_SOC_DAPM_SUPPLY("MICBIAS", WM8961_PWR_MGMT_1, 1, 0, NULL, 0),
 
 SND_SOC_DAPM_MUX("DACL Sidetone", SND_SOC_NOPM, 0, 0, &dacl_mux),
 SND_SOC_DAPM_MUX("DACR Sidetone", SND_SOC_NOPM, 0, 0, &dacr_mux),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #6 lore raw

PATCH 6/13 ASoC: Convert wm8971 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8971.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

sound/soc/codecs/wm8971.c +1 -1

index b444b29..3a06a95 100644
@@ -224,7 +224,7 @@ static const struct snd_soc_dapm_widget wm8971_dapm_widgets[] = {
 	SND_SOC_DAPM_DAC("Left DAC", "Left Playback", WM8971_PWR2, 8, 0),
 	SND_SOC_DAPM_PGA("Mono Out 1", WM8971_PWR2, 2, 0, NULL, 0),
 
-	SND_SOC_DAPM_MICBIAS("Mic Bias", WM8971_PWR1, 1, 0),
+	SND_SOC_DAPM_SUPPLY("Mic Bias", WM8971_PWR1, 1, 0, NULL, 0),
 	SND_SOC_DAPM_ADC("Right ADC", "Right Capture", WM8971_PWR1, 2, 0),
 	SND_SOC_DAPM_ADC("Left ADC", "Left Capture", WM8971_PWR1, 3, 0),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #7 lore raw

PATCH 7/13 ASoC: Convert wm8974 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8974.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

sound/soc/codecs/wm8974.c +1 -1

index 9352f1e..7bd35b8 100644
@@ -226,7 +226,7 @@ SND_SOC_DAPM_MIXER("Input PGA", WM8974_POWER2, 2, 0, wm8974_inpga,
 SND_SOC_DAPM_MIXER("Boost Mixer", WM8974_POWER2, 4, 0,
 		   wm8974_boost_mixer, ARRAY_SIZE(wm8974_boost_mixer)),
 
-SND_SOC_DAPM_MICBIAS("Mic Bias", WM8974_POWER1, 4, 0),
+SND_SOC_DAPM_SUPPLY("Mic Bias", WM8974_POWER1, 4, 0, NULL, 0),
 
 SND_SOC_DAPM_INPUT("MICN"),
 SND_SOC_DAPM_INPUT("MICP"),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #8 lore raw

PATCH 8/13 ASoC: Convert wm8983 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8983.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

sound/soc/codecs/wm8983.c +2 -1

index 93ee284..58e067b 100644
@@ -481,7 +481,8 @@ static const struct snd_soc_dapm_widget wm8983_dapm_widgets[] = {
 	SND_SOC_DAPM_PGA("OUT4 Out", WM8983_POWER_MANAGEMENT_3,
 			 8, 0, NULL, 0),
 
-	SND_SOC_DAPM_MICBIAS("Mic Bias", WM8983_POWER_MANAGEMENT_1, 4, 0),
+	SND_SOC_DAPM_SUPPLY("Mic Bias", WM8983_POWER_MANAGEMENT_1, 4, 0,
+			    NULL, 0),
 
 	SND_SOC_DAPM_INPUT("LIN"),
 	SND_SOC_DAPM_INPUT("LIP"),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #9 lore raw

PATCH 9/13 ASoC: Convert wm8985 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8985.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

sound/soc/codecs/wm8985.c +2 -1

index bae510a..36c4ee0 100644
@@ -411,7 +411,8 @@ static const struct snd_soc_dapm_widget wm8985_dapm_widgets[] = {
 	SND_SOC_DAPM_PGA("Right Speaker Out", WM8985_POWER_MANAGEMENT_3,
 		6, 0, NULL, 0),
 
-	SND_SOC_DAPM_MICBIAS("Mic Bias", WM8985_POWER_MANAGEMENT_1, 4, 0),
+	SND_SOC_DAPM_SUPPLY("Mic Bias", WM8985_POWER_MANAGEMENT_1, 4, 0,
+			    NULL, 0),
 
 	SND_SOC_DAPM_INPUT("LIN"),
 	SND_SOC_DAPM_INPUT("LIP"),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #10 lore raw

PATCH 10/13 ASoC: Convert wm8988 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8988.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

sound/soc/codecs/wm8988.c +1 -1

index 2e9eba7..514189d 100644
@@ -267,7 +267,7 @@ static const struct snd_kcontrol_new wm8988_monomux_controls =
 	SOC_DAPM_ENUM("Route", monomux);
 
 static const struct snd_soc_dapm_widget wm8988_dapm_widgets[] = {
-	SND_SOC_DAPM_MICBIAS("Mic Bias", WM8988_PWR1, 1, 0),
+	SND_SOC_DAPM_SUPPLY("Mic Bias", WM8988_PWR1, 1, 0, NULL, 0),
 
 	SND_SOC_DAPM_MUX("Differential Mux", SND_SOC_NOPM, 0, 0,
 		&wm8988_diffmux_controls),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #11 lore raw

PATCH 11/13 ASoC: Convert wm8990 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8990.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

sound/soc/codecs/wm8990.c +2 -2

index d29a962..d4cbec6 100644
@@ -776,8 +776,8 @@ SND_SOC_DAPM_PGA("ROPGA", WM8990_POWER_MANAGEMENT_3, WM8990_ROPGA_ENA_BIT, 0,
 	NULL, 0),
 
 /* MICBIAS */
-SND_SOC_DAPM_MICBIAS("MICBIAS", WM8990_POWER_MANAGEMENT_1,
-	WM8990_MICBIAS_ENA_BIT, 0),
+SND_SOC_DAPM_SUPPLY("MICBIAS", WM8990_POWER_MANAGEMENT_1,
+		    WM8990_MICBIAS_ENA_BIT, 0, NULL, 0),
 
 SND_SOC_DAPM_OUTPUT("LON"),
 SND_SOC_DAPM_OUTPUT("LOP"),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #12 lore raw

PATCH 12/13 ASoC: Convert wm8991 MICBIAS to a supply widget

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8991.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

sound/soc/codecs/wm8991.c +2 -2

index c9ab3ba..1d46d59 100644
@@ -770,8 +770,8 @@ static const struct snd_soc_dapm_widget wm8991_dapm_widgets[] = {
 		NULL, 0),
 
 	/* MICBIAS */
-	SND_SOC_DAPM_MICBIAS("MICBIAS", WM8991_POWER_MANAGEMENT_1,
-		WM8991_MICBIAS_ENA_BIT, 0),
+	SND_SOC_DAPM_SUPPLY("MICBIAS", WM8991_POWER_MANAGEMENT_1,
+			    WM8991_MICBIAS_ENA_BIT, 0, NULL, 0),
 
 	SND_SOC_DAPM_OUTPUT("LON"),
 	SND_SOC_DAPM_OUTPUT("LOP"),

Signature · 1 line

1.7.6.3

Mark Brown

author

2011-10-27 07:55 UTC #13 lore raw

PATCH 13/13 ASoC: Convert wm8995 MICBIASes to supply widgets

In reply to Mark Brown

Signed-off-by Mark Brown <[email protected]>

---
 sound/soc/codecs/wm8995.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

sound/soc/codecs/wm8995.c +4 -2

index 78eeb21..4d109b1 100644
@@ -688,8 +688,10 @@ static const struct snd_soc_dapm_widget wm8995_dapm_widgets[] = {
 	SND_SOC_DAPM_MIXER("IN1R PGA", SND_SOC_NOPM, 0, 0,
 		&in1r_pga, 1),
 
-	SND_SOC_DAPM_MICBIAS("MICBIAS1", WM8995_POWER_MANAGEMENT_1, 8, 0),
-	SND_SOC_DAPM_MICBIAS("MICBIAS2", WM8995_POWER_MANAGEMENT_1, 9, 0),
+	SND_SOC_DAPM_SUPPLY("MICBIAS1", WM8995_POWER_MANAGEMENT_1, 8, 0,
+			    NULL, 0),
+	SND_SOC_DAPM_SUPPLY("MICBIAS2", WM8995_POWER_MANAGEMENT_1, 9, 0,
+			    NULL, 0),
 
 	SND_SOC_DAPM_SUPPLY("AIF1CLK", WM8995_AIF1_CLOCKING_1, 0, 0, NULL, 0),
 	SND_SOC_DAPM_SUPPLY("AIF2CLK", WM8995_AIF2_CLOCKING_1, 0, 0, NULL, 0),

Signature · 1 line

1.7.6.3