aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrizio Castro <fabrizio.castro@bp.renesas.com>2017-11-14 10:41:16 -0500
committerGeert Uytterhoeven <geert+renesas@glider.be>2017-12-05 08:14:49 -0500
commit7c4a3906475cba91c51e10a79e681b4f9ec6ec14 (patch)
tree2e5ddfadcd840222f62cb40494bd4cf071659cfb
parentb92ac66a1819602b1427ac72d4a70c10ba7640ad (diff)
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>
-rw-r--r--drivers/pinctrl/sh-pfc/pfc-r8a7794.c20
1 files changed, 20 insertions, 0 deletions
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[] = {
3858 "can0_data_b", 3858 "can0_data_b",
3859 "can0_data_c", 3859 "can0_data_c",
3860 "can0_data_d", 3860 "can0_data_d",
3861 /*
3862 * Retained for backwards compatibility, use can_clk_groups in new
3863 * designs.
3864 */
3861 "can_clk", 3865 "can_clk",
3862 "can_clk_b", 3866 "can_clk_b",
3863 "can_clk_c", 3867 "can_clk_c",
@@ -3869,6 +3873,21 @@ static const char * const can1_groups[] = {
3869 "can1_data_b", 3873 "can1_data_b",
3870 "can1_data_c", 3874 "can1_data_c",
3871 "can1_data_d", 3875 "can1_data_d",
3876 /*
3877 * Retained for backwards compatibility, use can_clk_groups in new
3878 * designs.
3879 */
3880 "can_clk",
3881 "can_clk_b",
3882 "can_clk_c",
3883 "can_clk_d",
3884};
3885
3886/*
3887 * can_clk_groups allows for independent configuration, use can_clk function
3888 * in new designs.
3889 */
3890static const char * const can_clk_groups[] = {
3872 "can_clk", 3891 "can_clk",
3873 "can_clk_b", 3892 "can_clk_b",
3874 "can_clk_c", 3893 "can_clk_c",
@@ -4248,6 +4267,7 @@ static const struct sh_pfc_function pinmux_functions[] = {
4248 SH_PFC_FUNCTION(avb), 4267 SH_PFC_FUNCTION(avb),
4249 SH_PFC_FUNCTION(can0), 4268 SH_PFC_FUNCTION(can0),
4250 SH_PFC_FUNCTION(can1), 4269 SH_PFC_FUNCTION(can1),
4270 SH_PFC_FUNCTION(can_clk),
4251 SH_PFC_FUNCTION(du0), 4271 SH_PFC_FUNCTION(du0),
4252 SH_PFC_FUNCTION(du1), 4272 SH_PFC_FUNCTION(du1),
4253 SH_PFC_FUNCTION(eth), 4273 SH_PFC_FUNCTION(eth),