renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2013-06-17 17:20:26 +01:00
commit 1ee9271d67
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/samsung/bells.c
View File

@ -350,8 +350,16 @@ static struct snd_soc_codec_conf bells_codec_conf[] = {
}, },
}; };
static struct snd_soc_dapm_widget bells_widgets[] = {
SND_SOC_DAPM_MIC("DMIC", NULL),
};
static struct snd_soc_dapm_route bells_routes[] = { static struct snd_soc_dapm_route bells_routes[] = {
{ "Sub CLK_SYS", NULL, "OPCLK" }, { "Sub CLK_SYS", NULL, "OPCLK" },
{ "DMIC", NULL, "MICBIAS2" },
{ "IN2L", NULL, "DMIC" },
{ "IN2R", NULL, "DMIC" },
}; };
static struct snd_soc_card bells_cards[] = { static struct snd_soc_card bells_cards[] = {
@ -365,6 +373,8 @@ static struct snd_soc_card bells_cards[] = {
.late_probe = bells_late_probe, .late_probe = bells_late_probe,
.dapm_widgets = bells_widgets,
.num_dapm_widgets = ARRAY_SIZE(bells_widgets),
.dapm_routes = bells_routes, .dapm_routes = bells_routes,
.num_dapm_routes = ARRAY_SIZE(bells_routes), .num_dapm_routes = ARRAY_SIZE(bells_routes),
@ -383,6 +393,8 @@ static struct snd_soc_card bells_cards[] = {
.late_probe = bells_late_probe, .late_probe = bells_late_probe,
.dapm_widgets = bells_widgets,
.num_dapm_widgets = ARRAY_SIZE(bells_widgets),
.dapm_routes = bells_routes, .dapm_routes = bells_routes,
.num_dapm_routes = ARRAY_SIZE(bells_routes), .num_dapm_routes = ARRAY_SIZE(bells_routes),
@ -401,6 +413,8 @@ static struct snd_soc_card bells_cards[] = {
.late_probe = bells_late_probe, .late_probe = bells_late_probe,
.dapm_widgets = bells_widgets,
.num_dapm_widgets = ARRAY_SIZE(bells_widgets),
.dapm_routes = bells_routes, .dapm_routes = bells_routes,
.num_dapm_routes = ARRAY_SIZE(bells_routes), .num_dapm_routes = ARRAY_SIZE(bells_routes),

1
sound/soc/samsung/smdk_wm8580pcm.c
View File

@ -176,7 +176,6 @@ static int snd_smdk_probe(struct platform_device *pdev)
static int snd_smdk_remove(struct platform_device *pdev) static int snd_smdk_remove(struct platform_device *pdev)
{ {
snd_soc_unregister_card(&smdk_pcm); snd_soc_unregister_card(&smdk_pcm);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }

1
sound/soc/samsung/smdk_wm8994pcm.c
View File

@ -146,7 +146,6 @@ static int snd_smdk_probe(struct platform_device *pdev)
static int snd_smdk_remove(struct platform_device *pdev) static int snd_smdk_remove(struct platform_device *pdev)
{ {
snd_soc_unregister_card(&smdk_pcm); snd_soc_unregister_card(&smdk_pcm);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }