| From 8a9a7859a706953e9d67f621111298f391e1bbf3 Mon Sep 17 00:00:00 2001 |
| From: Fabrizio Castro <fabrizio.castro@bp.renesas.com> |
| Date: Tue, 14 Nov 2017 15:41:16 +0000 |
| Subject: [PATCH 0489/1795] pinctrl: sh-pfc: r8a7794: Add can_clk function |
| |
| This patch adds can_clk function to r8a7745/r8a7794 which is cleaner, |
| and allows for independent configuration. |
| We keep the can_clk* pins definitions from within can0_groups and |
| can1_groups for uniformity and backwards compatibility. |
| |
| Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com> |
| Reviewed-by: Ramesh Shanmugasundaram <ramesh.shanmugasundaram@bp.renesas.com> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| (cherry picked from commit 7c4a3906475cba91c51e10a79e681b4f9ec6ec14) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 20 ++++++++++++++++++++ |
| 1 file changed, 20 insertions(+) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c |
| index e5b3d5fa4aa0..c557bc8da10d 100644 |
| --- a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c |
| +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c |
| @@ -3858,6 +3858,10 @@ static const char * const can0_groups[] = { |
| "can0_data_b", |
| "can0_data_c", |
| "can0_data_d", |
| + /* |
| + * Retained for backwards compatibility, use can_clk_groups in new |
| + * designs. |
| + */ |
| "can_clk", |
| "can_clk_b", |
| "can_clk_c", |
| @@ -3869,6 +3873,21 @@ static const char * const can1_groups[] = { |
| "can1_data_b", |
| "can1_data_c", |
| "can1_data_d", |
| + /* |
| + * Retained for backwards compatibility, use can_clk_groups in new |
| + * designs. |
| + */ |
| + "can_clk", |
| + "can_clk_b", |
| + "can_clk_c", |
| + "can_clk_d", |
| +}; |
| + |
| +/* |
| + * can_clk_groups allows for independent configuration, use can_clk function |
| + * in new designs. |
| + */ |
| +static const char * const can_clk_groups[] = { |
| "can_clk", |
| "can_clk_b", |
| "can_clk_c", |
| @@ -4248,6 +4267,7 @@ 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(du0), |
| SH_PFC_FUNCTION(du1), |
| SH_PFC_FUNCTION(eth), |
| -- |
| 2.19.0 |
| |