diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2016-05-13 02:45:04 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-05-13 02:45:04 +0200 |
commit | 0d5358330c20d50e52e3e65ff07a5db8007041fc (patch) | |
tree | 1b38f89d8b75e52828644ab4398adcaa52fb9f6f /drivers/pinctrl/tegra/pinctrl-tegra.h | |
parent | d6d5c125350dae960a22b45a4ffad46c4abb3ecc (diff) | |
download | linux-0d5358330c20d50e52e3e65ff07a5db8007041fc.tar.gz |
Revert "pinctrl: tegra: avoid parked_reg and parked_bank"
This reverts commit 1d18a3f0f0809f6c71f1f6e9e268ee904ce0b588.
Diffstat (limited to 'drivers/pinctrl/tegra/pinctrl-tegra.h')
-rw-r--r-- | drivers/pinctrl/tegra/pinctrl-tegra.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.h b/drivers/pinctrl/tegra/pinctrl-tegra.h index 33b17cb1471e..d2ced17382b5 100644 --- a/drivers/pinctrl/tegra/pinctrl-tegra.h +++ b/drivers/pinctrl/tegra/pinctrl-tegra.h @@ -93,7 +93,9 @@ struct tegra_function { * @tri_reg: Tri-state register offset. * @tri_bank: Tri-state register bank. * @tri_bit: Tri-state register bit. - * @parked_bit: Parked register bit. -1 if unsupported. + * @parked_reg: Parked register offset. -1 if unsupported. + * @parked_bank: Parked register bank. 0 if unsupported. + * @parked_bit: Parked register bit. 0 if unsupported. * @einput_bit: Enable-input register bit. * @odrain_bit: Open-drain register bit. * @lock_bit: Lock register bit. @@ -136,10 +138,12 @@ struct tegra_pingroup { s16 pupd_reg; s16 tri_reg; s16 drv_reg; + s16 parked_reg; u32 mux_bank:2; u32 pupd_bank:2; u32 tri_bank:2; u32 drv_bank:2; + u32 parked_bank:2; s32 mux_bit:6; s32 pupd_bit:6; s32 tri_bit:6; |