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

Commit 9ba3a2b2 authored by Rohit Kumar's avatar Rohit Kumar Committed by Gerrit - the friendly Code Review server
Browse files

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



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

Change-Id: I78ee4fccabad98fa9740db91711bb17f50b2e346
Signed-off-by: default avatarRohit Kumar <rohitkr@codeaurora.org>
parent 8ce8e9c0

sound/soc/codecs/msm_sdw/msm_sdw_cdc.c

+8 −6
Original line number Diff line number Diff line
@@ -1761,13 +1761,15 @@ static struct regmap *msm_sdw_get_regmap(struct device *dev) 
static struct snd_soc_codec_driver soc_codec_dev_msm_sdw = {

	.probe = msm_sdw_codec_probe,

	.remove = msm_sdw_codec_remove,

	.get_regmap = msm_sdw_get_regmap,

	.component_driver = {

		.controls = msm_sdw_snd_controls,

		.num_controls = ARRAY_SIZE(msm_sdw_snd_controls),

		.dapm_widgets = msm_sdw_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(msm_sdw_dapm_widgets),

		.dapm_routes = audio_map,

		.num_dapm_routes = ARRAY_SIZE(audio_map),

	.get_regmap = msm_sdw_get_regmap,

	},

};



static void msm_sdw_add_child_devices(struct work_struct *work)

sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c

+8 −6
Original line number Diff line number Diff line
@@ -4320,13 +4320,15 @@ static struct snd_soc_codec_driver soc_codec_dev_sdm660_cdc = { 
	.suspend = msm_anlg_cdc_suspend,

	.resume = msm_anlg_cdc_resume,

	.reg_word_size = 1,

	.get_regmap = msm_anlg_get_regmap,

	.component_driver = {

		.controls = msm_anlg_cdc_snd_controls,

		.num_controls = ARRAY_SIZE(msm_anlg_cdc_snd_controls),

		.dapm_widgets = msm_anlg_cdc_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(msm_anlg_cdc_dapm_widgets),

		.dapm_routes = audio_map,

		.num_dapm_routes = ARRAY_SIZE(audio_map),

	.get_regmap = msm_anlg_get_regmap,

	},

};



static int msm_anlg_cdc_init_supplies(struct sdm660_cdc_priv *sdm660_cdc,

sound/soc/codecs/sdm660_cdc/msm-digital-cdc.c

+8 −6
Original line number Diff line number Diff line
@@ -2037,13 +2037,15 @@ static struct snd_soc_codec_driver soc_msm_dig_codec = { 
	.remove = msm_dig_cdc_soc_remove,

	.suspend = msm_dig_cdc_suspend,

	.resume = msm_dig_cdc_resume,

	.get_regmap = msm_digital_get_regmap,

	.component_driver = {

		.controls = msm_dig_snd_controls,

		.num_controls = ARRAY_SIZE(msm_dig_snd_controls),

		.dapm_widgets = msm_dig_dapm_widgets,

		.num_dapm_widgets = ARRAY_SIZE(msm_dig_dapm_widgets),

		.dapm_routes = audio_dig_map,

		.num_dapm_routes = ARRAY_SIZE(audio_dig_map),

	.get_regmap = msm_digital_get_regmap,

	},

};



const struct regmap_config msm_digital_regmap_config = {