Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "soc: lpi: check if vote clk is enabled before accessing LPI GPIO"

Browse source
This commit is contained in:
qctecmdr 2019-07-06 08:53:36 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4f42ed04c4
1 changed files with 21 additions and 4 deletions

25
soc/pinctrl-lpi.c
View file

@ -139,7 +139,8 @@ int lpi_pinctrl_runtime_suspend(struct device *dev);
static int lpi_gpio_read(struct lpi_gpio_pad *pad, unsigned int addr)
{
int ret;
int ret = 0;
struct lpi_gpio_state *state = dev_get_drvdata(lpi_dev);
if (!lpi_dev_up) {
pr_err_ratelimited("%s: ADSP is down due to SSR, return\n",
@ -147,11 +148,18 @@ static int lpi_gpio_read(struct lpi_gpio_pad *pad, unsigned int addr)
return 0;
}
pm_runtime_get_sync(lpi_dev);
if (!state->core_hw_vote_status) {
pr_err_ratelimited("%s: core hw vote clk is not enabled\n",
__func__);
ret = -EINVAL;
goto err;
}
ret = ioread32(pad->base + pad->offset + addr);
if (ret < 0)
pr_err("%s: read 0x%x failed\n", __func__, addr);
err:
pm_runtime_mark_last_busy(lpi_dev);
pm_runtime_put_autosuspend(lpi_dev);
return ret;
@ -160,18 +168,27 @@ static int lpi_gpio_read(struct lpi_gpio_pad *pad, unsigned int addr)
static int lpi_gpio_write(struct lpi_gpio_pad *pad, unsigned int addr,
unsigned int val)
{
struct lpi_gpio_state *state = dev_get_drvdata(lpi_dev);
int ret = 0;
if (!lpi_dev_up) {
pr_err_ratelimited("%s: ADSP is down due to SSR, return\n",
__func__);
__func__);
return 0;
}
pm_runtime_get_sync(lpi_dev);
if (!state->core_hw_vote_status) {
pr_err_ratelimited("%s: core hw vote clk is not enabled\n",
__func__);
ret = -EINVAL;
goto err;
}
iowrite32(val, pad->base + pad->offset + addr);
err:
pm_runtime_mark_last_busy(lpi_dev);
pm_runtime_put_autosuspend(lpi_dev);
return 0;
return ret;
}
static int lpi_gpio_get_groups_count(struct pinctrl_dev *pctldev)