UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Qualcomm driver fixes for v6.2 

Updated error handling in the async packer router driver made an
 optional property required, fix this. Also improve error handling in the
 probe function of the CPR driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCAAzFiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmO92vUVHGFuZGVyc3Nv
 bkBrZXJuZWwub3JnAAoJEAsfOT8Nma3FzI4QAKiKW9YFDeknVhqL/JSQN+3xPUio
 vMkruKcE5AIcmlmoufTGJemjGEgPVIAY/lUYsdRW+WBK3fUduA7Mo52VfxTvQF1m
 tKyK+YueQvNNgV3AhodBaCj79LgWHyZeLDa6WZKxnUuRntDp9wPhhuYgZM2koYgZ
 c/19iPyekYRlmpjhMm4nHoEVE9GnwWNHVwjewdjXQkNl1MGCS6DUY32fFjded+Zq
 qShsD/aqebssFJnyO0JR7RkpGx+BFJiZryN6Fp1AnjJtWvswbf1IJQPblQ8KGflU
 d6K+HB3FbXIB7JbdbQDfWZXZI1Pu0+btcQFLXhmsxgbmcjUBu8zW+lizEu1WOaYj
 IOktH+QInGGPqxx7U6DMJ9EBZ0q4xU4eTxz/L25DtkUjwpA0QPBAQ10oOntvm/Fv
 7kEHoXN+X61faymSFlr/iN6xHB8MylYR3O8tF98uigPy/NWatU3bSQqZG2b8i/j2
 j86ojPzdp8oK+0g/q8XVcOgm3H6NWfGxJVfoautdBoJHWYLiHJ30OEV8S413Bi1P
 MIHwWQuWOnwgTJrFbYJfdBJtVes2XQOOajeqZ3S/xI2cPyUG2z9KwAEViOhLkzIX
 GSifYX8ZAeJ9G++GM1Kwqum3NyFgzHYqPiKHYvHEOAVr09rTE+U4SwqD7ts2AAEZ
 CBKIhJSExVAMQehI
 =66gk
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmO94gUACgkQmmx57+YA
 GNmJRRAAhwFsZvIJ/0VF/wPhfXWlOIKG6AUBd5FND2b4FWL7CqRmXZ9emrqUE6lF
 +0aMGxYypMi+DdL/lKD0bDEqq4a7f9y7rnSTOvrtXH3E54NUWAgv890nas5oytgi
 5jMDWEOdf64jiq7DKkqAnNeXO6akpCF6ubuQ/Sjhp+WgXqy5cRmlV/oWWARg08Xn
 4WTLzC6JQGc71jnykCPWm3UsS83onmYo0bUYfWTyFIfQ/O2mxCqcr39ZXHukGcG+
 cDM13v6ULgr1cgh+1q9XRXV05JIVSEYer7YSN0+e14PUFfwCKd1CikhNh0571IG5
 cZX4Bg+bLOuW+oyTX2cmDuAasjottj1K7W3c6AmCmIMnPAocSwmT9mQXKiqdPYD2
 UXP4zYKPwSoq4v8OtdbUHQs2Y04c2QoIvwY01KDoZ5D2FM6nHb64+D6IkCnGrV1G
 J79BxB7cnOaKE+2O1PfFVj/AxwDP53rrmXoVaEOYCLnS0rzfJ1/RCg8Q4b4v5GjL
 xFzorS44x6jJXVOidxtBEJTv7ZRaBNT/xtRBtwCamRraNZG5R/DiUPiw2cSivPFB
 OkE/3gfVoxLAX0fO3+dWcvI7EdGANbFT5ugKstHhtv7YWjdj466OqJYbbb2IWb+Z
 AtvtMWP2vOqZUPGLD2aYHCfDiRAUQKLLJK6X2xHQhKqPHEup/50=
 =ewL0
 -----END PGP SIGNATURE-----

Merge tag 'qcom-driver-fixes-for-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm driver fixes for v6.2

Updated error handling in the async packer router driver made an
optional property required, fix this. Also improve error handling in the
probe function of the CPR driver.

* tag 'qcom-driver-fixes-for-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  PM: AVS: qcom-cpr: Fix an error handling path in cpr_probe()
  soc: qcom: apr: Make qcom,protection-domain optional again
  dt-bindings: soc: qcom: apr: Make qcom,protection-domain optional again

Link: https://lore.kernel.org/r/20230110213946.2183982-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-01-10 23:09:09 +01:00
parent 23d3954765 6049aae523
commit 42c18d1362
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml
View File

@ -39,8 +39,8 @@ properties:
qcom,protection-domain:
$ref: /schemas/types.yaml#/definitions/string-array
description: |
Protection domain service name and path for APR service
possible values are::
Protection domain service name and path for APR service (if supported).
Possible values are::
"avs/audio", "msm/adsp/audio_pd".
"kernel/elf_loader", "msm/modem/wlan_pd".
"tms/servreg", "msm/adsp/audio_pd".
@ -49,6 +49,5 @@ properties:
required:
- reg
- qcom,protection-domain
additionalProperties: true

3
drivers/soc/qcom/apr.c
View File

@ -461,9 +461,10 @@ static int apr_add_device(struct device *dev, struct device_node *np,
goto out;
}
/* Protection domain is optional, it does not exist on older platforms */
ret = of_property_read_string_index(np, "qcom,protection-domain",
1, &adev->service_path);
if (ret < 0) {
if (ret < 0 && ret != -EINVAL) {
dev_err(dev, "Failed to read second value of qcom,protection-domain\n");
goto out;
}

6
drivers/soc/qcom/cpr.c
View File

@ -1708,12 +1708,16 @@ static int cpr_probe(struct platform_device *pdev)
ret = of_genpd_add_provider_simple(dev->of_node, &drv->pd);
if (ret)
return ret;
goto err_remove_genpd;
platform_set_drvdata(pdev, drv);
cpr_debugfs_init(drv);
return 0;
err_remove_genpd:
pm_genpd_remove(&drv->pd);
return ret;
}
static int cpr_remove(struct platform_device *pdev)