ASoC: qcom: Add support to parse common audio device nodes
This adds support to parse cpu, platform and codec device nodes and add them in dai-links. Also, update apq8096 machine driver to use the common API. Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Rohit kumar <rohitkr@codeaurora.org> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Rohit kumar
Mark Brown
Родитель
0c901e8cea
Коммит
c25e295cd7
|
|
@ -13,7 +13,7 @@ obj-$(CONFIG_SND_SOC_LPASS_APQ8016) += snd-soc-lpass-apq8016.o
|
|||
# Machine
|
||||
snd-soc-storm-objs := storm.o
|
||||
snd-soc-apq8016-sbc-objs := apq8016_sbc.o
|
||||
snd-soc-apq8096-objs := apq8096.o
|
||||
snd-soc-apq8096-objs := apq8096.o common.o
|
||||
|
||||
obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o
|
||||
obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#include <sound/soc.h>
|
||||
#include <sound/soc-dapm.h>
|
||||
#include <sound/pcm.h>
|
||||
#include "common.h"
|
||||
|
||||
static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
|
||||
struct snd_pcm_hw_params *params)
|
||||
|
|
@ -24,109 +25,16 @@ static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int apq8096_sbc_parse_of(struct snd_soc_card *card)
|
||||
static void apq8096_add_be_ops(struct snd_soc_card *card)
|
||||
{
|
||||
struct device_node *np;
|
||||
struct device_node *codec = NULL;
|
||||
struct device_node *platform = NULL;
|
||||
struct device_node *cpu = NULL;
|
||||
struct device *dev = card->dev;
|
||||
struct snd_soc_dai_link *link;
|
||||
int ret, num_links;
|
||||
struct snd_soc_dai_link *link = card->dai_link;
|
||||
int i, num_links = card->num_links;
|
||||
|
||||
ret = snd_soc_of_parse_card_name(card, "qcom,model");
|
||||
if (ret) {
|
||||
dev_err(dev, "Error parsing card name: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* DAPM routes */
|
||||
if (of_property_read_bool(dev->of_node, "qcom,audio-routing")) {
|
||||
ret = snd_soc_of_parse_audio_routing(card,
|
||||
"qcom,audio-routing");
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Populate links */
|
||||
num_links = of_get_child_count(dev->of_node);
|
||||
|
||||
/* Allocate the DAI link array */
|
||||
card->dai_link = kcalloc(num_links, sizeof(*link), GFP_KERNEL);
|
||||
if (!card->dai_link)
|
||||
return -ENOMEM;
|
||||
|
||||
card->num_links = num_links;
|
||||
link = card->dai_link;
|
||||
|
||||
for_each_child_of_node(dev->of_node, np) {
|
||||
cpu = of_get_child_by_name(np, "cpu");
|
||||
if (!cpu) {
|
||||
dev_err(dev, "Can't find cpu DT node\n");
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0);
|
||||
if (!link->cpu_of_node) {
|
||||
dev_err(card->dev, "error getting cpu phandle\n");
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name);
|
||||
if (ret) {
|
||||
dev_err(card->dev, "error getting cpu dai name\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
platform = of_get_child_by_name(np, "platform");
|
||||
codec = of_get_child_by_name(np, "codec");
|
||||
if (codec && platform) {
|
||||
link->platform_of_node = of_parse_phandle(platform,
|
||||
"sound-dai",
|
||||
0);
|
||||
if (!link->platform_of_node) {
|
||||
dev_err(card->dev, "platform dai not found\n");
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
|
||||
if (ret < 0) {
|
||||
dev_err(card->dev, "codec dai not found\n");
|
||||
goto err;
|
||||
}
|
||||
link->no_pcm = 1;
|
||||
link->ignore_pmdown_time = 1;
|
||||
for (i = 0; i < num_links; i++) {
|
||||
if (link->no_pcm == 1)
|
||||
link->be_hw_params_fixup = apq8096_be_hw_params_fixup;
|
||||
} else {
|
||||
link->platform_of_node = link->cpu_of_node;
|
||||
link->codec_dai_name = "snd-soc-dummy-dai";
|
||||
link->codec_name = "snd-soc-dummy";
|
||||
link->dynamic = 1;
|
||||
}
|
||||
|
||||
link->ignore_suspend = 1;
|
||||
ret = of_property_read_string(np, "link-name", &link->name);
|
||||
if (ret) {
|
||||
dev_err(card->dev, "error getting codec dai_link name\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
link->dpcm_playback = 1;
|
||||
link->dpcm_capture = 1;
|
||||
link->stream_name = link->name;
|
||||
link++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
err:
|
||||
of_node_put(cpu);
|
||||
of_node_put(codec);
|
||||
of_node_put(platform);
|
||||
kfree(card->dai_link);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int apq8096_platform_probe(struct platform_device *pdev)
|
||||
|
|
@ -142,18 +50,21 @@ static int apq8096_platform_probe(struct platform_device *pdev)
|
|||
card->dev = dev;
|
||||
card->auto_bind = true;
|
||||
dev_set_drvdata(dev, card);
|
||||
ret = apq8096_sbc_parse_of(card);
|
||||
ret = qcom_snd_parse_of(card);
|
||||
if (ret) {
|
||||
dev_err(dev, "Error parsing OF data\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
apq8096_add_be_ops(card);
|
||||
ret = snd_soc_register_card(card);
|
||||
if (ret)
|
||||
goto err;
|
||||
goto err_card_register;
|
||||
|
||||
return 0;
|
||||
|
||||
err_card_register:
|
||||
kfree(card->dai_link);
|
||||
err:
|
||||
kfree(card);
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,112 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (c) 2018, Linaro Limited.
|
||||
// Copyright (c) 2018, The Linux Foundation. All rights reserved.
|
||||
|
||||
#include <linux/module.h>
|
||||
#include "common.h"
|
||||
|
||||
int qcom_snd_parse_of(struct snd_soc_card *card)
|
||||
{
|
||||
struct device_node *np;
|
||||
struct device_node *codec = NULL;
|
||||
struct device_node *platform = NULL;
|
||||
struct device_node *cpu = NULL;
|
||||
struct device *dev = card->dev;
|
||||
struct snd_soc_dai_link *link;
|
||||
int ret, num_links;
|
||||
|
||||
ret = snd_soc_of_parse_card_name(card, "model");
|
||||
if (ret) {
|
||||
dev_err(dev, "Error parsing card name: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* DAPM routes */
|
||||
if (of_property_read_bool(dev->of_node, "audio-routing")) {
|
||||
ret = snd_soc_of_parse_audio_routing(card,
|
||||
"audio-routing");
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Populate links */
|
||||
num_links = of_get_child_count(dev->of_node);
|
||||
|
||||
/* Allocate the DAI link array */
|
||||
card->dai_link = kcalloc(num_links, sizeof(*link), GFP_KERNEL);
|
||||
if (!card->dai_link)
|
||||
return -ENOMEM;
|
||||
|
||||
card->num_links = num_links;
|
||||
link = card->dai_link;
|
||||
for_each_child_of_node(dev->of_node, np) {
|
||||
cpu = of_get_child_by_name(np, "cpu");
|
||||
if (!cpu) {
|
||||
dev_err(dev, "Can't find cpu DT node\n");
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
link->cpu_of_node = of_parse_phandle(cpu, "sound-dai", 0);
|
||||
if (!link->cpu_of_node) {
|
||||
dev_err(card->dev, "error getting cpu phandle\n");
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name);
|
||||
if (ret) {
|
||||
dev_err(card->dev, "error getting cpu dai name\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
platform = of_get_child_by_name(np, "platform");
|
||||
codec = of_get_child_by_name(np, "codec");
|
||||
if (codec && platform) {
|
||||
link->platform_of_node = of_parse_phandle(platform,
|
||||
"sound-dai",
|
||||
0);
|
||||
if (!link->platform_of_node) {
|
||||
dev_err(card->dev, "platform dai not found\n");
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
|
||||
if (ret < 0) {
|
||||
dev_err(card->dev, "codec dai not found\n");
|
||||
goto err;
|
||||
}
|
||||
link->no_pcm = 1;
|
||||
link->ignore_pmdown_time = 1;
|
||||
} else {
|
||||
link->platform_of_node = link->cpu_of_node;
|
||||
link->codec_dai_name = "snd-soc-dummy-dai";
|
||||
link->codec_name = "snd-soc-dummy";
|
||||
link->dynamic = 1;
|
||||
}
|
||||
|
||||
link->ignore_suspend = 1;
|
||||
ret = of_property_read_string(np, "link-name", &link->name);
|
||||
if (ret) {
|
||||
dev_err(card->dev, "error getting codec dai_link name\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
link->dpcm_playback = 1;
|
||||
link->dpcm_capture = 1;
|
||||
link->stream_name = link->name;
|
||||
link++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
err:
|
||||
of_node_put(cpu);
|
||||
of_node_put(codec);
|
||||
of_node_put(platform);
|
||||
kfree(card->dai_link);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(qcom_snd_parse_of);
|
||||
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
// Copyright (c) 2018, The Linux Foundation. All rights reserved.
|
||||
|
||||
#ifndef __QCOM_SND_COMMON_H__
|
||||
#define __QCOM_SND_COMMON_H__
|
||||
|
||||
#include <linux/component.h>
|
||||
#include <sound/soc.h>
|
||||
|
||||
int qcom_snd_parse_of(struct snd_soc_card *card);
|
||||
|
||||
#endif
|
||||
Загрузка…
Ссылка в новой задаче