Skip to content

Commit 57eec02

Browse files
Fabrizio Castrogeertu
authored andcommitted
pinctrl: sh-pfc: r8a7791: Add can_clk function
This patch adds can_clk function to r8a7743/r8a7791 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 7c4a390 commit 57eec02

File tree

1 file changed

+21
-1
lines changed

1 file changed

+21
-1
lines changed

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4826,6 +4826,10 @@ static const char * const can0_groups[] = {
48264826
"can0_data_d",
48274827
"can0_data_e",
48284828
"can0_data_f",
4829+
/*
4830+
* Retained for backwards compatibility, use can_clk_groups in new
4831+
* designs.
4832+
*/
48294833
"can_clk",
48304834
"can_clk_b",
48314835
"can_clk_c",
@@ -4837,6 +4841,21 @@ static const char * const can1_groups[] = {
48374841
"can1_data_b",
48384842
"can1_data_c",
48394843
"can1_data_d",
4844+
/*
4845+
* Retained for backwards compatibility, use can_clk_groups in new
4846+
* designs.
4847+
*/
4848+
"can_clk",
4849+
"can_clk_b",
4850+
"can_clk_c",
4851+
"can_clk_d",
4852+
};
4853+
4854+
/*
4855+
* can_clk_groups allows for independent configuration, use can_clk function
4856+
* in new designs.
4857+
*/
4858+
static const char * const can_clk_groups[] = {
48404859
"can_clk",
48414860
"can_clk_b",
48424861
"can_clk_c",
@@ -5308,14 +5327,15 @@ static const char * const vin2_groups[] = {
53085327
};
53095328

53105329
static const struct {
5311-
struct sh_pfc_function common[56];
5330+
struct sh_pfc_function common[57];
53125331
struct sh_pfc_function r8a779x[2];
53135332
} pinmux_functions = {
53145333
.common = {
53155334
SH_PFC_FUNCTION(audio_clk),
53165335
SH_PFC_FUNCTION(avb),
53175336
SH_PFC_FUNCTION(can0),
53185337
SH_PFC_FUNCTION(can1),
5338+
SH_PFC_FUNCTION(can_clk),
53195339
SH_PFC_FUNCTION(du),
53205340
SH_PFC_FUNCTION(du0),
53215341
SH_PFC_FUNCTION(du1),

0 commit comments

Comments
 (0)