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

	unsigned int sample_bits;

	/* parent platform/codec */

	struct snd_soc_platform *platform;

	struct snd_soc_codec *codec;

	struct snd_soc_component *component;

	unsigned int tx_mask;

	unsigned int rx_mask;

	struct snd_soc_card *card;

	struct list_head list;

};

unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);

/* Mostly internal - should not normally be used */

void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm);

void dapm_mark_endpoints_dirty(struct snd_soc_card *card);

/* dapm path query */

int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

	/* status */

	u32 connect:1;	/* source and sink widgets are connected */

	u32 walked:1;	/* path has been walked */

	u32 walking:1;  /* path is in the process of being walked */

	u32 weak:1;	/* path ignored for power management */

	u32 is_supply:1;	/* At least one of the connected widgets is a supply */

	int (*connected)(struct snd_soc_dapm_widget *source,

			 struct snd_soc_dapm_widget *sink);

	unsigned char active:1;			/* active stream on DAC, ADC's */

	unsigned char connected:1;		/* connected codec pin */

	unsigned char new:1;			/* cnew complete */

	unsigned char ext:1;			/* has external widgets */

	unsigned char force:1;			/* force state */

	unsigned char ignore_suspend:1;         /* kept enabled over suspend */

	unsigned char new_power:1;		/* power from this run */

	unsigned char power_checked:1;		/* power checked this run */

	unsigned char is_supply:1;		/* Widget is a supply type widget */

	unsigned char is_sink:1;		/* Widget is a sink type widget */

	unsigned char is_source:1;		/* Widget is a source type widget */

	int subseq;				/* sort within widget type */

	int (*power_check)(struct snd_soc_dapm_widget *w);

	struct list_head sinks;

	/* used during DAPM updates */

	struct list_head work_list;

	struct list_head power_list;

	struct list_head dirty;

	int inputs;

	{.reg = xreg, .rreg = xreg, .shift = shift_left, \

	.rshift = shift_right, .max = xmax, .platform_max = xmax, \

	.invert = xinvert, .autodisable = xautodisable})

#define SOC_DOUBLE_S_VALUE(xreg, shift_left, shift_right, xmin, xmax, xsign_bit, xinvert, xautodisable) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xreg, .rreg = xreg, .shift = shift_left, \

	.rshift = shift_right, .min = xmin, .max = xmax, .platform_max = xmax, \

	.sign_bit = xsign_bit, .invert = xinvert, .autodisable = xautodisable})

#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert, xautodisable) \

	SOC_DOUBLE_VALUE(xreg, xshift, xshift, xmax, xinvert, xautodisable)

#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \

		  SNDRV_CTL_ELEM_ACCESS_READWRITE, \

	.tlv.p  = (tlv_array), \

	.info   = snd_soc_info_volsw_s8, .get = snd_soc_get_volsw_s8, \

	.put    = snd_soc_put_volsw_s8, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = xreg, .min = xmin, .max = xmax, \

		 .platform_max = xmax} }

	.info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\

	.put = snd_soc_put_volsw, \

	.private_value = SOC_DOUBLE_S_VALUE(xreg, 0, 8, xmin, xmax, 7, 0, 0) }

#define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xitems, xtexts) \

{	.reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \

	.items = xitems, .texts = xtexts, \

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_info_volsw_range(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,

	int (*probe)(struct snd_soc_platform *);

	int (*remove)(struct snd_soc_platform *);

	int (*suspend)(struct snd_soc_dai *dai);

	int (*resume)(struct snd_soc_dai *dai);

	struct snd_soc_component_driver component_driver;

	/* pcm creation and destruction */

struct snd_soc_dai_link_component {

	const char *name;

	const struct device_node *of_node;

	struct device_node *of_node;

	const char *dai_name;

};

	struct device *dev;

	const struct snd_soc_platform_driver *driver;

	unsigned int suspended:1; /* platform is suspended */

	struct list_head list;

	struct snd_soc_component component;

	 * DT/OF node, but not both.

	 */

	const char *dev_name;

	const struct device_node *of_node;

	struct device_node *of_node;

	/*

	 * optional map of kcontrol, widget and path name prefixes that are

	 * DT/OF node, but not both.

	 */

	const char *codec_name;

	const struct device_node *codec_of_node;

	struct device_node *codec_of_node;

	/* codec/machine specific init - e.g. add machine controls */

	int (*init)(struct snd_soc_component *component);

snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o

snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o

snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o

ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),)

snd-soc-core-objs += soc-generic-dmaengine-pcm.o