redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

pinctrl: tegra: correct bank for pingroup and drv pingroup

Browse source 
Cc: stable@kernel.org
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Pritesh Raithatha 2012-10-17 11:51:37 +05:30 committed by Linus Walleij
parent 154f3ebf53
commit a03690e444
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/pinctrl/pinctrl-tegra30.c
View file

@ -3345,10 +3345,10 @@ static const struct tegra_function tegra30_functions[] = {
FUNCTION(vi_alt3), FUNCTION(vi_alt3),
}; };
#define MUXCTL_REG_A 0x3000 #define DRV_PINGROUP_REG_A 0x868 /* bank 0 */
#define PINGROUP_REG_A 0x868 #define PINGROUP_REG_A 0x3000 /* bank 1 */
#define PINGROUP_REG_Y(r) ((r) - MUXCTL_REG_A) #define PINGROUP_REG_Y(r) ((r) - PINGROUP_REG_A)
#define PINGROUP_REG_N(r) -1 #define PINGROUP_REG_N(r) -1
#define PINGROUP(pg_name, f0, f1, f2, f3, f_safe, r, od, ior) \ #define PINGROUP(pg_name, f0, f1, f2, f3, f_safe, r, od, ior) \
@ -3364,25 +3364,25 @@ static const struct tegra_function tegra30_functions[] = {
}, \ }, \
.func_safe = TEGRA_MUX_ ## f_safe, \ .func_safe = TEGRA_MUX_ ## f_safe, \
.mux_reg = PINGROUP_REG_Y(r), \ .mux_reg = PINGROUP_REG_Y(r), \
.mux_bank = 0, \ .mux_bank = 1, \
.mux_bit = 0, \ .mux_bit = 0, \
.pupd_reg = PINGROUP_REG_Y(r), \ .pupd_reg = PINGROUP_REG_Y(r), \
.pupd_bank = 0, \ .pupd_bank = 1, \
.pupd_bit = 2, \ .pupd_bit = 2, \
.tri_reg = PINGROUP_REG_Y(r), \ .tri_reg = PINGROUP_REG_Y(r), \
.tri_bank = 0, \ .tri_bank = 1, \
.tri_bit = 4, \ .tri_bit = 4, \
.einput_reg = PINGROUP_REG_Y(r), \ .einput_reg = PINGROUP_REG_Y(r), \
.einput_bank = 0, \ .einput_bank = 1, \
.einput_bit = 5, \ .einput_bit = 5, \
.odrain_reg = PINGROUP_REG_##od(r), \ .odrain_reg = PINGROUP_REG_##od(r), \
.odrain_bank = 0, \ .odrain_bank = 1, \
.odrain_bit = 6, \ .odrain_bit = 6, \
.lock_reg = PINGROUP_REG_Y(r), \ .lock_reg = PINGROUP_REG_Y(r), \
.lock_bank = 0, \ .lock_bank = 1, \
.lock_bit = 7, \ .lock_bit = 7, \
.ioreset_reg = PINGROUP_REG_##ior(r), \ .ioreset_reg = PINGROUP_REG_##ior(r), \
.ioreset_bank = 0, \ .ioreset_bank = 1, \
.ioreset_bit = 8, \ .ioreset_bit = 8, \
.drv_reg = -1, \ .drv_reg = -1, \
} }
@ -3401,8 +3401,8 @@ static const struct tegra_function tegra30_functions[] = {
.odrain_reg = -1, \ .odrain_reg = -1, \
.lock_reg = -1, \ .lock_reg = -1, \
.ioreset_reg = -1, \ .ioreset_reg = -1, \
.drv_reg = ((r) - PINGROUP_REG_A), \ .drv_reg = ((r) - DRV_PINGROUP_REG_A), \
.drv_bank = 1, \ .drv_bank = 0, \
.hsm_bit = hsm_b, \ .hsm_bit = hsm_b, \
.schmitt_bit = schmitt_b, \ .schmitt_bit = schmitt_b, \
.lpmd_bit = lpmd_b, \ .lpmd_bit = lpmd_b, \