memory: renesas-rpc-if: refactor MOIIO and IOFV macros

Don't use _HIZ macros but also provide a val. This is more consistent
with the other macros and, thus, easier to read. Also shorter.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20211119110442.4946-1-wsa+renesas@sang-engineering.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index ccd662ee2acbf1f21f2dbe020d7a80f99cbc3c3e..e4cc64f560196d5579839e53dc7fc6d100c5f48e 100644 (file)
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
@@ -24,14 +24,13 @@
 #define RPCIF_CMNCR_MOIIO2(val)        (((val) & 0x3) << 20)
 #define RPCIF_CMNCR_MOIIO1(val)        (((val) & 0x3) << 18)
 #define RPCIF_CMNCR_MOIIO0(val)        (((val) & 0x3) << 16)
-#define RPCIF_CMNCR_MOIIO_HIZ  (RPCIF_CMNCR_MOIIO0(3) | \
-                                RPCIF_CMNCR_MOIIO1(3) | \
-                                RPCIF_CMNCR_MOIIO2(3) | RPCIF_CMNCR_MOIIO3(3))
+#define RPCIF_CMNCR_MOIIO(val) (RPCIF_CMNCR_MOIIO0(val) | RPCIF_CMNCR_MOIIO1(val) | \
+                                RPCIF_CMNCR_MOIIO2(val) | RPCIF_CMNCR_MOIIO3(val))
 #define RPCIF_CMNCR_IO3FV(val) (((val) & 0x3) << 14) /* documented for RZ/G2L */
 #define RPCIF_CMNCR_IO2FV(val) (((val) & 0x3) << 12) /* documented for RZ/G2L */
 #define RPCIF_CMNCR_IO0FV(val) (((val) & 0x3) << 8)
-#define RPCIF_CMNCR_IOFV_HIZ   (RPCIF_CMNCR_IO0FV(3) | RPCIF_CMNCR_IO2FV(3) | \
-                                RPCIF_CMNCR_IO3FV(3))
+#define RPCIF_CMNCR_IOFV(val)  (RPCIF_CMNCR_IO0FV(val) | RPCIF_CMNCR_IO2FV(val) | \
+                                RPCIF_CMNCR_IO3FV(val))
 #define RPCIF_CMNCR_BSZ(val)   (((val) & 0x3) << 0)
 
 #define RPCIF_SSLDR            0x0004  /* R/W */
@@ -304,17 +303,14 @@ int rpcif_hw_init(struct rpcif *rpc, bool hyperflash)
 
        if (rpc->type == RPCIF_RCAR_GEN3)
                regmap_update_bits(rpc->regmap, RPCIF_CMNCR,
-                                  RPCIF_CMNCR_MOIIO_HIZ | RPCIF_CMNCR_BSZ(3),
-                                  RPCIF_CMNCR_MOIIO_HIZ |
+                                  RPCIF_CMNCR_MOIIO(3) | RPCIF_CMNCR_BSZ(3),
+                                  RPCIF_CMNCR_MOIIO(3) |
                                   RPCIF_CMNCR_BSZ(hyperflash ? 1 : 0));
        else
                regmap_update_bits(rpc->regmap, RPCIF_CMNCR,
-                                  RPCIF_CMNCR_MOIIO_HIZ | RPCIF_CMNCR_IOFV_HIZ |
+                                  RPCIF_CMNCR_MOIIO(3) | RPCIF_CMNCR_IOFV(3) |
                                   RPCIF_CMNCR_BSZ(3),
-                                  RPCIF_CMNCR_MOIIO3(1) | RPCIF_CMNCR_MOIIO2(1) |
-                                  RPCIF_CMNCR_MOIIO1(1) | RPCIF_CMNCR_MOIIO0(1) |
-                                  RPCIF_CMNCR_IO3FV(2) | RPCIF_CMNCR_IO2FV(2) |
-                                  RPCIF_CMNCR_IO0FV(2) |
+                                  RPCIF_CMNCR_MOIIO(1) | RPCIF_CMNCR_IOFV(2) |
                                   RPCIF_CMNCR_BSZ(hyperflash ? 1 : 0));
 
        /* Set RCF after BSZ update */