| Message ID | 1430674030-1388-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 239ad6a18142271ac0cb332671c199d28d144f7f |
| Headers | show |
On Sun, May 03, 2015 at 07:27:06PM +0200, Lars-Peter Clausen wrote: > The dapm field of the snd_soc_codec struct will eventually be removed > (replaced with the DAPM context from the component embedded inside the > CODEC). Replace its usage with the card's DAPM context. The idea is that > DAPM is hierarchical and with the card at the root it is possible to access > widgets from other contexts through the card context. > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Thanks, Charles
On Sun, May 03, 2015 at 07:27:06PM +0200, Lars-Peter Clausen wrote: > The dapm field of the snd_soc_codec struct will eventually be removed > (replaced with the DAPM context from the component embedded inside the > CODEC). Replace its usage with the card's DAPM context. The idea is that > DAPM is hierarchical and with the card at the root it is possible to access > widgets from other contexts through the card context. Applied all, thanks. Whenever the headers were reorganized to remove references to the mach headers these dependencies should have been updated.
diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c index 5f15609..0d0f582 100644 --- a/sound/soc/samsung/lowland.c +++ b/sound/soc/samsung/lowland.c @@ -72,7 +72,7 @@ static int lowland_wm9081_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; - snd_soc_dapm_nc_pin(&codec->dapm, "LINEOUT"); + snd_soc_dapm_nc_pin(&rtd->card->dapm, "LINEOUT"); /* At any time the WM9081 is active it will have this clock */ return snd_soc_codec_set_sysclk(codec, WM9081_SYSCLK_MCLK, 0,
The dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- sound/soc/samsung/lowland.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)