Merge remote-tracking branch 'asoc/topic/core' into asoc-next

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/soc-core.c
index 3d728785860984fecbdde181b7cef27291346e6f,92e09cb7fda4e239d5d84c2dac6f3d9ea2b8b7e9..e4ea5d4aa8d587e525de1ceac1c4427cc74b6c9f
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -3223,11 -3217,10 +3269,11 @@@ static int snd_soc_component_initialize
        component->remove = component->driver->remove;
        component->suspend = component->driver->suspend;
        component->resume = component->driver->resume;
 -      component->pcm_new = component->driver->pcm_new;
 -      component->pcm_free = component->driver->pcm_free;
 +      component->set_sysclk = component->driver->set_sysclk;
 +      component->set_pll = component->driver->set_pll;
 +      component->set_jack = component->driver->set_jack;
  
-       dapm = &component->dapm;
+       dapm = snd_soc_component_get_dapm(component);
        dapm->dev = dev;
        dapm->component = component;
        dapm->bias_level = SND_SOC_BIAS_OFF;

diff --cc sound/soc/soc-pcm.c
Simple merge