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

Commit af472119 authored by Banajit Goswami's avatar Banajit Goswami
Browse files

ASoC: codecs: move kcontrols out of codec driver structure 



Move kcontrols from codec driver structure to component
driver structure in all WCD, HDMI 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: I92353fadd4ba932d508d3551fb05d6b138ffd4bb
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
parent 9870662b

sound/soc/codecs/msm_hdmi_codec_rx.c

+4 −2
Original line number Diff line number Diff line
@@ -432,8 +432,10 @@ static struct snd_soc_dai_driver msm_ext_disp_audio_codec_rx_dais[] = { 
static struct snd_soc_codec_driver msm_ext_disp_audio_codec_rx_soc_driver = {

	.probe = msm_ext_disp_audio_codec_rx_probe,

	.remove =  msm_ext_disp_audio_codec_rx_remove,

	.component_driver = {

		.controls = msm_ext_disp_codec_rx_controls,

		.num_controls = ARRAY_SIZE(msm_ext_disp_codec_rx_controls),

	},

};



static int msm_ext_disp_audio_codec_rx_plat_probe(

sound/soc/codecs/wcd9330.c

+2 −2
Original line number Diff line number Diff line
@@ -9011,12 +9011,12 @@ static struct regmap *tomtom_get_regmap(struct device *dev) 
}



static struct snd_soc_codec_driver soc_codec_dev_tomtom = {

	.controls = tomtom_snd_controls,

	.num_controls = ARRAY_SIZE(tomtom_snd_controls),

	.get_regmap = tomtom_get_regmap,

	.component_driver = {

		.probe = tomtom_codec_probe,

		.remove = tomtom_codec_remove,

		.controls = tomtom_snd_controls,

		.num_controls = ARRAY_SIZE(tomtom_snd_controls),

		.dapm_widgets = tomtom_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(tomtom_dapm_widgets),

		.dapm_routes = audio_map,

sound/soc/codecs/wcd9335.c

+2 −2
Original line number Diff line number Diff line
@@ -13767,12 +13767,12 @@ static struct regmap *tasha_get_regmap(struct device *dev) 
}



static struct snd_soc_codec_driver soc_codec_dev_tasha = {

	.controls = tasha_snd_controls,

	.num_controls = ARRAY_SIZE(tasha_snd_controls),

	.get_regmap = tasha_get_regmap,

	.component_driver = {

		.probe = tasha_codec_probe,

		.remove = tasha_codec_remove,

		.controls = tasha_snd_controls,

		.num_controls = ARRAY_SIZE(tasha_snd_controls),

		.dapm_widgets = tasha_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(tasha_dapm_widgets),

		.dapm_routes = audio_map,

sound/soc/codecs/wcd934x/wcd934x.c

+2 −2
Original line number Diff line number Diff line
@@ -9058,12 +9058,12 @@ static struct regmap *tavil_get_regmap(struct device *dev) 
}



static struct snd_soc_codec_driver soc_codec_dev_tavil = {

	.controls = tavil_snd_controls,

	.num_controls = ARRAY_SIZE(tavil_snd_controls),

	.get_regmap = tavil_get_regmap,

	.component_driver = {

		.probe = tavil_soc_codec_probe,

		.remove = tavil_soc_codec_remove,

		.controls = tavil_snd_controls,

		.num_controls = ARRAY_SIZE(tavil_snd_controls),

		.dapm_widgets = tavil_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(tavil_dapm_widgets),

		.dapm_routes = tavil_audio_map,

sound/soc/codecs/wsa881x-analog.c

+2 −3
Original line number Diff line number Diff line
@@ -1095,13 +1095,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wsa881x = { 
	.reg_cache_default = wsa881x_ana_reg_defaults,

	.reg_word_size = 1,



	.controls = wsa881x_snd_controls,

	.num_controls = ARRAY_SIZE(wsa881x_snd_controls),



	.component_driver = {

		.probe	= wsa881x_probe,

		.remove	= wsa881x_remove,



		.controls = wsa881x_snd_controls,

		.num_controls = ARRAY_SIZE(wsa881x_snd_controls),

		.dapm_widgets = wsa881x_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(wsa881x_dapm_widgets),

		.dapm_routes = wsa881x_audio_map,