pinctrl: sh-pfc: r8a7791: 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-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
index 87a4f44147c1d5bcd9c286e86475b0e8370f9a86..ebadd2816b7b5dcfb2d7166ffdfb20ad6b09c284 100644 (file)
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
@@ -787,23 +787,23 @@ enum {
 static const u16 pinmux_data[] = {
        PINMUX_DATA_GP_ALL(), /* PINMUX_DATA(GP_M_N_DATA, GP_M_N_FN...), */
 
-       PINMUX_DATA(EX_CS0_N_MARK, FN_EX_CS0_N),
-       PINMUX_DATA(RD_N_MARK, FN_RD_N),
-       PINMUX_DATA(AUDIO_CLKA_MARK, FN_AUDIO_CLKA),
-       PINMUX_DATA(VI0_CLK_MARK, FN_VI0_CLK),
-       PINMUX_DATA(VI0_DATA0_VI0_B0_MARK, FN_VI0_DATA0_VI0_B0),
-       PINMUX_DATA(VI0_DATA1_VI0_B1_MARK, FN_VI0_DATA1_VI0_B1),
-       PINMUX_DATA(VI0_DATA2_VI0_B2_MARK, FN_VI0_DATA2_VI0_B2),
-       PINMUX_DATA(VI0_DATA4_VI0_B4_MARK, FN_VI0_DATA4_VI0_B4),
-       PINMUX_DATA(VI0_DATA5_VI0_B5_MARK, FN_VI0_DATA5_VI0_B5),
-       PINMUX_DATA(VI0_DATA6_VI0_B6_MARK, FN_VI0_DATA6_VI0_B6),
-       PINMUX_DATA(VI0_DATA7_VI0_B7_MARK, FN_VI0_DATA7_VI0_B7),
-       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(DU0_DOTCLKIN_MARK, FN_DU0_DOTCLKIN),
-       PINMUX_DATA(SD1_CLK_MARK, FN_SD1_CLK),
+       PINMUX_SINGLE(EX_CS0_N),
+       PINMUX_SINGLE(RD_N),
+       PINMUX_SINGLE(AUDIO_CLKA),
+       PINMUX_SINGLE(VI0_CLK),
+       PINMUX_SINGLE(VI0_DATA0_VI0_B0),
+       PINMUX_SINGLE(VI0_DATA1_VI0_B1),
+       PINMUX_SINGLE(VI0_DATA2_VI0_B2),
+       PINMUX_SINGLE(VI0_DATA4_VI0_B4),
+       PINMUX_SINGLE(VI0_DATA5_VI0_B5),
+       PINMUX_SINGLE(VI0_DATA6_VI0_B6),
+       PINMUX_SINGLE(VI0_DATA7_VI0_B7),
+       PINMUX_SINGLE(USB0_PWEN),
+       PINMUX_SINGLE(USB0_OVC),
+       PINMUX_SINGLE(USB1_PWEN),
+       PINMUX_SINGLE(USB1_OVC),
+       PINMUX_SINGLE(DU0_DOTCLKIN),
+       PINMUX_SINGLE(SD1_CLK),
 
        /* IPSR0 */
        PINMUX_IPSR_DATA(IP0_0, D0),