pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Wed, 20 May 2015 08:42:30 +0000 (17:42 +0900)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 1 Jun 2015 12:59:24 +0000 (14:59 +0200)
The offset to the mux register is missing.

Fixes: add958cee967 "pinctrl: Add driver for Zynq"
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-zynq.c

index d66f64ce404a96cd22d1526ccfed4d9216b31892..e65abaa52053251dfb3f19ed441caf21870b3ca3 100644 (file)
@@ -768,12 +768,13 @@ static const char * const gpio0_groups[] = {"gpio0_0_grp",
                .mux_val = mval,                        \
        }
 
-#define DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(fname, mval, mux, mask, shift) \
+#define DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(fname, mval, offset, mask, shift)\
        [ZYNQ_PMUX_##fname] = {                         \
                .name = #fname,                         \
                .groups = fname##_groups,               \
                .ngroups = ARRAY_SIZE(fname##_groups),  \
                .mux_val = mval,                        \
+               .mux = offset,                          \
                .mux_mask = mask,                       \
                .mux_shift = shift,                     \
        }