Skip to content

Commit

Permalink
ASoC: qcom: Modify test for DSP in LPASS driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kenneth Westfield authored and Mark Brown committed Mar 16, 2015
1 parent 97a33ce commit 8ebe148
Showing 1 changed file with 7 additions and 26 deletions.
33 changes: 7 additions & 26 deletions sound/soc/qcom/lpass-cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,45 +359,26 @@ static const struct regmap_config lpass_cpu_regmap_config = {
.cache_type = REGCACHE_FLAT,
};

static int lpass_cpu_parse_of(struct device *dev)
static int lpass_cpu_platform_probe(struct platform_device *pdev)
{
struct lpass_data *drvdata;
struct device_node *dsp_of_node;
struct resource *res;
int ret;

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",
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;
}

return 0;
}

static int lpass_cpu_platform_probe(struct platform_device *pdev)
{
struct lpass_data *drvdata;
struct resource *res;
int ret;

drvdata = devm_kzalloc(&pdev->dev, sizeof(struct lpass_data),
GFP_KERNEL);
if (!drvdata)
return -ENOMEM;
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");
if (!res) {
dev_err(&pdev->dev, "%s() error getting resource\n", __func__);
Expand Down

0 comments on commit 8ebe148

Please sign in to comment.