Patch "pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro" has been added to the 4.1-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pinctrl-zynq-fix-define_zynq_pinmux_function_mux-macro.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
4f652cea020aac42972cb7c9788b470ed45aa228Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <[email protected]>
Date: Wed, 20 May 2015 17:42:30 +0900
Subject: pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Masahiro Yamada <[email protected]>
commit 4f652cea020aac42972cb7c9788b470ed45aa228 upstream.
The offset to the mux register is missing.
--- drivers/pinctrl/pinctrl-zynq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/pinctrl-zynq.c +2 -1
@@ -714,12 +714,13 @@ static const char * const gpio0_groups[] .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, \ }
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/pinctrl-zynq-fix-offset-address-for-sd0-sd1-_wp_cd_sel.patch queue-4.1/pinctrl-zynq-fix-define_zynq_pinmux_function_mux-macro.patch