Commit f7acb369 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents c8dd1fec 5f3484ac

include/sound/soc-dai.h

+0 −1
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ struct snd_soc_dai { 


	struct snd_soc_dapm_widget *playback_widget;

	struct snd_soc_dapm_widget *capture_widget;

	struct snd_soc_dapm_context dapm;



	/* DAI DMA data */

	void *playback_dma_data;

include/sound/soc-dapm.h

+5 −3
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, 
					   const char *pin);

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,

				const char *pin);

void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec);

void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card);



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

void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm);
@@ -441,6 +441,8 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, 
	struct snd_soc_dapm_widget_list **list);



struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol);

struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(

	struct snd_kcontrol *kcontrol);



/* dapm widget types */

enum snd_soc_dapm_type {
@@ -524,7 +526,6 @@ struct snd_soc_dapm_widget { 
	const char *name;		/* widget name */

	const char *sname;	/* stream name */

	struct snd_soc_codec *codec;

	struct snd_soc_platform *platform;

	struct list_head list;

	struct snd_soc_dapm_context *dapm;
@@ -593,7 +594,6 @@ struct snd_soc_dapm_context { 
	struct device *dev; /* from parent - for debug */

	struct snd_soc_component *component; /* parent component */

	struct snd_soc_codec *codec; /* parent codec */

	struct snd_soc_platform *platform; /* parent platform */

	struct snd_soc_card *card; /* parent card */



	/* used during DAPM updates */
@@ -601,6 +601,8 @@ struct snd_soc_dapm_context { 
	struct list_head list;



	int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);

	int (*set_bias_level)(struct snd_soc_dapm_context *dapm,

			      enum snd_soc_bias_level level);



#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_dapm;

include/sound/soc.h

+35 −14
Original line number Diff line number Diff line
@@ -677,11 +677,15 @@ struct snd_soc_component_driver { 
	int (*of_xlate_dai_name)(struct snd_soc_component *component,

				 struct of_phandle_args *args,

				 const char **dai_name);

	void (*seq_notifier)(struct snd_soc_component *, enum snd_soc_dapm_type,

		int subseq);

	int (*stream_event)(struct snd_soc_component *, int event);

};



struct snd_soc_component {

	const char *name;

	int id;

	const char *name_prefix;

	struct device *dev;



	unsigned int active;
@@ -705,13 +709,14 @@ struct snd_soc_component { 
	int val_bytes;



	struct mutex io_mutex;



	/* Don't use these, use snd_soc_component_get_dapm() */

	struct snd_soc_dapm_context dapm;

	struct snd_soc_dapm_context *dapm_ptr;

};



/* SoC Audio Codec device */

struct snd_soc_codec {

	const char *name;

	const char *name_prefix;

	int id;

	struct device *dev;

	const struct snd_soc_codec_driver *driver;
@@ -790,9 +795,6 @@ struct snd_soc_codec_driver { 
	void (*seq_notifier)(struct snd_soc_dapm_context *,

			     enum snd_soc_dapm_type, int);



	/* codec stream completion event */

	int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);



	bool ignore_pmdown_time;  /* Doesn't benefit from pmdown delay */



	/* probe ordering - for components with runtime dependencies */
@@ -834,9 +836,6 @@ struct snd_soc_platform_driver { 
	/* platform stream compress ops */

	const struct snd_compr_ops *compr_ops;



	/* platform stream completion event */

	int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);



	/* probe ordering - for components with runtime dependencies */

	int probe_order;

	int remove_order;
@@ -848,8 +847,6 @@ struct snd_soc_platform_driver { 
};



struct snd_soc_platform {

	const char *name;

	int id;

	struct device *dev;

	const struct snd_soc_platform_driver *driver;
@@ -862,8 +859,6 @@ struct snd_soc_platform { 


	struct snd_soc_component component;



	struct snd_soc_dapm_context dapm;



#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_platform_root;

#endif
@@ -1164,6 +1159,21 @@ static inline struct snd_soc_platform *snd_soc_component_to_platform( 
	return container_of(component, struct snd_soc_platform, component);

}



/**

 * snd_soc_dapm_to_component() - Casts a DAPM context to the component it is

 *  embedded in

 * @dapm: The DAPM context to cast to the component

 *

 * This function must only be used on DAPM contexts that are known to be part of

 * a component (e.g. in a component driver). Otherwise the behavior is

 * undefined.

 */

static inline struct snd_soc_component *snd_soc_dapm_to_component(

	struct snd_soc_dapm_context *dapm)

{

	return container_of(dapm, struct snd_soc_component, dapm);

}



/**

 * snd_soc_dapm_to_codec() - Casts a DAPM context to the CODEC it is embedded in

 * @dapm: The DAPM context to cast to the CODEC
@@ -1188,7 +1198,18 @@ static inline struct snd_soc_codec *snd_soc_dapm_to_codec( 
static inline struct snd_soc_platform *snd_soc_dapm_to_platform(

	struct snd_soc_dapm_context *dapm)

{

	return container_of(dapm, struct snd_soc_platform, dapm);

	return snd_soc_component_to_platform(snd_soc_dapm_to_component(dapm));

}



/**

 * snd_soc_component_get_dapm() - Returns the DAPM context associated with a

 *  component

 * @component: The component for which to get the DAPM context

 */

static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(

	struct snd_soc_component *component)

{

	return component->dapm_ptr;

}



/* codec IO */

include/trace/events/asoc.h

+3 −3
Original line number Diff line number Diff line
@@ -296,17 +296,17 @@ TRACE_EVENT(snd_soc_cache_sync, 
	TP_ARGS(codec, type, status),



	TP_STRUCT__entry(

		__string(	name,		codec->name	)

		__string(	name,		codec->component.name)

		__string(	status,		status		)

		__string(	type,		type		)

		__field(	int,		id		)

	),



	TP_fast_assign(

		__assign_str(name, codec->name);

		__assign_str(name, codec->component.name);

		__assign_str(status, status);

		__assign_str(type, type);

		__entry->id = codec->id;

		__entry->id = codec->component.id;

	),



	TP_printk("codec=%s.%d type=%s status=%s", __get_str(name),

sound/soc/codecs/tlv320dac33.c

+1 −1
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ static int dac33_soc_probe(struct snd_soc_codec *codec) 
	if (dac33->irq >= 0) {

		ret = request_irq(dac33->irq, dac33_interrupt_handler,

				  IRQF_TRIGGER_RISING,

				  codec->name, codec);

				  codec->component.name, codec);

		if (ret < 0) {

			dev_err(codec->dev, "Could not request IRQ%d (%d)\n",

						dac33->irq, ret);