summaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/speyside.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-11 23:09:15 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-13 10:01:52 -0700
commitecfb1adf5f037eaff0b678918d84a8febd9f1c3e (patch)
tree0ada4f6d3cebd89ea465b8ad1911e7d751e775d3 /sound/soc/samsung/speyside.c
parent9b8dc66fbae53def2547df8c0a5cbe8924ea2b1f (diff)
downloadop-kernel-dev-ecfb1adf5f037eaff0b678918d84a8febd9f1c3e.zip
op-kernel-dev-ecfb1adf5f037eaff0b678918d84a8febd9f1c3e.tar.gz
ASoC: Add basic widgets for WM8915 Speyside
Provide widgets for the basic widgets connected directly to the WM8915 on Speyside - the headphones, speaker, digital and analogue microphones. For the outputs this is just documentation, for the inputs this ensures that the relevant microphone biases are enabled when they are in use. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Jassi Brar <jassisinghbrar@gmail.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/samsung/speyside.c')
-rw-r--r--sound/soc/samsung/speyside.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index f6dcee7..6ec44a3 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -63,10 +63,38 @@ static struct snd_soc_dai_link speyside_dai[] = {
},
};
+static struct snd_soc_dapm_widget widgets[] = {
+ SND_SOC_DAPM_HP("Headphone", NULL),
+
+ SND_SOC_DAPM_SPK("Main Speaker", NULL),
+
+ SND_SOC_DAPM_MIC("Main AMIC", NULL),
+ SND_SOC_DAPM_MIC("Main DMIC", NULL),
+};
+
+static struct snd_soc_dapm_route audio_paths[] = {
+ { "IN1LP", NULL, "MICB2" },
+ { "MICB2", NULL, "Main AMIC" },
+
+ { "DMIC1DAT", NULL, "MICB1" },
+ { "DMIC2DAT", NULL, "MICB1" },
+ { "MICB1", NULL, "Main DMIC" },
+
+ { "Headphone", NULL, "HPOUT1L" },
+ { "Headphone", NULL, "HPOUT1R" },
+
+ { "Main Speaker", NULL, "SPKDAT" },
+};
+
static struct snd_soc_card speyside = {
.name = "Speyside",
.dai_link = speyside_dai,
.num_links = ARRAY_SIZE(speyside_dai),
+
+ .dapm_widgets = widgets,
+ .num_dapm_widgets = ARRAY_SIZE(widgets),
+ .dapm_routes = audio_paths,
+ .num_dapm_routes = ARRAY_SIZE(audio_paths),
};
static __devinit int speyside_probe(struct platform_device *pdev)
OpenPOWER on IntegriCloud