diff options
author | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:51 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:51 +0100 |
commit | 5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36 (patch) | |
tree | 1272753ff995b96c610c922f1963fb454f900311 /sound/soc/samsung | |
parent | 832a94143c549bc750350c4e770f1f604e6aaffb (diff) | |
parent | b2d9de549c30170eed5691d369cf16680e0ce03a (diff) |
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r-- | sound/soc/samsung/speyside.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 9902efcb8ea1..a05482651aae 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -228,10 +228,12 @@ static struct snd_soc_dai_link speyside_dai[] = { }, }; -static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm) +static int speyside_wm9081_init(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + /* At any time the WM9081 is active it will have this clock */ - return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0, + return snd_soc_codec_set_sysclk(codec, WM9081_SYSCLK_MCLK, 0, MCLK_AUDIO_RATE, 0); } |