diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2019-02-15 13:04:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-19 11:43:02 +0000 |
| commit | f89aea0f132142b29dc0c8cf4d445bd12db7b1a6 (patch) | |
| tree | d796f4b64bc037affa788296de78ce12e1990e52 | |
| parent | 76a60f312f64dc48450b15a7f167b46e6230e4d1 (diff) | |
| download | linux-stable-f89aea0f132142b29dc0c8cf4d445bd12db7b1a6.tar.gz linux-stable-f89aea0f132142b29dc0c8cf4d445bd12db7b1a6.tar.bz2 linux-stable-f89aea0f132142b29dc0c8cf4d445bd12db7b1a6.zip | |
ASoC: samsung: odroid: Add missing DAPM routes
With old DTS there will be missing DAPM routes linking BE with CODECs.
Add those routes in the card driver so sound works properly on Odroid
XU3/4 also without DTS updates enabling the secondary PCM.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/samsung/odroid.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index 941e8c3f67a4..5b2bcd1d3450 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -149,6 +149,12 @@ static const struct snd_soc_ops odroid_card_be_ops = { .trigger = odroid_card_be_trigger, }; +/* DAPM routes for backward compatibility with old DTS */ +static const struct snd_soc_dapm_route odroid_dapm_routes[] = { + { "I2S Playback", NULL, "Mixer DAI TX" }, + { "HiFi Playback", NULL, "Mixer DAI TX" }, +}; + static struct snd_soc_dai_link odroid_card_dais[] = { { /* Primary FE <-> BE link */ @@ -237,11 +243,15 @@ static int odroid_audio_probe(struct platform_device *pdev) /* * For backwards compatibility create the secondary CPU DAI link only * if there are 2 CPU DAI entries in the cpu sound-dai property in DT. + * Also add required DAPM routes not available in old DTS. */ num_pcms = of_count_phandle_with_args(cpu, "sound-dai", "#sound-dai-cells"); - if (num_pcms == 1) + if (num_pcms == 1) { + card->dapm_routes = odroid_dapm_routes; + card->num_dapm_routes = ARRAY_SIZE(odroid_dapm_routes); card->num_links--; + } for (i = 0; i < num_pcms; i++, link += 2) { ret = of_parse_phandle_with_args(cpu, "sound-dai", |