From: Mark Brown <broonie@kernel.org>
Date: Mon, 21 Aug 2017 18:31:51 +0000 (+0100)
Subject: Merge branches 'topic/dmic' and 'topic/qcom' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=702992387b759828f58e52f660acb284b3069944;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'topic/dmic' and 'topic/qcom' of git://git./linux/kernel/git/broonie/sound into asoc-msm8916
---

702992387b759828f58e52f660acb284b3069944
diff --cc sound/soc/codecs/msm8916-wcd-analog.c
index f9a74ff2ce99,4cc52cecf3b7,aec1e1626993..1454f54f0977
--- a/sound/soc/codecs/msm8916-wcd-analog.c
+++ b/sound/soc/codecs/msm8916-wcd-analog.c
@@@@ -742,6 -736,28 -736,28 +742,6 @@@@ static struct regmap *pm8916_get_regmap
   	return dev_get_regmap(dev->parent, NULL);
   }
   
 --static int pm8916_wcd_analog_startup(struct snd_pcm_substream *substream,
 --				      struct snd_soc_dai *dai)
 --{
 --	snd_soc_update_bits(dai->codec, CDC_D_CDC_RST_CTL,
 --			    RST_CTL_DIG_SW_RST_N_MASK,
 --			    RST_CTL_DIG_SW_RST_N_REMOVE_RESET);
 --
 --	return 0;
 --}
 --
 --static void pm8916_wcd_analog_shutdown(struct snd_pcm_substream *substream,
 --					 struct snd_soc_dai *dai)
 --{
 --	snd_soc_update_bits(dai->codec, CDC_D_CDC_RST_CTL,
 --			    RST_CTL_DIG_SW_RST_N_MASK, 0);
 --}
 --
 - static struct snd_soc_dai_ops pm8916_wcd_analog_dai_ops = {
  -static const struct snd_soc_dai_ops pm8916_wcd_analog_dai_ops = {
 --	.startup = pm8916_wcd_analog_startup,
 --	.shutdown = pm8916_wcd_analog_shutdown,
 --};
 --
   static struct snd_soc_dai_driver pm8916_wcd_analog_dai[] = {
   	[0] = {
   	       .name = "pm8916_wcd_analog_pdm_rx",