aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 14:28:41 +0100
committerMark Brown <broonie@linaro.org>2013-08-22 14:28:41 +0100
commitffdcb88b80a02602570227e6935583c4ad804cbe (patch)
treea188817293de252473f880640c72df87afddf211 /sound/soc
parentMerge remote-tracking branch 'asoc/topic/lm4857' into asoc-next (diff)
parentASoC: max9768: Add DAPM support (diff)
downloadlinux-dev-ffdcb88b80a02602570227e6935583c4ad804cbe.tar.xz
linux-dev-ffdcb88b80a02602570227e6935583c4ad804cbe.zip
Merge remote-tracking branch 'asoc/topic/max9768' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/max9768.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c
index a6ac2313047d..31f91560e9f6 100644
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
@@ -118,6 +118,18 @@ static const struct snd_kcontrol_new max9768_mute[] = {
SOC_SINGLE_BOOL_EXT("Playback Switch", 0, max9768_get_gpio, max9768_set_gpio),
};
+static const struct snd_soc_dapm_widget max9768_dapm_widgets[] = {
+SND_SOC_DAPM_INPUT("IN"),
+
+SND_SOC_DAPM_OUTPUT("OUT+"),
+SND_SOC_DAPM_OUTPUT("OUT-"),
+};
+
+static const struct snd_soc_dapm_route max9768_dapm_routes[] = {
+ { "OUT+", NULL, "IN" },
+ { "OUT-", NULL, "IN" },
+};
+
static int max9768_probe(struct snd_soc_codec *codec)
{
struct max9768 *max9768 = snd_soc_codec_get_drvdata(codec);
@@ -148,6 +160,10 @@ static struct snd_soc_codec_driver max9768_codec_driver = {
.probe = max9768_probe,
.controls = max9768_volume,
.num_controls = ARRAY_SIZE(max9768_volume),
+ .dapm_widgets = max9768_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(max9768_dapm_widgets),
+ .dapm_routes = max9768_dapm_routes,
+ .num_dapm_routes = ARRAY_SIZE(max9768_dapm_routes),
};
static const struct regmap_config max9768_i2c_regmap_config = {