summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/tegra/pinctrl-tegra124.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-05-24 12:59:43 +0200
committerLinus Walleij <linus.walleij@linaro.org>2016-05-30 09:41:45 +0200
commit0bde4897d3d01467d84ea61aba4966f3e4a993ff (patch)
tree2082e3e326dda22c35ce317d797cf5aafad2ef21 /drivers/pinctrl/tegra/pinctrl-tegra124.c
parentdt-bindings: Add Oxford Semiconductor OXNAS pinctrl and gpio bindings (diff)
downloadlinux-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-tegra124.c')
-rw-r--r--drivers/pinctrl/tegra/pinctrl-tegra124.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra124.c b/drivers/pinctrl/tegra/pinctrl-tegra124.c
index a0ce723a9482..bca239e3ae50 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra124.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra124.c
@@ -1747,7 +1747,7 @@ static struct tegra_function tegra124_functions[] = {
.lock_bit = 7, \
.ioreset_bit = PINGROUP_BIT_##ior(8), \
.rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9), \
- .parked_reg = -1, \
+ .parked_bit = -1, \
.drv_reg = -1, \
}
@@ -1768,7 +1768,7 @@ static struct tegra_function tegra124_functions[] = {
.rcv_sel_bit = -1, \
.drv_reg = DRV_PINGROUP_REG(r), \
.drv_bank = 0, \
- .parked_reg = -1, \
+ .parked_bit = -1, \
.hsm_bit = hsm_b, \
.schmitt_bit = schmitt_b, \
.lpmd_bit = lpmd_b, \