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

Conflicts:
	include/sound/soc.h

diff --cc include/sound/soc.h
index a72af63279874853718a3fe1552a0375c56bcf26,1dd7dc5f7d5230b30a19a51dff5c2a9577ed903d..b13eecbaea7873e889177801490c413c4bef9435
--- 1/include/sound/soc.h
--- 2/include/sound/soc.h
+++ b/include/sound/soc.h
@@@ -630,6 -658,39 +631,26 @@@ struct snd_soc_compr_ops 
        int (*trigger)(struct snd_compr_stream *);
  };
  
 -/* SoC cache ops */
 -struct snd_soc_cache_ops {
 -      const char *name;
 -      enum snd_soc_compress_type id;
 -      int (*init)(struct snd_soc_codec *codec);
 -      int (*exit)(struct snd_soc_codec *codec);
 -      int (*read)(struct snd_soc_codec *codec, unsigned int reg,
 -              unsigned int *value);
 -      int (*write)(struct snd_soc_codec *codec, unsigned int reg,
 -              unsigned int value);
 -      int (*sync)(struct snd_soc_codec *codec);
 -};
 -
+ /* component interface */
+ struct snd_soc_component_driver {
+       const char *name;
+ 
+       /* DT */
+       int (*of_xlate_dai_name)(struct snd_soc_component *component,
+                                struct of_phandle_args *args,
+                                const char **dai_name);
+ };
+ 
+ struct snd_soc_component {
+       const char *name;
+       int id;
+       int num_dai;
+       struct device *dev;
+       struct list_head list;
+ 
+       const struct snd_soc_component_driver *driver;
+ };
+ 
  /* SoC Audio Codec device */
  struct snd_soc_codec {
        const char *name;

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