Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 769b4753 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/component' of... 

Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-suspend
parents e02c716d b792346f

include/sound/soc.h

+45 −23
Original line number Diff line number Diff line
@@ -690,6 +690,17 @@ struct snd_soc_compr_ops { 
struct snd_soc_component_driver {

	const char *name;



	/* Default control and setup, added after probe() is run */

	const struct snd_kcontrol_new *controls;

	unsigned int num_controls;

	const struct snd_soc_dapm_widget *dapm_widgets;

	unsigned int num_dapm_widgets;

	const struct snd_soc_dapm_route *dapm_routes;

	unsigned int num_dapm_routes;



	int (*probe)(struct snd_soc_component *);

	void (*remove)(struct snd_soc_component *);



	/* DT */

	int (*of_xlate_dai_name)(struct snd_soc_component *component,

				 struct of_phandle_args *args,
@@ -697,6 +708,10 @@ struct snd_soc_component_driver { 
	void (*seq_notifier)(struct snd_soc_component *, enum snd_soc_dapm_type,

		int subseq);

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



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

	int probe_order;

	int remove_order;

};



struct snd_soc_component {
@@ -710,6 +725,7 @@ struct snd_soc_component { 


	unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */

	unsigned int registered_as_component:1;

	unsigned int probed:1;



	struct list_head list;
@@ -728,9 +744,36 @@ struct snd_soc_component { 


	struct mutex io_mutex;



#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_root;

#endif



	/*

	* DO NOT use any of the fields below in drivers, they are temporary and

	* are going to be removed again soon. If you use them in driver code the

	* driver will be marked as BROKEN when these fields are removed.

	*/



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

	struct snd_soc_dapm_context dapm;

	struct snd_soc_dapm_context *dapm_ptr;



	const struct snd_kcontrol_new *controls;

	unsigned int num_controls;

	const struct snd_soc_dapm_widget *dapm_widgets;

	unsigned int num_dapm_widgets;

	const struct snd_soc_dapm_route *dapm_routes;

	unsigned int num_dapm_routes;

	bool steal_sibling_dai_widgets;

	struct snd_soc_codec *codec;



	int (*probe)(struct snd_soc_component *);

	void (*remove)(struct snd_soc_component *);



#ifdef CONFIG_DEBUG_FS

	void (*init_debugfs)(struct snd_soc_component *component);

	const char *debugfs_prefix;

#endif

};



/* SoC Audio Codec device */
@@ -746,11 +789,9 @@ struct snd_soc_codec { 
	struct snd_ac97 *ac97;  /* for ad-hoc ac97 devices */

	unsigned int cache_bypass:1; /* Suppress access to the cache */

	unsigned int suspended:1; /* Codec is in suspend PM state */

	unsigned int probed:1; /* Codec has been probed */

	unsigned int ac97_registered:1; /* Codec has been AC97 registered */

	unsigned int ac97_created:1; /* Codec has been created by SoC */

	unsigned int cache_init:1; /* codec cache has been initialized */

	u32 cache_only;  /* Suppress writes to hardware */

	u32 cache_sync; /* Cache needs to be synced to hardware */



	/* codec IO */
@@ -766,7 +807,6 @@ struct snd_soc_codec { 
	struct snd_soc_dapm_context dapm;



#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_codec_root;

	struct dentry *debugfs_reg;

#endif

};
@@ -813,10 +853,6 @@ struct snd_soc_codec_driver { 
			     enum snd_soc_dapm_type, int);



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



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

	int probe_order;

	int remove_order;

};



/* SoC platform interface */
@@ -853,13 +889,6 @@ struct snd_soc_platform_driver { 
	/* platform stream compress ops */

	const struct snd_compr_ops *compr_ops;



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

	int probe_order;

	int remove_order;



	/* platform IO - used for platform DAPM */

	unsigned int (*read)(struct snd_soc_platform *, unsigned int);

	int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);

	int (*bespoke_trigger)(struct snd_pcm_substream *, int);

};
@@ -874,15 +903,10 @@ struct snd_soc_platform { 
	const struct snd_soc_platform_driver *driver;



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

	unsigned int probed:1;



	struct list_head list;



	struct snd_soc_component component;



#ifdef CONFIG_DEBUG_FS

	struct dentry *debugfs_platform_root;

#endif

};



struct snd_soc_dai_link {
@@ -994,7 +1018,7 @@ struct snd_soc_aux_dev { 
	const struct device_node *codec_of_node;



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

	int (*init)(struct snd_soc_dapm_context *dapm);

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

};



/* SoC card */
@@ -1112,6 +1136,7 @@ struct snd_soc_pcm_runtime { 
	struct snd_soc_platform *platform;

	struct snd_soc_dai *codec_dai;

	struct snd_soc_dai *cpu_dai;

	struct snd_soc_component *component; /* Only valid for AUX dev rtds */



	struct snd_soc_dai **codec_dais;

	unsigned int num_codecs;
@@ -1260,9 +1285,6 @@ void snd_soc_component_async_complete(struct snd_soc_component *component); 
int snd_soc_component_test_bits(struct snd_soc_component *component,

	unsigned int reg, unsigned int mask, unsigned int value);



int snd_soc_component_init_io(struct snd_soc_component *component,

	struct regmap *regmap);



/* device driver data */



static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,

sound/soc/samsung/speyside.c

+4 −2
Original line number Diff line number Diff line
@@ -228,10 +228,12 @@ static struct snd_soc_dai_link speyside_dai[] = { 
	},

};



static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm)

static int speyside_wm9081_init(struct snd_soc_component *component)

{

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);



	/* At any time the WM9081 is active it will have this clock */

	return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0,

	return snd_soc_codec_set_sysclk(codec, WM9081_SYSCLK_MCLK, 0,

					MCLK_AUDIO_RATE, 0);

}

sound/soc/soc-core.c

+306 −363

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/soc-generic-dmaengine-pcm.c

+3 −1
Original line number Diff line number Diff line
@@ -336,10 +336,12 @@ static const struct snd_pcm_ops dmaengine_pcm_ops = { 
};



static const struct snd_soc_platform_driver dmaengine_pcm_platform = {

	.component_driver = {

		.probe_order = SND_SOC_COMP_ORDER_LATE,

	},

	.ops		= &dmaengine_pcm_ops,

	.pcm_new	= dmaengine_pcm_new,

	.pcm_free	= dmaengine_pcm_free,

	.probe_order	= SND_SOC_COMP_ORDER_LATE,

};



static const char * const dmaengine_pcm_dma_channel_names[] = {

sound/soc/soc-io.c

+0 −28
Original line number Diff line number Diff line
@@ -271,31 +271,3 @@ int snd_soc_platform_write(struct snd_soc_platform *platform, 
	return snd_soc_component_write(&platform->component, reg, val);

}

EXPORT_SYMBOL_GPL(snd_soc_platform_write);
 


/**

 * snd_soc_component_init_io() - Initialize regmap IO

 *

 * @component: component to initialize

 * @regmap: regmap instance to use for IO operations

 *

 * Return: 0 on success, a negative error code otherwise

 */

int snd_soc_component_init_io(struct snd_soc_component *component,

	struct regmap *regmap)

{

	int ret;



	if (!regmap)

		return -EINVAL;



	ret = regmap_get_val_bytes(regmap);

	/* Errors are legitimate for non-integer byte

	 * multiples */

	if (ret > 0)

		component->val_bytes = ret;



	component->regmap = regmap;



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_component_init_io);