hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: qcom: Modify test for DSP in LPASS driver 

As the representation of the DSP in the device
tree has changed from a required subnode to an
optional phandle, modify the test for DSP
existence in the LPASS CPU DAI driver,
accordingly.

Signed-off-by: Kenneth Westfield <kwestfie@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kenneth Westfield 2015-03-13 00:54:17 -07:00 committed by Mark Brown
parent 97a33ced31
commit 8ebe148be9
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sound/soc/qcom/lpass-cpu.c
View File

@ -359,45 +359,26 @@ static const struct regmap_config lpass_cpu_regmap_config = {
.cache_type = REGCACHE_FLAT, .cache_type = REGCACHE_FLAT,
}; };
static int lpass_cpu_parse_of(struct device *dev)
{
struct device_node *dsp_of_node;
dsp_of_node = of_get_child_by_name(dev->of_node, "qcom,adsp");
if (!dsp_of_node) {
dev_err(dev, "%s() error getting qcom,adsp sub-node\n",
__func__);
return -EINVAL;
}
if (of_device_is_available(dsp_of_node)) {
dev_err(dev, "%s() DSP exists and holds audio resources\n",
__func__);
return -EBUSY;
}
return 0;
}
static int lpass_cpu_platform_probe(struct platform_device *pdev) static int lpass_cpu_platform_probe(struct platform_device *pdev)
{ {
struct lpass_data *drvdata; struct lpass_data *drvdata;
struct device_node *dsp_of_node;
struct resource *res; struct resource *res;
int ret; int ret;
dsp_of_node = of_parse_phandle(pdev->dev.of_node, "qcom,adsp", 0);
if (dsp_of_node) {
dev_err(&pdev->dev, "%s() DSP exists and holds audio resources\n",
__func__);
return -EBUSY;
}
drvdata = devm_kzalloc(&pdev->dev, sizeof(struct lpass_data), drvdata = devm_kzalloc(&pdev->dev, sizeof(struct lpass_data),
GFP_KERNEL); GFP_KERNEL);
if (!drvdata) if (!drvdata)
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(pdev, drvdata); platform_set_drvdata(pdev, drvdata);
ret = lpass_cpu_parse_of(&pdev->dev);
if (ret) {
dev_err(&pdev->dev, "%s() error getting DT node info: %d\n",
__func__, ret);
return ret;
}
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "lpass-lpaif"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "lpass-lpaif");
if (!res) { if (!res) {
dev_err(&pdev->dev, "%s() error getting resource\n", __func__); dev_err(&pdev->dev, "%s() error getting resource\n", __func__);