diff options
| author | Sudheer Papothi <spapothi@codeaurora.org> | 2016-03-19 08:45:11 +0530 |
|---|---|---|
| committer | Jeevan Shriram <jshriram@codeaurora.org> | 2016-04-05 11:29:46 -0700 |
| commit | b9d6fa16a4fbe388301ddf128cc57e2d9949f590 (patch) | |
| tree | 5a4fc8675890dad033f20db6de62e5f2616606d9 /sound | |
| parent | 37346111cc698c3b69db9ed50d87e6f6b6a6509a (diff) | |
ASoC: msmcobalt: Machine driver changes for kernel 4.4
Incorporate kernel 4.4 changes on msmcobalt machine
driver.
Change-Id: I74539e626c641c78c4b1ed759e0b9da1b82e89cf
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/msm/Kconfig | 3 | ||||
| -rw-r--r-- | sound/soc/msm/msmcobalt.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig index 184eead9e383..e8fc5f622c3e 100644 --- a/sound/soc/msm/Kconfig +++ b/sound/soc/msm/Kconfig @@ -116,7 +116,8 @@ config SND_SOC_MSM8996 config SND_SOC_MSMCOBALT tristate "SoC Machine driver for MSMCOBALT boards" - depends on ARCH_MSMCOBALT + depends on ARCH_QCOM + select SND_SOC_COMPRESS select SND_SOC_QDSP6V2 select SND_SOC_MSM_STUB select SND_SOC_MSM_HOSTLESS_PCM diff --git a/sound/soc/msm/msmcobalt.c b/sound/soc/msm/msmcobalt.c index a9ab85ab0083..c78265e5a23c 100644 --- a/sound/soc/msm/msmcobalt.c +++ b/sound/soc/msm/msmcobalt.c @@ -584,13 +584,15 @@ static int msm_snd_enable_codec_ext_clk(struct snd_soc_codec *codec, static int msm_mclk_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { + struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + pr_debug("%s: event = %d\n", __func__, event); switch (event) { case SND_SOC_DAPM_PRE_PMU: - return msm_snd_enable_codec_ext_clk(w->codec, 1, true); + return msm_snd_enable_codec_ext_clk(codec, 1, true); case SND_SOC_DAPM_POST_PMD: - return msm_snd_enable_codec_ext_clk(w->codec, 0, true); + return msm_snd_enable_codec_ext_clk(codec, 0, true); } return 0; } @@ -897,7 +899,7 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd) int ret = 0; void *config_data; struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; + struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_pcm_runtime *rtd_aux = rtd->card->rtd_aux; @@ -2398,7 +2400,7 @@ static int msm_wsa881x_init(struct snd_soc_component *component) return -EINVAL; } - dapm = &codec->dapm; + dapm = snd_soc_codec_get_dapm(codec); if (!strcmp(component->name_prefix, "SpkrLeft")) { dev_dbg(codec->dev, "%s: setting left ch map to codec %s\n", |