| Message ID | 1456418933-3948-3-git-send-email-ramesh.shanmugasundaram@bp.renesas.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Feb 25, 2016 at 5:48 PM, Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> wrote: > This patch adds CANFD[0-1] pinmux support to r8a7795 SoC. > > Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Ramesh, On Thu, Feb 25, 2016 at 5:48 PM, Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> wrote: > This patch adds CANFD[0-1] pinmux support to r8a7795 SoC. > > Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> Sorry, I spoke too soon. While the pin data is correct, I noticed the following while applying: > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c > @@ -2940,6 +2940,36 @@ static const unsigned int can1_data_pins[] = { > static const unsigned int can1_data_mux[] = { > CAN1_TX_MARK, CAN1_RX_MARK, > }; > + > +/* - RCAN FD --------------------------------------------------------------- */ Please use "CAN" instead of "RCAN", and insert in alphabetical order. > +static const unsigned int canfd0_data_a_pins[] = { > @@ -3362,6 +3392,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { > SH_PFC_PIN_GROUP(can0_data_a), > SH_PFC_PIN_GROUP(can0_data_b), > SH_PFC_PIN_GROUP(can1_data), > + SH_PFC_PIN_GROUP(canfd0_data_a), > + SH_PFC_PIN_GROUP(canfd0_data_b), > + SH_PFC_PIN_GROUP(canfd1_data), > SH_PFC_PIN_GROUP(can_clk), Please insert in alphabetical order. > @@ -3686,6 +3719,15 @@ static const char * const can1_groups[] = { > "can1_data", > }; > > +static const char * const canfd0_groups[] = { > + "canfd0_data_a", > + "canfd0_data_b", > +}; > + > +static const char * const canfd1_groups[] = { > + "canfd1_data", > +}; Please insert in alphabetical order. > + > static const char * const can_clk_groups[] = { > "can_clk", > }; > @@ -3721,6 +3763,8 @@ static const struct sh_pfc_function pinmux_functions[] = { > SH_PFC_FUNCTION(ssi), > SH_PFC_FUNCTION(can0), > SH_PFC_FUNCTION(can1), > + SH_PFC_FUNCTION(canfd0), > + SH_PFC_FUNCTION(canfd1), > SH_PFC_FUNCTION(can_clk), Please insert in alphabetical order. 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 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index fbe8e95..0e6fb18 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -2940,6 +2940,36 @@ static const unsigned int can1_data_pins[] = { static const unsigned int can1_data_mux[] = { CAN1_TX_MARK, CAN1_RX_MARK, }; + +/* - RCAN FD --------------------------------------------------------------- */ +static const unsigned int canfd0_data_a_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(1, 23), RCAR_GP_PIN(1, 24), +}; + +static const unsigned int canfd0_data_a_mux[] = { + CANFD0_TX_A_MARK, CANFD0_RX_A_MARK, +}; + +static const unsigned int canfd0_data_b_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(2, 0), RCAR_GP_PIN(2, 1), +}; + +static const unsigned int canfd0_data_b_mux[] = { + CANFD0_TX_B_MARK, CANFD0_RX_B_MARK, +}; + +static const unsigned int canfd1_data_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(1, 22), RCAR_GP_PIN(1, 26), +}; + +static const unsigned int canfd1_data_mux[] = { + CANFD1_TX_MARK, CANFD1_RX_MARK, +}; + + /* - RCAN-CLK --------------------------------------------------------------- */ static const unsigned int can_clk_pins[] = { /* CLK */ @@ -3362,6 +3392,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(can0_data_a), SH_PFC_PIN_GROUP(can0_data_b), SH_PFC_PIN_GROUP(can1_data), + SH_PFC_PIN_GROUP(canfd0_data_a), + SH_PFC_PIN_GROUP(canfd0_data_b), + SH_PFC_PIN_GROUP(canfd1_data), SH_PFC_PIN_GROUP(can_clk), }; @@ -3686,6 +3719,15 @@ static const char * const can1_groups[] = { "can1_data", }; +static const char * const canfd0_groups[] = { + "canfd0_data_a", + "canfd0_data_b", +}; + +static const char * const canfd1_groups[] = { + "canfd1_data", +}; + static const char * const can_clk_groups[] = { "can_clk", }; @@ -3721,6 +3763,8 @@ static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(ssi), SH_PFC_FUNCTION(can0), SH_PFC_FUNCTION(can1), + SH_PFC_FUNCTION(canfd0), + SH_PFC_FUNCTION(canfd1), SH_PFC_FUNCTION(can_clk), };
This patch adds CANFD[0-1] pinmux support to r8a7795 SoC. Signed-off-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> --- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)