diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-05-24 12:59:43 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-05-30 09:41:45 +0200 |
| commit | 0bde4897d3d01467d84ea61aba4966f3e4a993ff (patch) | |
| tree | 2082e3e326dda22c35ce317d797cf5aafad2ef21 /drivers/pinctrl/tegra/pinctrl-tegra.c | |
| parent | dt-bindings: Add Oxford Semiconductor OXNAS pinctrl and gpio bindings (diff) | |
| download | linux-0bde4897d3d01467d84ea61aba4966f3e4a993ff.tar.xz linux-0bde4897d3d01467d84ea61aba4966f3e4a993ff.zip | |
Revert "Revert "pinctrl: tegra: avoid parked_reg and parked_bank""
This reverts commit 0d5358330c20d50e52e3e65ff07a5db8007041fc.
Diffstat (limited to 'drivers/pinctrl/tegra/pinctrl-tegra.c')
| -rw-r--r-- | drivers/pinctrl/tegra/pinctrl-tegra.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c index 6e82b290cb4f..277622b4b6fb 100644 --- a/drivers/pinctrl/tegra/pinctrl-tegra.c +++ b/drivers/pinctrl/tegra/pinctrl-tegra.c @@ -632,11 +632,11 @@ static void tegra_pinctrl_clear_parked_bits(struct tegra_pmx *pmx) u32 val; for (i = 0; i < pmx->soc->ngroups; ++i) { - if (pmx->soc->groups[i].parked_reg >= 0) { - g = &pmx->soc->groups[i]; - val = pmx_readl(pmx, g->parked_bank, g->parked_reg); + g = &pmx->soc->groups[i]; + if (g->parked_bit >= 0) { + val = pmx_readl(pmx, g->mux_bank, g->mux_reg); val &= ~(1 << g->parked_bit); - pmx_writel(pmx, val, g->parked_bank, g->parked_reg); + pmx_writel(pmx, val, g->mux_bank, g->mux_reg); } } } |