Skip to content

Commit 7c4a390

Browse files
Fabrizio Castrogeertu
authored andcommitted
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 <[email protected]> Reviewed-by: Ramesh Shanmugasundaram <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent b92ac66 commit 7c4a390

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

drivers/pinctrl/sh-pfc/pfc-r8a7794.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3858,6 +3858,10 @@ static const char * const can0_groups[] = {
38583858
"can0_data_b",
38593859
"can0_data_c",
38603860
"can0_data_d",
3861+
/*
3862+
* Retained for backwards compatibility, use can_clk_groups in new
3863+
* designs.
3864+
*/
38613865
"can_clk",
38623866
"can_clk_b",
38633867
"can_clk_c",
@@ -3869,6 +3873,21 @@ static const char * const can1_groups[] = {
38693873
"can1_data_b",
38703874
"can1_data_c",
38713875
"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+
*/
3890+
static const char * const can_clk_groups[] = {
38723891
"can_clk",
38733892
"can_clk_b",
38743893
"can_clk_c",
@@ -4248,6 +4267,7 @@ static const struct sh_pfc_function pinmux_functions[] = {
42484267
SH_PFC_FUNCTION(avb),
42494268
SH_PFC_FUNCTION(can0),
42504269
SH_PFC_FUNCTION(can1),
4270+
SH_PFC_FUNCTION(can_clk),
42514271
SH_PFC_FUNCTION(du0),
42524272
SH_PFC_FUNCTION(du1),
42534273
SH_PFC_FUNCTION(eth),

0 commit comments

Comments
 (0)