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

Commit 982d411c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus 

A few small WM8994 updates to go on top of the previous lot of things
that were sent.  They collide with some -next work so I'd really like to
get them into 3.3-rc3 if possible to merge back up into the -next code.
All driver specific and unexciting in the grand scheme of things.
parents 2492250e a7c4183b

sound/soc/codecs/wm8994.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -770,6 +770,8 @@ static void vmid_reference(struct snd_soc_codec *codec) 
{

{

	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);

	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);





	pm_runtime_get_sync(codec->dev);



	wm8994->vmid_refcount++;

	wm8994->vmid_refcount++;





	dev_dbg(codec->dev, "Referencing VMID, refcount is now %d\n",

	dev_dbg(codec->dev, "Referencing VMID, refcount is now %d\n",
@@ -783,7 +785,12 @@ static void vmid_reference(struct snd_soc_codec *codec) 
				    WM8994_VMID_RAMP_MASK,

				    WM8994_VMID_RAMP_MASK,

				    WM8994_STARTUP_BIAS_ENA |

				    WM8994_STARTUP_BIAS_ENA |

				    WM8994_VMID_BUF_ENA |

				    WM8994_VMID_BUF_ENA |

				    (0x11 << WM8994_VMID_RAMP_SHIFT));

				    (0x3 << WM8994_VMID_RAMP_SHIFT));



		/* Remove discharge for line out */

		snd_soc_update_bits(codec, WM8994_ANTIPOP_1,

				    WM8994_LINEOUT1_DISCH |

				    WM8994_LINEOUT2_DISCH, 0);





		/* Main bias enable, VMID=2x40k */

		/* Main bias enable, VMID=2x40k */

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
@@ -837,6 +844,8 @@ static void vmid_dereference(struct snd_soc_codec *codec) 
				    WM8994_VMID_BUF_ENA |

				    WM8994_VMID_BUF_ENA |

				    WM8994_VMID_RAMP_MASK, 0);

				    WM8994_VMID_RAMP_MASK, 0);

	}

	}



	pm_runtime_put(codec->dev);

}

}





static int vmid_event(struct snd_soc_dapm_widget *w,

static int vmid_event(struct snd_soc_dapm_widget *w,