Message ID | 1385921962-19843-1-git-send-email-takasi-y@ops.dti.ne.jp (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Sun, Dec 1, 2013 at 7:19 PM, <takasi-y@ops.dti.ne.jp> wrote: > From: Takashi Yoshii <takasi-y@ops.dti.ne.jp> > > SH_PFC_PIN_GROUP(), pins[], mux[], defines > clk, sync, ss1, ss2, rx, tx > But, msiof?_groups[] defines > clk, ctrl, data > > Fix msiof[012]_groups members to be consistent to PIN_GROUP. > > Signed-off-by: Takashi Yoshii <takasi-y@ops.dti.ne.jp> This looks all right to me. Laurent is merging PFC patches for this kernel cycle, please make sure you include him on subsequent postings. Once Laurent has a finished series I'll pull it into the pinctrl tree. I think the device tree changes part of this series can go directly to Simon though? Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Linus, On Tuesday 03 December 2013 11:08:14 Linus Walleij wrote: > On Sun, Dec 1, 2013 at 7:19 PM, <takasi-y@ops.dti.ne.jp> wrote: > > From: Takashi Yoshii <takasi-y@ops.dti.ne.jp> > > > > SH_PFC_PIN_GROUP(), pins[], mux[], defines > > > > clk, sync, ss1, ss2, rx, tx > > > > But, msiof?_groups[] defines > > > > clk, ctrl, data > > > > Fix msiof[012]_groups members to be consistent to PIN_GROUP. > > > > Signed-off-by: Takashi Yoshii <takasi-y@ops.dti.ne.jp> > > This looks all right to me. Laurent is merging PFC patches for this > kernel cycle, please make sure you include him on subsequent > postings. Once Laurent has a finished series I'll pull it into > the pinctrl tree. I've applied this patch to my tree. > I think the device tree changes part of this series can go directly > to Simon though?
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c index bf76a65..e0be506 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c @@ -2840,20 +2840,29 @@ static const char * const mmc_groups[] = { static const char * const msiof0_groups[] = { "msiof0_clk", - "msiof0_ctrl", - "msiof0_data", + "msiof0_sync", + "msiof0_ss1", + "msiof0_ss2", + "msiof0_rx", + "msiof0_tx", }; static const char * const msiof1_groups[] = { "msiof1_clk", - "msiof1_ctrl", - "msiof1_data", + "msiof1_sync", + "msiof1_ss1", + "msiof1_ss2", + "msiof1_rx", + "msiof1_tx", }; static const char * const msiof2_groups[] = { "msiof2_clk", - "msiof2_ctrl", - "msiof2_data", + "msiof2_sync", + "msiof2_ss1", + "msiof2_ss2", + "msiof2_rx", + "msiof2_tx", }; static const char * const scif0_groups[] = {