pinctrl: tegra: remove redundant data table fields

Any SoC which supports the einput, odrain, lock, ioreset, or rcv_sel
options has the relevant HW register fields in the same register as the
mux function selection. Similarly, the drvtype option is always in the
drive register, if it is supported at all. Hence, we don't need to have
struct *_reg fields in the pin group table to define which register and
bank to use for those options. Delete this to save space in the driver's
data tables.

However, many of those options are not supported on all SoCs, or not
supported on some pingroups. We need a way to detect when they are
supported. Previously, this was indicated by setting the struct *_reg
field to -1. With the struct *_reg fields removed, we use the struct
*_bit fields for this purpose instead. The struct *_bit fields need to
be expanded from 5 to 6 bits in order to store a value outside the valid
HW bit range of 0..31.

Even without removing the struct *_reg fields, we still need to add code
to validate the struct *_bit fields, since some struct *_bit fields were
already being set to -1, without an option-specific struct *_reg field to
"guard" them. In other words, before this change, the pinmux driver might
allow some unsupported options to be written to HW.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 20 insertions, 33 deletions

diff --git a/drivers/pinctrl/pinctrl-tegra114.c b/drivers/pinctrl/pinctrl-tegra114.c
index 63fe7619d3ff..6766873669e8 100644
--- a/drivers/pinctrl/pinctrl-tegra114.c
+++ b/drivers/pinctrl/pinctrl-tegra114.c
@@ -1547,8 +1547,10 @@ static struct tegra_function tegra114_functions[] = {
 #define DRV_PINGROUP_REG_A              0x868   /* bank 0 */
 #define PINGROUP_REG_A                  0x3000  /* bank 1 */
 
-#define PINGROUP_REG_Y(r)               ((r) - PINGROUP_REG_A)
-#define PINGROUP_REG_N(r)               -1
+#define PINGROUP_REG(r)                 ((r) - PINGROUP_REG_A)
+
+#define PINGROUP_BIT_Y(b)               (b)
+#define PINGROUP_BIT_N(b)               (-1)
 
 #define PINGROUP(pg_name, f0, f1, f2, f3, f_safe, r, od, ior, rcv_sel)  \
         {                                                               \
@@ -1562,37 +1564,24 @@ static struct tegra_function tegra114_functions[] = {
                         TEGRA_MUX_##f3,                                 \
                 },                                                      \
                 .func_safe = TEGRA_MUX_##f_safe,                        \
-                .mux_reg = PINGROUP_REG_Y(r),                           \
+                .mux_reg = PINGROUP_REG(r),                             \
                 .mux_bank = 1,                                          \
                 .mux_bit = 0,                                           \
-                .pupd_reg = PINGROUP_REG_Y(r),                          \
+                .pupd_reg = PINGROUP_REG(r),                            \
                 .pupd_bank = 1,                                         \
                 .pupd_bit = 2,                                          \
-                .tri_reg = PINGROUP_REG_Y(r),                           \
+                .tri_reg = PINGROUP_REG(r),                             \
                 .tri_bank = 1,                                          \
                 .tri_bit = 4,                                           \
-                .einput_reg = PINGROUP_REG_Y(r),                        \
-                .einput_bank = 1,                                       \
-                .einput_bit = 5,                                        \
-                .odrain_reg = PINGROUP_REG_##od(r),                     \
-                .odrain_bank = 1,                                       \
-                .odrain_bit = 6,                                        \
-                .lock_reg = PINGROUP_REG_Y(r),                          \
-                .lock_bank = 1,                                         \
-                .lock_bit = 7,                                          \
-                .ioreset_reg = PINGROUP_REG_##ior(r),                   \
-                .ioreset_bank = 1,                                      \
-                .ioreset_bit = 8,                                       \
-                .rcv_sel_reg = PINGROUP_REG_##rcv_sel(r),               \
-                .rcv_sel_bank = 1,                                      \
-                .rcv_sel_bit = 9,                                       \
+                .einput_bit = PINGROUP_BIT_Y(5),                        \
+                .odrain_bit = PINGROUP_BIT_##od(6),                     \
+                .lock_bit = PINGROUP_BIT_Y(7),                          \
+                .ioreset_bit = PINGROUP_BIT_##ior(8),                   \
+                .rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9),               \
                 .drv_reg = -1,                                          \
-                .drvtype_reg = -1,                                      \
         }
 
-#define DRV_PINGROUP_REG_Y(r)           ((r) - DRV_PINGROUP_REG_A)
-#define DRV_PINGROUP_REG_N(r)           -1
-
+#define DRV_PINGROUP_REG(r)             ((r) - DRV_PINGROUP_REG_A)
 
 #define DRV_PINGROUP(pg_name, r, hsm_b, schmitt_b, lpmd_b,              \
                      drvdn_b, drvdn_w, drvup_b, drvup_w,                \
@@ -1605,12 +1594,12 @@ static struct tegra_function tegra114_functions[] = {
                 .mux_reg = -1,                                          \
                 .pupd_reg = -1,                                         \
                 .tri_reg = -1,                                          \
-                .einput_reg = -1,                                       \
-                .odrain_reg = -1,                                       \
-                .lock_reg = -1,                                         \
-                .ioreset_reg = -1,                                      \
-                .rcv_sel_reg = -1,                                      \
-                .drv_reg = DRV_PINGROUP_REG_Y(r),                       \
+                .einput_bit = -1,                                       \
+                .odrain_bit = -1,                                       \
+                .lock_bit = -1,                                         \
+                .ioreset_bit = -1,                                      \
+                .rcv_sel_bit = -1,                                      \
+                .drv_reg = DRV_PINGROUP_REG(r),                         \
                 .drv_bank = 0,                                          \
                 .hsm_bit = hsm_b,                                       \
                 .schmitt_bit = schmitt_b,                               \
@@ -1623,9 +1612,7 @@ static struct tegra_function tegra114_functions[] = {
                 .slwr_width = slwr_w,                                   \
                 .slwf_bit = slwf_b,                                     \
                 .slwf_width = slwf_w,                                   \
-                .drvtype_reg = DRV_PINGROUP_REG_##drvtype(r),           \
-                .drvtype_bank = 0,                                      \
-                .drvtype_bit = 6,                                       \
+                .drvtype_bit = PINGROUP_BIT_##drvtype(6),               \
         }
 
 static const struct tegra_pingroup tegra114_groups[] = {