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

Commit 8e306f0a authored by Banajit Goswami's avatar Banajit Goswami Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: wcd: move DAPM widgets and routes out of codec driver structure 



Move DAPM widgets and routes from codec driver structure to
component driver structure in all WCD and WSA drivers.
These changes are in accordance with the upstream changes
in ASoC between Linux-4.4 and Linux-4.9 versions.

Change-Id: Ib3eef8ad60926686a194887f7b008825f28cdd77
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent de8271c7

sound/soc/codecs/wcd9330.c

+6 −4
Original line number Diff line number Diff line
@@ -9013,11 +9013,13 @@ static struct snd_soc_codec_driver soc_codec_dev_tomtom = { 
	.remove = tomtom_codec_remove,

	.controls = tomtom_snd_controls,

	.num_controls = ARRAY_SIZE(tomtom_snd_controls),

	.get_regmap = tomtom_get_regmap,

	.component_driver = {

		.dapm_widgets = tomtom_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(tomtom_dapm_widgets),

		.dapm_routes = audio_map,

		.num_dapm_routes = ARRAY_SIZE(audio_map),

	.get_regmap = tomtom_get_regmap,

	},

};



#ifdef CONFIG_PM

sound/soc/codecs/wcd9335.c

+6 −4
Original line number Diff line number Diff line
@@ -13769,11 +13769,13 @@ static struct snd_soc_codec_driver soc_codec_dev_tasha = { 
	.remove = tasha_codec_remove,

	.controls = tasha_snd_controls,

	.num_controls = ARRAY_SIZE(tasha_snd_controls),

	.get_regmap = tasha_get_regmap,

	.component_driver = {

		.dapm_widgets = tasha_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(tasha_dapm_widgets),

		.dapm_routes = audio_map,

		.num_dapm_routes = ARRAY_SIZE(audio_map),

	.get_regmap = tasha_get_regmap,

	},

};



#ifdef CONFIG_PM

sound/soc/codecs/wcd934x/wcd934x.c

+6 −4
Original line number Diff line number Diff line
@@ -9060,11 +9060,13 @@ static struct snd_soc_codec_driver soc_codec_dev_tavil = { 
	.remove = tavil_soc_codec_remove,

	.controls = tavil_snd_controls,

	.num_controls = ARRAY_SIZE(tavil_snd_controls),

	.get_regmap = tavil_get_regmap,

	.component_driver = {

		.dapm_widgets = tavil_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(tavil_dapm_widgets),

		.dapm_routes = tavil_audio_map,

		.num_dapm_routes = ARRAY_SIZE(tavil_audio_map),

	.get_regmap = tavil_get_regmap,

	},

};



#ifdef CONFIG_PM

sound/soc/codecs/wsa881x-analog.c

+7 −4
Original line number Diff line number Diff line
@@ -1098,10 +1098,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wsa881x = { 


	.controls = wsa881x_snd_controls,

	.num_controls = ARRAY_SIZE(wsa881x_snd_controls),



	.component_driver = {

		.dapm_widgets = wsa881x_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(wsa881x_dapm_widgets),

		.dapm_routes = wsa881x_audio_map,

		.num_dapm_routes = ARRAY_SIZE(wsa881x_audio_map),

	},

};



static int wsa881x_reset(struct wsa881x_pdata *pdata, bool enable)

sound/soc/codecs/wsa881x.c

+6 −4
Original line number Diff line number Diff line
@@ -1079,11 +1079,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wsa881x = { 
	.remove = wsa881x_remove,

	.controls = wsa881x_snd_controls,

	.num_controls = ARRAY_SIZE(wsa881x_snd_controls),

	.get_regmap = wsa881x_get_regmap,

	.component_driver = {

		.dapm_widgets = wsa881x_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(wsa881x_dapm_widgets),

		.dapm_routes = wsa881x_audio_map,

		.num_dapm_routes = ARRAY_SIZE(wsa881x_audio_map),

	.get_regmap = wsa881x_get_regmap,

	},

};



static int wsa881x_swr_startup(struct swr_device *swr_dev)