| Message ID | 1479822543-4804-2-git-send-email-chris.paterson2@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Chris, On Tue, Nov 22, 2016 at 2:49 PM, Chris Paterson <chris.paterson2@renesas.com> wrote: > Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> > Signed-off-by: Chris Paterson <chris.paterson2@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> BTW, as all patches in this series were Signed-off-by Ramesh first, does that mean he's the author, and you should have added his From: line, too? Thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hello Geert, Thank you for the review. > -----Original Message----- > From: geert.uytterhoeven@gmail.com > [mailto:geert.uytterhoeven@gmail.com] On Behalf Of Geert Uytterhoeven > Sent: 23 November 2016 08:14 > To: Chris Paterson <Chris.Paterson2@renesas.com> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>; Geert > Uytterhoeven <geert+renesas@glider.be>; Linus Walleij > <linus.walleij@linaro.org>; Linux-Renesas <linux-renesas- > soc@vger.kernel.org>; linux-gpio@vger.kernel.org; Ramesh > Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> > Subject: Re: [PATCH 1/2] pinctrl: sh-pfc: r8a7796: Add CAN support > > Hi Chris, > > On Tue, Nov 22, 2016 at 2:49 PM, Chris Paterson > <chris.paterson2@renesas.com> wrote: > > Signed-off-by: Ramesh Shanmugasundaram > > <ramesh.shanmugasundaram@bp.renesas.com> > > Signed-off-by: Chris Paterson <chris.paterson2@renesas.com> > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > > BTW, as all patches in this series were Signed-off-by Ramesh first, does that > mean he's the author, and you should have added his From: line, too? Technically I authored these patches, but they are direct ports from Ramesh's r8a7795 patches [1][2]. [1] a4d9791 pinctrl: sh-pfc: r8a7795: Add CAN support [2] 4412bb5 pinctrl: sh-pfc: r8a7795: Add CAN FD support Apologies for not making this clear in the cover letter. Kind regards, Chris > > Thanks! > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux- > m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
Hi Chris, On Wed, Nov 23, 2016 at 9:39 AM, Chris Paterson <Chris.Paterson2@renesas.com> wrote: >> From: geert.uytterhoeven@gmail.com >> On Tue, Nov 22, 2016 at 2:49 PM, Chris Paterson >> <chris.paterson2@renesas.com> wrote: >> > Signed-off-by: Ramesh Shanmugasundaram >> > <ramesh.shanmugasundaram@bp.renesas.com> >> > Signed-off-by: Chris Paterson <chris.paterson2@renesas.com> >> >> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> >> >> BTW, as all patches in this series were Signed-off-by Ramesh first, does that >> mean he's the author, and you should have added his From: line, too? > > Technically I authored these patches, but they are direct ports from Ramesh's r8a7795 patches [1][2]. OK, I'll replace his SoB by "based on patches for r8a7795 by Ramesh...". Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c index 14b3512..f1f0026 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c @@ -1649,6 +1649,38 @@ enum { AVB_AVTP_CAPTURE_B_MARK, }; +/* - CAN ------------------------------------------------------------------ */ +static const unsigned int can0_data_a_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(1, 23), RCAR_GP_PIN(1, 24), +}; +static const unsigned int can0_data_a_mux[] = { + CAN0_TX_A_MARK, CAN0_RX_A_MARK, +}; +static const unsigned int can0_data_b_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(2, 0), RCAR_GP_PIN(2, 1), +}; +static const unsigned int can0_data_b_mux[] = { + CAN0_TX_B_MARK, CAN0_RX_B_MARK, +}; +static const unsigned int can1_data_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(1, 22), RCAR_GP_PIN(1, 26), +}; +static const unsigned int can1_data_mux[] = { + CAN1_TX_MARK, CAN1_RX_MARK, +}; + +/* - CAN Clock -------------------------------------------------------------- */ +static const unsigned int can_clk_pins[] = { + /* CLK */ + RCAR_GP_PIN(1, 25), +}; +static const unsigned int can_clk_mux[] = { + CAN_CLK_MARK, +}; + /* - DRIF0 --------------------------------------------------------------- */ static const unsigned int drif0_ctrl_a_pins[] = { /* CLK, SYNC */ @@ -2612,6 +2644,10 @@ enum { SH_PFC_PIN_GROUP(avb_avtp_capture_a), SH_PFC_PIN_GROUP(avb_avtp_match_b), SH_PFC_PIN_GROUP(avb_avtp_capture_b), + SH_PFC_PIN_GROUP(can0_data_a), + SH_PFC_PIN_GROUP(can0_data_b), + SH_PFC_PIN_GROUP(can1_data), + SH_PFC_PIN_GROUP(can_clk), SH_PFC_PIN_GROUP(drif0_ctrl_a), SH_PFC_PIN_GROUP(drif0_data0_a), SH_PFC_PIN_GROUP(drif0_data1_a), @@ -2751,6 +2787,19 @@ enum { "avb_avtp_capture_b", }; +static const char * const can0_groups[] = { + "can0_data_a", + "can0_data_b", +}; + +static const char * const can1_groups[] = { + "can1_data", +}; + +static const char * const can_clk_groups[] = { + "can_clk", +}; + static const char * const drif0_groups[] = { "drif0_ctrl_a", "drif0_data0_a", @@ -2950,6 +2999,9 @@ enum { static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(avb), + SH_PFC_FUNCTION(can0), + SH_PFC_FUNCTION(can1), + SH_PFC_FUNCTION(can_clk), SH_PFC_FUNCTION(drif0), SH_PFC_FUNCTION(drif1), SH_PFC_FUNCTION(drif2),