From: Sergei Shtylyov Date: Mon, 28 Jul 2014 22:12:55 +0000 (+0400) Subject: sh-pfc: r8a7791: fix CAN pin groups X-Git-Tag: v3.14.28+ltsi~259 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1440345e713795215d1ca524949565354b39d55c;p=platform%2Fkernel%2Flinux-stable.git sh-pfc: r8a7791: fix CAN pin groups I had made last-minute changes before submitting the patch "sh-pfc: r8a7791: add CAN pin groups"; now I'm seeing that they weren't complete: I had missed update to the pin group names in pin[01]_groups[]. Drop the "_a" suffixes there. Signed-off-by: Sergei Shtylyov Acked-by: Laurent Pinchart Signed-off-by: Linus Walleij (cherry picked from commit 302fb1781783ded370f515e8e649b8285ee29cdc) Signed-off-by: Simon Horman --- diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c index 576d41b459e9..c6e5deba238e 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c @@ -4509,24 +4509,24 @@ static const char * const audio_clk_groups[] = { }; static const char * const can0_groups[] = { - "can0_data_a", + "can0_data", "can0_data_b", "can0_data_c", "can0_data_d", "can0_data_e", "can0_data_f", - "can_clk_a", + "can_clk", "can_clk_b", "can_clk_c", "can_clk_d", }; static const char * const can1_groups[] = { - "can1_data_a", + "can1_data", "can1_data_b", "can1_data_c", "can1_data_d", - "can_clk_a", + "can_clk", "can_clk_b", "can_clk_c", "can_clk_d",