Revert "pinctrl: tegra: avoid parked_reg and parked_bank"

This reverts commit 1d18a3f0f0809f6c71f1f6e9e268ee904ce0b588.

7 files changed, 20 insertions, 14 deletions

diff --git a/drivers/pinctrl/tegra/pinctrl-tegra.c b/drivers/pinctrl/tegra/pinctrl-tegra.c
index 277622b4b6fb..6e82b290cb4f 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra.c
@@ -632,11 +632,11 @@ static void tegra_pinctrl_clear_parked_bits(struct tegra_pmx *pmx)
         u32 val;
 
         for (i = 0; i < pmx->soc->ngroups; ++i) {
-                g = &pmx->soc->groups[i];
-                if (g->parked_bit >= 0) {
-                        val = pmx_readl(pmx, g->mux_bank, g->mux_reg);
+                if (pmx->soc->groups[i].parked_reg >= 0) {
+                        g = &pmx->soc->groups[i];
+                        val = pmx_readl(pmx, g->parked_bank, g->parked_reg);
                         val &= ~(1 << g->parked_bit);
-                        pmx_writel(pmx, val, g->mux_bank, g->mux_reg);
+                        pmx_writel(pmx, val, g->parked_bank, g->parked_reg);
                 }
         }
 }
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;
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra114.c b/drivers/pinctrl/tegra/pinctrl-tegra114.c
index 952132ce5ea0..4851d169f4c7 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra114.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra114.c
@@ -1578,7 +1578,7 @@ static struct tegra_function tegra114_functions[] = {
                 .lock_bit = 7,                                          \
                 .ioreset_bit = PINGROUP_BIT_##ior(8),                   \
                 .rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9),               \
-                .parked_bit = -1,                                       \
+                .parked_reg = -1,                                       \
                 .drv_reg = -1,                                          \
         }
 
@@ -1599,7 +1599,7 @@ static struct tegra_function tegra114_functions[] = {
                 .rcv_sel_bit = -1,                                      \
                 .drv_reg = DRV_PINGROUP_REG(r),                         \
                 .drv_bank = 0,                                          \
-                .parked_bit = -1,                                       \
+                .parked_reg = -1,                                       \
                 .hsm_bit = hsm_b,                                       \
                 .schmitt_bit = schmitt_b,                               \
                 .lpmd_bit = lpmd_b,                                     \
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra124.c b/drivers/pinctrl/tegra/pinctrl-tegra124.c
index bca239e3ae50..a0ce723a9482 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_bit = -1,                                       \
+                .parked_reg = -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_bit = -1,                                       \
+                .parked_reg = -1,                                       \
                 .hsm_bit = hsm_b,                                       \
                 .schmitt_bit = schmitt_b,                               \
                 .lpmd_bit = lpmd_b,                                     \
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra20.c b/drivers/pinctrl/tegra/pinctrl-tegra20.c
index 91254d04c64f..09bad6980ad1 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra20.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra20.c
@@ -1994,7 +1994,7 @@ static struct tegra_function tegra20_functions[] = {
                 .tri_reg = ((tri_r) - TRISTATE_REG_A),          \
                 .tri_bank = 0,                                  \
                 .tri_bit = tri_b,                               \
-                .parked_bit = -1,                               \
+                .parked_reg = -1,                               \
                 .einput_bit = -1,                               \
                 .odrain_bit = -1,                               \
                 .lock_bit = -1,                                 \
@@ -2014,7 +2014,7 @@ static struct tegra_function tegra20_functions[] = {
                 .pupd_bank = 2,                                 \
                 .pupd_bit = pupd_b,                             \
                 .drv_reg = -1,                                  \
-                .parked_bit = -1,                               \
+                .parked_reg = -1,                               \
         }
 
 /* Pin groups for drive strength registers (configurable version) */
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra210.c b/drivers/pinctrl/tegra/pinctrl-tegra210.c
index 2b70e93da9db..2d856af389ef 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra210.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra210.c
@@ -1310,6 +1310,8 @@ static struct tegra_function tegra210_functions[] = {
                 .lock_bit = 7,                                          \
                 .ioreset_bit = -1,                                      \
                 .rcv_sel_bit = PINGROUP_BIT_##e_io_hv(10),              \
+                .parked_reg = PINGROUP_REG(r),                          \
+                .parked_bank = 1,                                       \
                 .parked_bit = 5,                                        \
                 .hsm_bit = PINGROUP_BIT_##hsm(9),                       \
                 .schmitt_bit = 12,                                      \
@@ -1343,7 +1345,7 @@ static struct tegra_function tegra210_functions[] = {
                 .rcv_sel_bit = -1,                                      \
                 .drv_reg = DRV_PINGROUP_REG(r),                         \
                 .drv_bank = 0,                                          \
-                .parked_bit = -1,                                       \
+                .parked_reg = -1,                                       \
                 .hsm_bit = -1,                                          \
                 .schmitt_bit = -1,                                      \
                 .lpmd_bit = -1,                                         \
diff --git a/drivers/pinctrl/tegra/pinctrl-tegra30.c b/drivers/pinctrl/tegra/pinctrl-tegra30.c
index 474ac6daf513..fb7817fea2d9 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra30.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra30.c
@@ -2139,7 +2139,7 @@ static struct tegra_function tegra30_functions[] = {
                 .lock_bit = 7,                                          \
                 .ioreset_bit = PINGROUP_BIT_##ior(8),                   \
                 .rcv_sel_bit = -1,                                      \
-                .parked_bit = -1,                                       \
+                .parked_reg = -1,                                       \
                 .drv_reg = -1,                                          \
         }
 
@@ -2160,7 +2160,7 @@ static struct tegra_function tegra30_functions[] = {
                 .rcv_sel_bit = -1,                                      \
                 .drv_reg = DRV_PINGROUP_REG(r),                         \
                 .drv_bank = 0,                                          \
-                .parked_bit = -1,                                       \
+                .parked_reg = -1,                                       \
                 .hsm_bit = hsm_b,                                       \
                 .schmitt_bit = schmitt_b,                               \
                 .lpmd_bit = lpmd_b,                                     \