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

Commit 5c434119 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/codec-component' of... 

Merge branch 'topic/codec-component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sunxi
parents c1d5065a 8180bd56

include/sound/soc.h

+0 −8
Original line number Diff line number Diff line
@@ -898,14 +898,6 @@ struct snd_soc_codec_driver { 
	int (*resume)(struct snd_soc_codec *);

	struct snd_soc_component_driver component_driver;



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

	const struct snd_kcontrol_new *controls;

	int num_controls;

	const struct snd_soc_dapm_widget *dapm_widgets;

	int num_dapm_widgets;

	const struct snd_soc_dapm_route *dapm_routes;

	int num_dapm_routes;



	/* codec wide operations */

	int (*set_sysclk)(struct snd_soc_codec *codec,

			  int clk_id, int source, unsigned int freq, int dir);

sound/soc/atmel/atmel-classd.c

+4 −2
Original line number Diff line number Diff line
@@ -308,9 +308,11 @@ static struct regmap *atmel_classd_codec_get_remap(struct device *dev) 


static struct snd_soc_codec_driver soc_codec_dev_classd = {

	.probe		= atmel_classd_codec_probe,

	.get_regmap	= atmel_classd_codec_get_remap,

	.component_driver = {

		.controls		= atmel_classd_snd_controls,

		.num_controls		= ARRAY_SIZE(atmel_classd_snd_controls),

	.get_regmap	= atmel_classd_codec_get_remap,

	},

};



/* codec dai component */

sound/soc/atmel/atmel-pdmic.c

+4 −2
Original line number Diff line number Diff line
@@ -357,8 +357,10 @@ static int atmel_pdmic_codec_probe(struct snd_soc_codec *codec) 


static struct snd_soc_codec_driver soc_codec_dev_pdmic = {

	.probe		= atmel_pdmic_codec_probe,

	.component_driver = {

		.controls		= atmel_pdmic_snd_controls,

		.num_controls		= ARRAY_SIZE(atmel_pdmic_snd_controls),

	},

};



/* codec dai component */

sound/soc/codecs/88pm860x-codec.c

+8 −6
Original line number Diff line number Diff line
@@ -1361,12 +1361,14 @@ static struct snd_soc_codec_driver soc_codec_dev_pm860x = { 
	.set_bias_level	= pm860x_set_bias_level,

	.get_regmap	= pm860x_get_regmap,



	.component_driver = {

		.controls		= pm860x_snd_controls,

		.num_controls		= ARRAY_SIZE(pm860x_snd_controls),

		.dapm_widgets		= pm860x_dapm_widgets,

		.num_dapm_widgets	= ARRAY_SIZE(pm860x_dapm_widgets),

		.dapm_routes		= pm860x_dapm_routes,

		.num_dapm_routes	= ARRAY_SIZE(pm860x_dapm_routes),

	},

};



static int pm860x_codec_probe(struct platform_device *pdev)

sound/soc/codecs/ab8500-codec.c

+8 −6
Original line number Diff line number Diff line
@@ -2525,12 +2525,14 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) 


static struct snd_soc_codec_driver ab8500_codec_driver = {

	.probe =		ab8500_codec_probe,

	.component_driver = {

		.controls =		ab8500_ctrls,

		.num_controls =		ARRAY_SIZE(ab8500_ctrls),

		.dapm_widgets =		ab8500_dapm_widgets,

		.num_dapm_widgets =	ARRAY_SIZE(ab8500_dapm_widgets),

		.dapm_routes =		ab8500_dapm_routes,

		.num_dapm_routes =	ARRAY_SIZE(ab8500_dapm_routes),

	},

};



static int ab8500_codec_driver_probe(struct platform_device *pdev)