pinctrl: tegra: Remove unused register member

Most of the pincontrol bits are part of the mux register
so just using this register and removing the need of other
registers.

Change-Id: I6254215a243fbb18ee9e2713760c597292a9efed
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/1130298

1 files changed, 18 insertions, 32 deletions

diff --git a/drivers/pinctrl/pinctrl-tegra186.c b/drivers/pinctrl/pinctrl-tegra186.c
index fa74c8b6c..3ca884142 100644
--- a/drivers/pinctrl/pinctrl-tegra186.c
+++ b/drivers/pinctrl/pinctrl-tegra186.c
@@ -3253,13 +3253,13 @@ static const struct tegra_function tegra186_functions[] = {
                         },                                                              \
                 .mux_reg = PINGROUP_REG_Y(r), \
                 .drvdn_bit = -1,                                \
-                .parked_reg = -1,                               \
                 .drvup_bit = -1,                                \
                 .slwr_bit = -1,                                 \
                 .slwf_bit = -1,                                 \
                 .lpmd_bit = -1,                                 \
-                .lock_reg = -1,                                 \
-                .hsm_reg = -1,                                  \
+                .lock_bit = -1,                                 \
+                .hsm_bit = -1,                                  \
+                .parked_bit = -1,                               \
                 .mux_bank = bank,                                       \
                 .mux_bit = 0,                                   \
                 .pupd_reg = PINGROUP_REG_##pupd(r),     \
@@ -3268,37 +3268,16 @@ static const struct tegra_function tegra186_functions[] = {
                 .tri_reg = PINGROUP_REG_Y(r),                   \
                 .tri_bank = bank,                                       \
                 .tri_bit = 4,                           \
-                .e_io_hv_reg = PINGROUP_REG_Y(r),       \
-                .e_io_hv_bank = bank,                           \
                 .e_io_hv_bit = e_io_hv,                         \
-                .einput_reg = PINGROUP_REG_Y(r),                \
-                .einput_bank = bank,                            \
                 .einput_bit = e_input,                          \
-                .gpio_reg = PINGROUP_REG_Y(r),  \
-                .gpio_bank = bank,                              \
                 .gpio_bit = gpio_sfio_sel,                      \
-                .odrain_reg = PINGROUP_REG_Y(r),                \
                 .odrain_bit = e_od,                             \
-                .odrain_bank = bank,                            \
                 .schmitt_bit = schmitt_b,                       \
-                .schmitt_reg = PINGROUP_REG_Y(r),               \
-                .drvtype_reg = PINGROUP_REG_##drvtype(r),       \
-                .drvtype_bank = bank,                           \
                 .drvtype_bit = 13,                              \
-                .drvtype_width = 2,                             \
-                .lpdr_reg = PINGROUP_REG_Y(r),          \
-                .lpdr_bank = bank,                              \
                 .lpdr_bit = e_lpdr,                             \
-                .pbias_buf_reg = PINGROUP_REG_Y(r),             \
-                .pbias_buf_bank = bank,                         \
                 .pbias_buf_bit = e_io_hv,                               \
-                .preemp_reg = PINGROUP_REG_Y(r),                \
-                .preemp_bank = bank,                            \
                 .preemp_bit = e_io_hv,                          \
-                .rfu_in_reg = PINGROUP_REG_##rfu_in(r), \
-                .rfu_in_bank = bank,                            \
                 .rfu_in_bit = 20,                               \
-                .rfu_in_width = 4,                              \
                 .drv_reg = -1,                                  \
         }
 
@@ -3313,15 +3292,19 @@ static const struct tegra_function tegra186_functions[] = {
                 .mux_reg = -1,                                  \
                 .pupd_reg = -1,                                 \
                 .tri_reg = -1,                                  \
-                .einput_reg = -1,                               \
-                .e_io_hv_reg = -1,                              \
-                .odrain_reg = -1,                               \
-                .lock_reg = -1,                                 \
-                .parked_reg = -1,                               \
+                .einput_bit = -1,                               \
+                .e_io_hv_bit = -1,                              \
+                .odrain_bit = -1,                               \
+                .lock_bit = -1,                                 \
+                .parked_bit = -1,                               \
                 .lpmd_bit = -1,                                 \
-                .drvtype_reg = -1,                              \
-                .drv_reg = DRV_PINGROUP_Y(r),           \
-                .drv_bank = bank,                                       \
+                .drvtype_bit = -1,                              \
+                .lpdr_bit = -1,                         \
+                .pbias_buf_bit = -1,                            \
+                .preemp_bit = -1,                               \
+                .rfu_in_bit = -1,                               \
+                .drv_reg = DRV_PINGROUP_Y(r),                   \
+                .drv_bank = bank,                               \
                 .drvdn_bit = drvdn_b,                           \
                 .drvdn_width = drvdn_w,                         \
                 .drvup_bit = drvup_b,                           \
@@ -3762,6 +3745,9 @@ static const struct tegra_pinctrl_soc_data tegra186_pinctrl = {
         .suspend = tegra186_pinctrl_suspend,
         .resume = tegra186_pinctrl_resume,
         .gpio_request_enable = tegra186_gpio_request_enable,
+        .hsm_in_mux = false,
+        .schmitt_in_mux = true,
+        .drvtype_in_mux = true,
 };
 
 static int tegra186_pinctrl_probe(struct platform_device *pdev)