github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 03:27:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "iio: adc: qcom-spmi-adc5-gen3: Increase HS_READY poll wait time to 15 ms"

Browse Source
This commit is contained in:
qctecmdr 2022-09-19 11:39:44 -07:00 committed by Gerrit - the friendly Code Review server
commit e59f6b2192
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iio/adc/qcom-spmi-adc5-gen3.c
View File

@ -400,7 +400,7 @@ static int adc5_gen3_configure(struct adc5_chip *adc,
#define ADC5_GEN3_HS_DELAY_MIN_US 100
#define ADC5_GEN3_HS_DELAY_MAX_US 110
#define ADC5_GEN3_HS_RETRY_COUNT 20
#define ADC5_GEN3_HS_RETRY_COUNT 150
static int adc5_gen3_poll_wait_hs(struct adc5_chip *adc, struct adc5_channel_prop *prop)
{

26
drivers/spmi/spmi-pmic-arb.c
View File

@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved. */
/* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */
#include <linux/bitmap.h>
#include <linux/debugfs.h>
@ -1707,6 +1708,11 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
* which does not result in a devm_request_mem_region() call.
*/
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
if (!res) {
err = -EINVAL;
goto err_put_ctrl;
}
core = devm_ioremap(&ctrl->dev, res->start, resource_size(res));
if (IS_ERR(core)) {
err = PTR_ERR(core);
@ -1744,6 +1750,11 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"obsrvr");
if (!res) {
err = -EINVAL;
goto err_put_ctrl;
}
pmic_arb->rd_base = devm_ioremap(&ctrl->dev, res->start,
resource_size(res));
if (IS_ERR(pmic_arb->rd_base)) {
@ -1753,6 +1764,11 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"chnls");
if (!res) {
err = -EINVAL;
goto err_put_ctrl;
}
pmic_arb->wr_base = devm_ioremap(&ctrl->dev, res->start,
resource_size(res));
if (IS_ERR(pmic_arb->wr_base)) {
@ -1822,6 +1838,11 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
pmic_arb->ver_ops->ver_str, hw_ver);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "intr");
if (!res) {
err = -EINVAL;
goto err_put_ctrl;
}
pmic_arb->intr = devm_ioremap_resource(&ctrl->dev, res);
if (IS_ERR(pmic_arb->intr)) {
err = PTR_ERR(pmic_arb->intr);
@ -1829,6 +1850,11 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
}
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cnfg");
if (!res) {
err = -EINVAL;
goto err_put_ctrl;
}
pmic_arb->cnfg = devm_ioremap_resource(&ctrl->dev, res);
if (IS_ERR(pmic_arb->cnfg)) {
err = PTR_ERR(pmic_arb->cnfg);