aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/jz4740
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-04-22 16:46:32 -0400
committerMark Brown <broonie@linaro.org>2014-04-22 16:53:21 -0400
commitb8fb837b0c302a2278e4f222e5d875ce7a3b4aea (patch)
tree741e50c70bcf69698fb595269fe2ed1aef89feee /sound/soc/jz4740
parentc9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff)
ASoC: qi_lb60: Set fully_routed flag
The routes for this sound card are fully specified, so set the fully_routed flag. This allows us to remove the manual snd_soc_dapm_nc_pin() calls. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/jz4740')
-rw-r--r--sound/soc/jz4740/qi_lb60.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index 82b5f37cd2c7..8dd356892f0e 100644
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -57,9 +57,6 @@ static int qi_lb60_codec_init(struct snd_soc_pcm_runtime *rtd)
57 struct snd_soc_dapm_context *dapm = &codec->dapm; 57 struct snd_soc_dapm_context *dapm = &codec->dapm;
58 int ret; 58 int ret;
59 59
60 snd_soc_dapm_nc_pin(dapm, "LIN");
61 snd_soc_dapm_nc_pin(dapm, "RIN");
62
63 ret = snd_soc_dai_set_fmt(cpu_dai, QI_LB60_DAIFMT); 60 ret = snd_soc_dai_set_fmt(cpu_dai, QI_LB60_DAIFMT);
64 if (ret < 0) { 61 if (ret < 0) {
65 dev_err(codec->dev, "Failed to set cpu dai format: %d\n", ret); 62 dev_err(codec->dev, "Failed to set cpu dai format: %d\n", ret);
@@ -89,6 +86,7 @@ static struct snd_soc_card qi_lb60 = {
89 .num_dapm_widgets = ARRAY_SIZE(qi_lb60_widgets), 86 .num_dapm_widgets = ARRAY_SIZE(qi_lb60_widgets),
90 .dapm_routes = qi_lb60_routes, 87 .dapm_routes = qi_lb60_routes,
91 .num_dapm_routes = ARRAY_SIZE(qi_lb60_routes), 88 .num_dapm_routes = ARRAY_SIZE(qi_lb60_routes),
89 .fully_routed = true,
92}; 90};
93 91
94static const struct gpio qi_lb60_gpios[] = { 92static const struct gpio qi_lb60_gpios[] = {