pinctrl: sh-pfc: r8a7794: Use PINMUX_SINGLE() instead of raw PINMUX_DATA()

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c
index 086f6798b1294564e425e0ab93c129fab16831ea..3324ee75e71c69b548085b0e362ddfbdcc0ad14c 100644 (file)
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c
@@ -618,28 +618,28 @@ enum {
 static const u16 pinmux_data[] = {
        PINMUX_DATA_GP_ALL(), /* PINMUX_DATA(GP_M_N_DATA, GP_M_N_FN...), */
 
-       PINMUX_DATA(A2_MARK, FN_A2),
-       PINMUX_DATA(WE0_N_MARK, FN_WE0_N),
-       PINMUX_DATA(WE1_N_MARK, FN_WE1_N),
-       PINMUX_DATA(DACK0_MARK, FN_DACK0),
-       PINMUX_DATA(USB0_PWEN_MARK, FN_USB0_PWEN),
-       PINMUX_DATA(USB0_OVC_MARK, FN_USB0_OVC),
-       PINMUX_DATA(USB1_PWEN_MARK, FN_USB1_PWEN),
-       PINMUX_DATA(USB1_OVC_MARK, FN_USB1_OVC),
-       PINMUX_DATA(SD0_CLK_MARK, FN_SD0_CLK),
-       PINMUX_DATA(SD0_CMD_MARK, FN_SD0_CMD),
-       PINMUX_DATA(SD0_DATA0_MARK, FN_SD0_DATA0),
-       PINMUX_DATA(SD0_DATA1_MARK, FN_SD0_DATA1),
-       PINMUX_DATA(SD0_DATA2_MARK, FN_SD0_DATA2),
-       PINMUX_DATA(SD0_DATA3_MARK, FN_SD0_DATA3),
-       PINMUX_DATA(SD0_CD_MARK, FN_SD0_CD),
-       PINMUX_DATA(SD0_WP_MARK, FN_SD0_WP),
-       PINMUX_DATA(SD1_CLK_MARK, FN_SD1_CLK),
-       PINMUX_DATA(SD1_CMD_MARK, FN_SD1_CMD),
-       PINMUX_DATA(SD1_DATA0_MARK, FN_SD1_DATA0),
-       PINMUX_DATA(SD1_DATA1_MARK, FN_SD1_DATA1),
-       PINMUX_DATA(SD1_DATA2_MARK, FN_SD1_DATA2),
-       PINMUX_DATA(SD1_DATA3_MARK, FN_SD1_DATA3),
+       PINMUX_SINGLE(A2),
+       PINMUX_SINGLE(WE0_N),
+       PINMUX_SINGLE(WE1_N),
+       PINMUX_SINGLE(DACK0),
+       PINMUX_SINGLE(USB0_PWEN),
+       PINMUX_SINGLE(USB0_OVC),
+       PINMUX_SINGLE(USB1_PWEN),
+       PINMUX_SINGLE(USB1_OVC),
+       PINMUX_SINGLE(SD0_CLK),
+       PINMUX_SINGLE(SD0_CMD),
+       PINMUX_SINGLE(SD0_DATA0),
+       PINMUX_SINGLE(SD0_DATA1),
+       PINMUX_SINGLE(SD0_DATA2),
+       PINMUX_SINGLE(SD0_DATA3),
+       PINMUX_SINGLE(SD0_CD),
+       PINMUX_SINGLE(SD0_WP),
+       PINMUX_SINGLE(SD1_CLK),
+       PINMUX_SINGLE(SD1_CMD),
+       PINMUX_SINGLE(SD1_DATA0),
+       PINMUX_SINGLE(SD1_DATA1),
+       PINMUX_SINGLE(SD1_DATA2),
+       PINMUX_SINGLE(SD1_DATA3),
 
        /* IPSR0 */
        PINMUX_IPSR_DATA(IP0_0, SD1_CD),