diff options
Diffstat (limited to 'sound/soc/samsung/littlemill.c')
| -rw-r--r-- | sound/soc/samsung/littlemill.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c index c5260e101c2a..d0d1b1ee326e 100644 --- a/sound/soc/samsung/littlemill.c +++ b/sound/soc/samsung/littlemill.c @@ -7,7 +7,6 @@ #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/jack.h> -#include <linux/gpio.h> #include <linux/module.h> #include "../codecs/wm8994.h" @@ -25,7 +24,7 @@ static int littlemill_set_bias_level(struct snd_soc_card *card, rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); aif1_dai = snd_soc_rtd_to_codec(rtd, 0); - if (dapm->dev != aif1_dai->dev) + if (snd_soc_dapm_to_dev(dapm) != aif1_dai->dev) return 0; switch (level) { @@ -34,7 +33,7 @@ static int littlemill_set_bias_level(struct snd_soc_card *card, * If we've not already clocked things via hw_params() * then do so now, otherwise these are noops. */ - if (dapm->bias_level == SND_SOC_BIAS_STANDBY) { + if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) { ret = snd_soc_dai_set_pll(aif1_dai, WM8994_FLL1, WM8994_FLL_SRC_MCLK2, 32768, sample_rate * 512); @@ -72,7 +71,7 @@ static int littlemill_set_bias_level_post(struct snd_soc_card *card, rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]); aif1_dai = snd_soc_rtd_to_codec(rtd, 0); - if (dapm->dev != aif1_dai->dev) + if (snd_soc_dapm_to_dev(dapm) != aif1_dai->dev) return 0; switch (level) { @@ -96,8 +95,6 @@ static int littlemill_set_bias_level_post(struct snd_soc_card *card, break; } - dapm->bias_level = level; - return 0; } @@ -157,7 +154,7 @@ static struct snd_soc_dai_link littlemill_dai[] = { .name = "CPU", .stream_name = "CPU", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, .ops = &littlemill_ops, SND_SOC_DAILINK_REG(cpu), }, @@ -165,7 +162,7 @@ static struct snd_soc_dai_link littlemill_dai[] = { .name = "Baseband", .stream_name = "Baseband", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF - | SND_SOC_DAIFMT_CBM_CFM, + | SND_SOC_DAIFMT_CBP_CFP, .ignore_suspend = 1, .c2c_params = &baseband_params, .num_c2c_params = 1, @@ -176,7 +173,7 @@ static struct snd_soc_dai_link littlemill_dai[] = { static int bbclk_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_card *card = w->dapm->card; + struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm); struct snd_soc_pcm_runtime *rtd; struct snd_soc_dai *aif2_dai; int ret; |