mirror of https://gitee.com/openkylin/linux.git
ASoC: Convert RX1950 to table based init
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Sangbeom Kim <sbkim73@samsung.com>
This commit is contained in:
parent
6119d016b1
commit
8ae232299e
|
@ -90,12 +90,6 @@ static struct snd_soc_dai_link rx1950_uda1380_dai[] = {
|
|||
},
|
||||
};
|
||||
|
||||
static struct snd_soc_card rx1950_asoc = {
|
||||
.name = "rx1950",
|
||||
.dai_link = rx1950_uda1380_dai,
|
||||
.num_links = ARRAY_SIZE(rx1950_uda1380_dai),
|
||||
};
|
||||
|
||||
/* rx1950 machine dapm widgets */
|
||||
static const struct snd_soc_dapm_widget uda1380_dapm_widgets[] = {
|
||||
SND_SOC_DAPM_HP("Headphone Jack", NULL),
|
||||
|
@ -117,6 +111,17 @@ static const struct snd_soc_dapm_route audio_map[] = {
|
|||
{"VINM", NULL, "Mic Jack"},
|
||||
};
|
||||
|
||||
static struct snd_soc_card rx1950_asoc = {
|
||||
.name = "rx1950",
|
||||
.dai_link = rx1950_uda1380_dai,
|
||||
.num_links = ARRAY_SIZE(rx1950_uda1380_dai),
|
||||
|
||||
.dapm_widgets = uda1380_dapm_widgets,
|
||||
.num_dapm_widgets = ARRAY_SIZE(uda1380_dapm_widgets),
|
||||
.dapm_routes = audio_map,
|
||||
.num_dapm_routes = ARRAY_SIZE(audio_map),
|
||||
};
|
||||
|
||||
static struct platform_device *s3c24xx_snd_device;
|
||||
|
||||
static int rx1950_startup(struct snd_pcm_substream *substream)
|
||||
|
@ -220,20 +225,6 @@ static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
|
|||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
int err;
|
||||
|
||||
/* Add rx1950 specific widgets */
|
||||
err = snd_soc_dapm_new_controls(dapm, uda1380_dapm_widgets,
|
||||
ARRAY_SIZE(uda1380_dapm_widgets));
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
/* Set up rx1950 specific audio path audio_mapnects */
|
||||
err = snd_soc_dapm_add_routes(dapm, audio_map,
|
||||
ARRAY_SIZE(audio_map));
|
||||
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
|
||||
snd_soc_dapm_enable_pin(dapm, "Speaker");
|
||||
snd_soc_dapm_enable_pin(dapm, "Mic Jack");
|
||||
|
|
Loading…
Reference in New Issue