| From add219aa23388e66f0bc7f0c76923764165f7877 Mon Sep 17 00:00:00 2001 |
| From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> |
| Date: Fri, 17 Nov 2017 11:41:24 +0100 |
| Subject: [PATCH 0497/1795] pinctrl: sh-pfc: r8a77995: Add CAN FD support |
| |
| This patch adds CAN FD[0-1] pinmux support to the r8a77995 SoC. |
| |
| Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| (cherry picked from commit 527890f72892b127b67567af6bdbdc5288c211c1) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 27 +++++++++++++++++++++++++++ |
| 1 file changed, 27 insertions(+) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77995.c b/drivers/pinctrl/sh-pfc/pfc-r8a77995.c |
| index c4ea718e172e..a4927b78a17b 100644 |
| --- a/drivers/pinctrl/sh-pfc/pfc-r8a77995.c |
| +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77995.c |
| @@ -1098,6 +1098,22 @@ static const unsigned int can_clk_mux[] = { |
| CAN_CLK_MARK, |
| }; |
| |
| +/* - CAN FD ----------------------------------------------------------------- */ |
| +static const unsigned int canfd0_data_pins[] = { |
| + /* TX, RX */ |
| + RCAR_GP_PIN(4, 28), RCAR_GP_PIN(4, 31), |
| +}; |
| +static const unsigned int canfd0_data_mux[] = { |
| + CANFD0_TX_MARK, CANFD0_RX_MARK, |
| +}; |
| +static const unsigned int canfd1_data_pins[] = { |
| + /* TX, RX */ |
| + RCAR_GP_PIN(4, 30), RCAR_GP_PIN(4, 29), |
| +}; |
| +static const unsigned int canfd1_data_mux[] = { |
| + CANFD1_TX_MARK, CANFD1_RX_MARK, |
| +}; |
| + |
| /* - I2C -------------------------------------------------------------------- */ |
| static const unsigned int i2c0_pins[] = { |
| /* SCL, SDA */ |
| @@ -1550,6 +1566,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { |
| SH_PFC_PIN_GROUP(can1_data_a), |
| SH_PFC_PIN_GROUP(can1_data_b), |
| SH_PFC_PIN_GROUP(can_clk), |
| + SH_PFC_PIN_GROUP(canfd0_data), |
| + SH_PFC_PIN_GROUP(canfd1_data), |
| SH_PFC_PIN_GROUP(i2c0), |
| SH_PFC_PIN_GROUP(i2c1), |
| SH_PFC_PIN_GROUP(i2c2_a), |
| @@ -1639,6 +1657,13 @@ static const char * const can_clk_groups[] = { |
| "can_clk", |
| }; |
| |
| +static const char * const canfd0_groups[] = { |
| + "canfd0_data", |
| +}; |
| +static const char * const canfd1_groups[] = { |
| + "canfd1_data", |
| +}; |
| + |
| static const char * const i2c0_groups[] = { |
| "i2c0", |
| }; |
| @@ -1752,6 +1777,8 @@ static const struct sh_pfc_function pinmux_functions[] = { |
| SH_PFC_FUNCTION(can0), |
| SH_PFC_FUNCTION(can1), |
| SH_PFC_FUNCTION(can_clk), |
| + SH_PFC_FUNCTION(canfd0), |
| + SH_PFC_FUNCTION(canfd1), |
| SH_PFC_FUNCTION(i2c0), |
| SH_PFC_FUNCTION(i2c1), |
| SH_PFC_FUNCTION(i2c2), |
| -- |
| 2.19.0 |
| |