From: Mark Brown <broonie@linaro.org>
Date: Tue, 17 Sep 2013 12:25:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/component' into asoc-core
X-Git-Tag: v3.13-rc1~2^2~33^2~40^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d930ce26e01470590cd003484b32df29529906c;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Conflicts:
	include/sound/soc.h
---

7d930ce26e01470590cd003484b32df29529906c
diff --cc include/sound/soc.h
index a72af63,1dd7dc5..b13eecb
--- a/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;