summaryrefslogtreecommitdiff
path: root/sound/soc/qcom
diff options
context:
space:
mode:
authorKenneth Westfield <kwestfie@codeaurora.org>2015-03-13 00:54:17 -0700
committerMark Brown <broonie@kernel.org>2015-03-16 11:06:38 +0000
commit8ebe148be9aa12641c62a3c99c65859bf95445fe (patch)
tree68c1c4ced4e3739f050126ec2dbffd68f697bf04 /sound/soc/qcom
parent97a33ced310ab9bdb16699c2c64b28f29de0a23d (diff)
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>
Diffstat (limited to 'sound/soc/qcom')
-rw-r--r--sound/soc/qcom/lpass-cpu.c33
1 files changed, 7 insertions, 26 deletions
diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
index d5167131787f..6698d058de29 100644
--- a/sound/soc/qcom/lpass-cpu.c
+++ b/sound/soc/qcom/lpass-cpu.c
@@ -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__);