lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Convert SmartQ to table based init

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
This commit is contained in:
Mark Brown
2011-10-08 13:30:55 +01:00
parent 8ae232299e
commit 257fe5930d
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sound/soc/samsung/smartq_wm8987.c
View File

@@ -153,20 +153,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_dapm_context *dapm = &codec->dapm; struct snd_soc_dapm_context *dapm = &codec->dapm;
int err = 0; int err = 0;
/* Add SmartQ specific widgets */
snd_soc_dapm_new_controls(dapm, wm8987_dapm_widgets,
ARRAY_SIZE(wm8987_dapm_widgets));
/* add SmartQ specific controls */
err = snd_soc_add_controls(codec, wm8987_smartq_controls,
ARRAY_SIZE(wm8987_smartq_controls));
if (err < 0)
return err;
/* setup SmartQ specific audio path */
snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
/* set endpoints to not connected */ /* set endpoints to not connected */
snd_soc_dapm_nc_pin(dapm, "LINPUT1"); snd_soc_dapm_nc_pin(dapm, "LINPUT1");
snd_soc_dapm_nc_pin(dapm, "RINPUT1"); snd_soc_dapm_nc_pin(dapm, "RINPUT1");
@@ -213,6 +199,13 @@ static struct snd_soc_card snd_soc_smartq = {
.name = "SmartQ", .name = "SmartQ",
.dai_link = smartq_dai, .dai_link = smartq_dai,
.num_links = ARRAY_SIZE(smartq_dai), .num_links = ARRAY_SIZE(smartq_dai),
.dapm_widgets = wm8987_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(wm8987_dapm_widgets),
.dapm_routes = audio_map,
.num_dapm_routes = ARRAY_SIZE(audio_map),
.controls = wm8987_smartq_controls,
.num_controls = ARRAY_SIZE(wm8987_smartq_controls),
}; };
static struct platform_device *smartq_snd_device; static struct platform_device *smartq_snd_device;