Skip to content

Commit

Permalink
ASoC: qcom: apq8016-sbc: Add support to multi codec.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Srinivas Kandagatla authored and Mark Brown committed Oct 24, 2016
1 parent 393ac58 commit 09065f8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Required dai-link subnodes:
Required CPU/CODEC subnodes properties:

-link-name : Name of the dai link.
-sound-dai : phandle and port of CPU/CODEC
-sound-dai : phandle/s and port of CPU/CODEC

Example:

Expand Down Expand Up @@ -72,7 +72,7 @@ sound: sound {
sound-dai = <&lpass MI2S_PRIMARY>;
};
codec {
sound-dai = <&wcd_codec 0>;
sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
};
};

Expand Down
11 changes: 3 additions & 8 deletions sound/soc/qcom/apq8016_sbc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 09065f8

Please sign in to comment.