AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-18 05:27:17 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

pinctrl: sh-pfc: r8a77990: Move CANFD pin groups and functions

Browse Source 
CANFD is found also on the R8A774C0, therefore move CANFD pin
groups and functions to "common".

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Chris Paterson <chris.paterson2@renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
This commit is contained in:
Fabrizio Castro 2019-02-20 16:10:18 +00:00 committed by Geert Uytterhoeven
parent dcd24e098d
commit 2cee6cb290
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pinctrl/sh-pfc/pfc-r8a77990.c
View File

@ -3766,8 +3766,8 @@ static const unsigned int vin5_clk_b_mux[] = {
}; };
static const struct { static const struct {
struct sh_pfc_pin_group common[245]; struct sh_pfc_pin_group common[247];
struct sh_pfc_pin_group automotive[23]; struct sh_pfc_pin_group automotive[21];
} pinmux_groups = { } pinmux_groups = {
.common = { .common = {
SH_PFC_PIN_GROUP(audio_clk_a), SH_PFC_PIN_GROUP(audio_clk_a),
@ -3798,6 +3798,8 @@ static const struct {
SH_PFC_PIN_GROUP(can0_data), SH_PFC_PIN_GROUP(can0_data),
SH_PFC_PIN_GROUP(can1_data), SH_PFC_PIN_GROUP(can1_data),
SH_PFC_PIN_GROUP(can_clk), SH_PFC_PIN_GROUP(can_clk),
SH_PFC_PIN_GROUP(canfd0_data),
SH_PFC_PIN_GROUP(canfd1_data),
SH_PFC_PIN_GROUP(du_rgb666), SH_PFC_PIN_GROUP(du_rgb666),
SH_PFC_PIN_GROUP(du_rgb888), SH_PFC_PIN_GROUP(du_rgb888),
SH_PFC_PIN_GROUP(du_clk_in_0), SH_PFC_PIN_GROUP(du_clk_in_0),
@ -4017,8 +4019,6 @@ static const struct {
SH_PFC_PIN_GROUP(vin5_clk_b), SH_PFC_PIN_GROUP(vin5_clk_b),
}, },
.automotive = { .automotive = {
SH_PFC_PIN_GROUP(canfd0_data),
SH_PFC_PIN_GROUP(canfd1_data),
SH_PFC_PIN_GROUP(drif0_ctrl_a), SH_PFC_PIN_GROUP(drif0_ctrl_a),
SH_PFC_PIN_GROUP(drif0_data0_a), SH_PFC_PIN_GROUP(drif0_data0_a),
SH_PFC_PIN_GROUP(drif0_data1_a), SH_PFC_PIN_GROUP(drif0_data1_a),
@ -4465,8 +4465,8 @@ static const char * const vin5_groups[] = {
}; };
static const struct { static const struct {
struct sh_pfc_function common[45]; struct sh_pfc_function common[47];
struct sh_pfc_function automotive[6]; struct sh_pfc_function automotive[4];
} pinmux_functions = { } pinmux_functions = {
.common = { .common = {
SH_PFC_FUNCTION(audio_clk), SH_PFC_FUNCTION(audio_clk),
@ -4474,6 +4474,8 @@ static const struct {
SH_PFC_FUNCTION(can0), SH_PFC_FUNCTION(can0),
SH_PFC_FUNCTION(can1), SH_PFC_FUNCTION(can1),
SH_PFC_FUNCTION(can_clk), SH_PFC_FUNCTION(can_clk),
SH_PFC_FUNCTION(canfd0),
SH_PFC_FUNCTION(canfd1),
SH_PFC_FUNCTION(du), SH_PFC_FUNCTION(du),
SH_PFC_FUNCTION(hscif0), SH_PFC_FUNCTION(hscif0),
SH_PFC_FUNCTION(hscif1), SH_PFC_FUNCTION(hscif1),
@ -4516,8 +4518,6 @@ static const struct {
SH_PFC_FUNCTION(vin5), SH_PFC_FUNCTION(vin5),
}, },
.automotive = { .automotive = {
SH_PFC_FUNCTION(canfd0),
SH_PFC_FUNCTION(canfd1),
SH_PFC_FUNCTION(drif0), SH_PFC_FUNCTION(drif0),
SH_PFC_FUNCTION(drif1), SH_PFC_FUNCTION(drif1),
SH_PFC_FUNCTION(drif2), SH_PFC_FUNCTION(drif2),