pinctrl: renesas: sh7734: Use shorthands for reserved fields

Replace the full descriptions of reserved register fields by shorthands
with a negative field width, and merge adjacent reserved fields.

This reduces kernel size by 174 bytes.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/3ab96d28494b8c5a2d427ba25f31a04ca0cc7305.1649865241.git.geert+renesas@glider.be

diff --git a/drivers/pinctrl/renesas/pfc-sh7734.c b/drivers/pinctrl/renesas/pfc-sh7734.c
index a4e02fc..54f60b3 100644 (file)
--- a/drivers/pinctrl/renesas/pfc-sh7734.c
+++ b/drivers/pinctrl/renesas/pfc-sh7734.c
@@ -1895,10 +1895,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                FN_A16, FN_ST0_PWM, FN_LCD_DON_A, FN_TIOC4A_C ))
        },
        { PINMUX_CFG_REG_VAR("IPSR2", 0xFFFC0024, 32,
-                            GROUP(1, 3, 3, 2, 3, 3, 3, 3, 3, 3, 2, 3),
+                            GROUP(-1, 3, 3, 2, 3, 3, 3, 3, 3, 3, 2, 3),
                             GROUP(
-               /* IP2_31 [1] */
-               0, 0,
+               /* IP2_31 [1] RESERVED */
                /* IP2_30_28 [3] */
                FN_D14, FN_TX2_B, 0, FN_FSE_A,
                        FN_ET0_TX_CLK_B, 0, 0, 0,
@@ -1932,10 +1931,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                        FN_FD4_A, 0, 0, 0 ))
        },
        { PINMUX_CFG_REG_VAR("IPSR3", 0xFFFC0028, 32,
-                            GROUP(2, 3, 3, 3, 1, 2, 3, 3, 3, 3, 3, 1, 2),
+                            GROUP(-2, 3, 3, 3, 1, 2, 3, 3, 3, 3, 3, 1, 2),
                             GROUP(
-           /* IP3_31_30 [2] */
-               0, 0, 0, 0,
+           /* IP3_31_30 [2] RESERVED */
            /* IP3_29_27 [3] */
                FN_DRACK0, FN_SD1_DAT2_A, FN_ATAG, FN_TCLK1_A,
                FN_ET0_ETXD7, 0, 0, 0,
@@ -2006,19 +2004,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                        FN_ET0_ERXD7, 0, 0, 0 ))
        },
        { PINMUX_CFG_REG_VAR("IPSR5", 0xFFFC0030, 32,
-                            GROUP(1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3,
-                                  3, 3, 3),
+                            GROUP(-5, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3),
                             GROUP(
-           /* IP5_31 [1] */
-           0, 0,
-           /* IP5_30 [1] */
-           0, 0,
-           /* IP5_29 [1] */
-           0, 0,
-           /* IP5_28 [1] */
-           0, 0,
-           /* IP5_27 [1] */
-           0, 0,
+           /* IP5_31_27 [5] RESERVED */
            /* IP5_26_25 [2] */
                FN_REF50CK, FN_CTS1_E, FN_HCTS0_D, 0,
            /* IP5_24_23 [2] */
@@ -2048,25 +2036,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                FN_ET0_RX_CLK_B, 0, 0, 0 ))
        },
        { PINMUX_CFG_REG_VAR("IPSR6", 0xFFFC0034, 32,
-                            GROUP(1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 2, 2,
-                                  2, 2, 2, 2, 3, 3),
+                            GROUP(-8, 3, 3, 2, 2, 2, 2, 2, 2, 3, 3),
                             GROUP(
-           /* IP5_31 [1] */
-           0, 0,
-           /* IP6_30 [1] */
-           0, 0,
-           /* IP6_29 [1] */
-           0, 0,
-           /* IP6_28 [1] */
-           0, 0,
-           /* IP6_27 [1] */
-           0, 0,
-           /* IP6_26 [1] */
-           0, 0,
-           /* IP6_25 [1] */
-           0, 0,
-           /* IP6_24 [1] */
-           0, 0,
+           /* IP5_31_24 [8] RESERVED */
            /* IP6_23_21 [3] */
                FN_DU0_DG1, FN_CTS1_C, FN_HRTS0_D, FN_TIOC1B_A,
                FN_HIFD09, 0, 0, 0,
@@ -2093,10 +2065,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                FN_TCLKA_A, FN_HIFD00, 0, 0 ))
        },
        { PINMUX_CFG_REG_VAR("IPSR7", 0xFFFC0038, 32,
-                            GROUP(1, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3),
+                            GROUP(-1, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3),
                             GROUP(
-           /* IP7_31 [1] */
-           0, 0,
+           /* IP7_31 [1] RESERVED */
            /* IP7_30_29 [2] */
                FN_DU0_DB4, 0, FN_HIFINT, 0,
            /* IP7_28_27 [2] */
@@ -2130,11 +2101,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                FN_HIFD10, 0, 0, 0 ))
        },
        { PINMUX_CFG_REG_VAR("IPSR8", 0xFFFC003C, 32,
-                            GROUP(2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2,
+                            GROUP(-2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2,
                                   2, 2, 2),
                             GROUP(
-           /* IP9_31_30 [2] */
-           0, 0, 0, 0,
+           /* IP9_31_30 [2] RESERVED */
            /* IP8_29_28 [2] */
                FN_IRQ3_A, FN_RTS0_A, FN_HRTS0_B, FN_ET0_ERXD3_A,
            /* IP8_27_26 [2] */
@@ -2168,11 +2138,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                FN_DU0_DB5, 0, FN_HIFDREQ, 0 ))
        },
        { PINMUX_CFG_REG_VAR("IPSR9", 0xFFFC0040, 32,
-                            GROUP(2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+                            GROUP(-2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
                                   2, 2, 2, 2),
                             GROUP(
-           /* IP9_31_30 [2] */
-           0, 0, 0, 0,
+           /* IP9_31_30 [2] RESERVED */
            /* IP9_29_28 [2] */
                FN_SSI_SDATA1_A, FN_VI1_3_B, FN_LCD_DATA14_B, 0,
            /* IP9_27_26 [2] */
@@ -2205,10 +2174,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                FN_VI1_CLK_A, 0, FN_FD0_B, FN_LCD_DATA0_B ))
        },
        { PINMUX_CFG_REG_VAR("IPSR10", 0xFFFC0044, 32,
-                            GROUP(2, 2, 2, 1, 2, 1, 3, 3, 1, 3, 3, 3, 3, 3),
+                            GROUP(-2, 2, 2, 1, 2, 1, 3, 3, 1, 3, 3, 3, 3, 3),
                             GROUP(
-           /* IP9_31_30 [2] */
-           0, 0, 0, 0,
+           /* IP9_31_30 [2] RESERVED */
            /* IP10_29_28 [2] */
                FN_CAN1_TX_A, FN_TX5_C, FN_MLB_DAT, 0,
            /* IP10_27_26 [2] */
@@ -2244,11 +2212,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                FN_LCD_DATA15_B, 0, 0, 0 ))
        },
        { PINMUX_CFG_REG_VAR("IPSR11", 0xFFFC0048, 32,
-                            GROUP(3, 1, 2, 3, 2, 2, 3, 3, 1, 2, 3, 3,
+                            GROUP(-3, 1, 2, 3, 2, 2, 3, 3, 1, 2, 3, 3,
                                   1, 1, 1, 1),
                             GROUP(
-           /* IP11_31_29 [3] */
-           0, 0, 0, 0, 0, 0, 0, 0,
+           /* IP11_31_29 [3] RESERVED */
            /* IP11_28 [1] */
                FN_PRESETOUT, FN_ST_CLKOUT,
            /* IP11_27_26 [2] */
@@ -2286,11 +2253,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                FN_SCL1, FN_SCIF_CLK_C ))
        },
        { PINMUX_CFG_REG_VAR("MOD_SEL1", 0xFFFC004C, 32,
-                            GROUP(3, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2,
+                            GROUP(-3, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 2,
                                   2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
                             GROUP(
-               /* SEL1_31_29 [3] */
-               0, 0, 0, 0, 0, 0, 0, 0,
+               /* SEL1_31_29 [3] RESERVED */
                /* SEL1_28 [1] */
                FN_SEL_IEBUS_0, FN_SEL_IEBUS_1,
                /* SEL1_27 [1] */
@@ -2343,25 +2309,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
                FN_SEL_INTC_0, FN_SEL_INTC_1 ))
        },
        { PINMUX_CFG_REG_VAR("MOD_SEL2", 0xFFFC0050, 32,
-                            GROUP(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
-                                  2, 1, 2, 2, 3, 2, 3, 2, 2),
+                            GROUP(-8, 1, 1, 1, 2, 2, 1, 2, 2, 3, 2, 3, 2, 2),
                             GROUP(
-               /* SEL2_31 [1] */
-               0, 0,
-               /* SEL2_30 [1] */
-               0, 0,
-               /* SEL2_29 [1] */
-               0, 0,
-               /* SEL2_28 [1] */
-               0, 0,
-               /* SEL2_27 [1] */
-               0, 0,
-               /* SEL2_26 [1] */
-               0, 0,
-               /* SEL2_25 [1] */
-               0, 0,
-               /* SEL2_24 [1] */
-               0, 0,
+               /* SEL2_31_24 [8] RESERVED */
                /* SEL2_23 [1] */
                FN_SEL_MTU2_CLK_0, FN_SEL_MTU2_CLK_1,
                /* SEL2_22 [1] */