Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 620c36ae authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents 7cfa467b adf46362

sound/soc/codecs/wm9081.c

+5 −5
Original line number Diff line number Diff line
@@ -866,7 +866,6 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec, 
			mdelay(100);



			/* Normal bias enable & soft start off */

			reg |= WM9081_BIAS_ENA;

			reg &= ~WM9081_VMID_RAMP;

			snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
@@ -877,7 +876,7 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec, 
		}



		/* VMID 2*240k */

		reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);

		reg = snd_soc_read(codec, WM9081_VMID_CONTROL);

		reg &= ~WM9081_VMID_SEL_MASK;

		reg |= 0x04;

		snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
@@ -889,14 +888,15 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec, 
		break;



	case SND_SOC_BIAS_OFF:

		/* Startup bias source */

		/* Startup bias source and disable bias */

		reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);

		reg |= WM9081_BIAS_SRC;

		reg &= ~WM9081_BIAS_ENA;

		snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);



		/* Disable VMID and biases with soft ramping */

		/* Disable VMID with soft ramping */

		reg = snd_soc_read(codec, WM9081_VMID_CONTROL);

		reg &= ~(WM9081_VMID_SEL_MASK | WM9081_BIAS_ENA);

		reg &= ~WM9081_VMID_SEL_MASK;

		reg |= WM9081_VMID_RAMP;

		snd_soc_write(codec, WM9081_VMID_CONTROL, reg);