Merge branches 'topic/dmic' and 'topic/qcom' of git://git.kernel.org/pub/scm/linux...

diff --cc sound/soc/codecs/msm8916-wcd-analog.c
index f9a74ff2ce99a8a7820a8efaaf20be51bd109f71,4cc52cecf3b705815c7ac36bf13ad1d522a809d9,aec1e1626993bcc10c044ab71847b0d17c000ca7..1454f54f097708c9a475dd8d351e3e36694a16a2
--- 1/sound/soc/codecs/msm8916-wcd-analog.c
--- 2/sound/soc/codecs/msm8916-wcd-analog.c
--- 3/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",

diff --cc sound/soc/codecs/msm8916-wcd-digital.c
Simple merge