diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-10-20 16:20:48 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-24 19:02:31 +0200 |
| commit | 09065f8b44a3e2a742565368b89b5848387eaf38 (patch) | |
| tree | abd3585299696ae42eca2317a6c734c341d81e79 /sound/soc/qcom | |
| parent | ASoC: apq8016-sbc: dt bindings: remove incorrect property (diff) | |
| download | linux-09065f8b44a3e2a742565368b89b5848387eaf38.tar.xz linux-09065f8b44a3e2a742565368b89b5848387eaf38.zip | |
ASoC: qcom: apq8016-sbc: Add support to multi codec.
This patch adds support to multi codec, as the msm8916 codec is now
split into two codecs, Analog and Digital.
Also update the bindings and example to show that the card supports
multicodec.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/qcom')
| -rw-r--r-- | sound/soc/qcom/apq8016_sbc.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index 07f91e918b23..d084d7468299 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -123,20 +123,15 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) return ERR_PTR(-EINVAL); } - link->codec_of_node = of_parse_phandle(codec, "sound-dai", 0); - if (!link->codec_of_node) { - dev_err(card->dev, "error getting codec phandle\n"); - return ERR_PTR(-EINVAL); - } - ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name); if (ret) { dev_err(card->dev, "error getting cpu dai name\n"); return ERR_PTR(ret); } - ret = snd_soc_of_get_dai_name(codec, &link->codec_dai_name); - if (ret) { + ret = snd_soc_of_get_dai_link_codecs(dev, codec, link); + + if (ret < 0) { dev_err(card->dev, "error getting codec dai name\n"); return ERR_PTR(ret); } |