From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45076 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964967AbbGZDwC (ORCPT ); Sat, 25 Jul 2015 23:52:02 -0400 Subject: Patch "pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro" has been added to the 4.1-stable tree To: yamada.masahiro@socionext.com, gregkh@linuxfoundation.org, linus.walleij@linaro.org, soren.brinkmann@xilinx.com Cc: , From: Date: Sat, 25 Jul 2015 20:51:59 -0700 Message-ID: <143788271932142@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 4f652cea020aac42972cb7c9788b470ed45aa228 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada 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 commit 4f652cea020aac42972cb7c9788b470ed45aa228 upstream. The offset to the mux register is missing. Fixes: add958cee967 "pinctrl: Add driver for Zynq" Signed-off-by: Masahiro Yamada Reviewed-by: Sören Brinkmann Signed-off-by: Linus Walleij Signed-off-by: Greg Kroah-Hartman --- drivers/pinctrl/pinctrl-zynq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/pinctrl/pinctrl-zynq.c +++ b/drivers/pinctrl/pinctrl-zynq.c @@ -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 yamada.masahiro@socionext.com 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