Merge remote-tracking branch 'gpio/for-next'

[karo-tx-linux.git] / drivers / pinctrl / pinctrl-tegra20.c

diff --git a/drivers/pinctrl/pinctrl-tegra20.c b/drivers/pinctrl/pinctrl-tegra20.c
index e848189038f0654dce86ed020075ff3ddddbc107..fcfb7d012c5b68bda551917f89c657956f2af6dd 100644 (file)
--- a/drivers/pinctrl/pinctrl-tegra20.c
+++ b/drivers/pinctrl/pinctrl-tegra20.c
@@ -2624,7 +2624,9 @@ static const struct tegra_function tegra20_functions[] = {
                .odrain_reg = -1,                               \
                .lock_reg = -1,                                 \
                .ioreset_reg = -1,                              \
+               .rcv_sel_reg = -1,                              \
                .drv_reg = -1,                                  \
+               .drvtype_reg = -1,                              \
        }
 
 /* Pin groups with only pull up and pull down control */
@@ -2642,7 +2644,9 @@ static const struct tegra_function tegra20_functions[] = {
                .odrain_reg = -1,                               \
                .lock_reg = -1,                                 \
                .ioreset_reg = -1,                              \
+               .rcv_sel_reg = -1,                              \
                .drv_reg = -1,                                  \
+               .drvtype_reg = -1,                              \
        }
 
 /* Pin groups for drive strength registers (configurable version) */
@@ -2660,6 +2664,7 @@ static const struct tegra_function tegra20_functions[] = {
                .odrain_reg = -1,                               \
                .lock_reg = -1,                                 \
                .ioreset_reg = -1,                              \
+               .rcv_sel_reg = -1,                              \
                .drv_reg = ((r) - PINGROUP_REG_A),              \
                .drv_bank = 3,                                  \
                .hsm_bit = hsm_b,                               \
@@ -2673,6 +2678,7 @@ static const struct tegra_function tegra20_functions[] = {
                .slwr_width = slwr_w,                           \
                .slwf_bit = slwf_b,                             \
                .slwf_width = slwf_w,                           \
+               .drvtype_reg = -1,                              \
        }
 
 /* Pin groups for drive strength registers (simple version) */