summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMengdong Lin <mengdong.lin@intel.com>2015-08-10 22:48:30 +0800
committerMark Brown <broonie@kernel.org>2015-08-14 21:23:23 +0100
commit1a8e7fab70c8d7cad2e606e7b21d46e42e51c2fd (patch)
tree67a3c92ac224285436fc6f33268231e68db57506 /sound/soc
parent376c0afe2f0047d091956a95e382e1edd104ea72 (diff)
downloadop-kernel-dev-1a8e7fab70c8d7cad2e606e7b21d46e42e51c2fd.zip
op-kernel-dev-1a8e7fab70c8d7cad2e606e7b21d46e42e51c2fd.tar.gz
ASoC: topology: Change pass number of DAI smaller than graph
The PCM DAIs need to be loaded and added to ASoC core ealier than the graph (route). Otherwise, adding routes will fail for missing DAIs. Signed-off-by: Mengdong Lin <mengdong.lin@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-topology.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 8620dbf..942c1ac 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -44,12 +44,12 @@
#define SOC_TPLG_PASS_VENDOR 1
#define SOC_TPLG_PASS_MIXER 2
#define SOC_TPLG_PASS_WIDGET 3
-#define SOC_TPLG_PASS_GRAPH 4
-#define SOC_TPLG_PASS_PINS 5
-#define SOC_TPLG_PASS_PCM_DAI 6
+#define SOC_TPLG_PASS_PCM_DAI 4
+#define SOC_TPLG_PASS_GRAPH 5
+#define SOC_TPLG_PASS_PINS 6
#define SOC_TPLG_PASS_START SOC_TPLG_PASS_MANIFEST
-#define SOC_TPLG_PASS_END SOC_TPLG_PASS_PCM_DAI
+#define SOC_TPLG_PASS_END SOC_TPLG_PASS_PINS
struct soc_tplg {
const struct firmware *fw;
OpenPOWER on IntegriCloud