Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91d627a7 authored by Biju Das's avatar Biju Das Committed by Geert Uytterhoeven
Browse files

pinctrl: sh-pfc: r8a7796: Add R8A774A1 PFC support 



Renesas RZ/G2M (r8a774a1) is pin compatible with R-Car M3-W (r8a7796),
however it doesn't have several automotive specific peripherals. Add
an r8a7796 specific pin groups/functions along with common pin
groups/functions for supporting both r8a7796 and r8a774a1 SoCs.

Signed-off-by: default avatarBiju Das <biju.das@bp.renesas.com>
Reviewed-by: default avatarFabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 8f9a1acd

drivers/pinctrl/sh-pfc/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ config PINCTRL_PFC_R8A77470 
        depends on ARCH_R8A77470

        select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A774A1

        def_bool y

        depends on ARCH_R8A774A1

        select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A7778

	def_bool y

	depends on ARCH_R8A7778

drivers/pinctrl/sh-pfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7740) += pfc-r8a7740.o 
obj-$(CONFIG_PINCTRL_PFC_R8A7743)	+= pfc-r8a7791.o

obj-$(CONFIG_PINCTRL_PFC_R8A7745)	+= pfc-r8a7794.o

obj-$(CONFIG_PINCTRL_PFC_R8A77470)	+= pfc-r8a77470.o

obj-$(CONFIG_PINCTRL_PFC_R8A774A1)	+= pfc-r8a7796.o

obj-$(CONFIG_PINCTRL_PFC_R8A7778)	+= pfc-r8a7778.o

obj-$(CONFIG_PINCTRL_PFC_R8A7779)	+= pfc-r8a7779.o

obj-$(CONFIG_PINCTRL_PFC_R8A7790)	+= pfc-r8a7790.o

drivers/pinctrl/sh-pfc/core.c

+6 −0
Original line number Diff line number Diff line
@@ -509,6 +509,12 @@ static const struct of_device_id sh_pfc_of_table[] = { 
		.data = &r8a77470_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A774A1

	{

		.compatible = "renesas,pfc-r8a774a1",

		.data = &r8a774a1_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A7778

	{

		.compatible = "renesas,pfc-r8a7778",

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

+440 −397
Original line number Diff line number Diff line
@@ -4126,7 +4126,11 @@ static const unsigned int vin5_clk_mux[] = { 
	VI5_CLK_MARK,

};



static const struct sh_pfc_pin_group pinmux_groups[] = {

static const struct {

	struct sh_pfc_pin_group common[307];

	struct sh_pfc_pin_group r8a779x[33];

} pinmux_groups = {

	.common = {

		SH_PFC_PIN_GROUP(audio_clk_a_a),

		SH_PFC_PIN_GROUP(audio_clk_a_b),

		SH_PFC_PIN_GROUP(audio_clk_a_c),
@@ -4159,39 +4163,6 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
		SH_PFC_PIN_GROUP(can0_data_b),

		SH_PFC_PIN_GROUP(can1_data),

		SH_PFC_PIN_GROUP(can_clk),

	SH_PFC_PIN_GROUP(canfd0_data_a),

	SH_PFC_PIN_GROUP(canfd0_data_b),

	SH_PFC_PIN_GROUP(canfd1_data),

	SH_PFC_PIN_GROUP(drif0_ctrl_a),

	SH_PFC_PIN_GROUP(drif0_data0_a),

	SH_PFC_PIN_GROUP(drif0_data1_a),

	SH_PFC_PIN_GROUP(drif0_ctrl_b),

	SH_PFC_PIN_GROUP(drif0_data0_b),

	SH_PFC_PIN_GROUP(drif0_data1_b),

	SH_PFC_PIN_GROUP(drif0_ctrl_c),

	SH_PFC_PIN_GROUP(drif0_data0_c),

	SH_PFC_PIN_GROUP(drif0_data1_c),

	SH_PFC_PIN_GROUP(drif1_ctrl_a),

	SH_PFC_PIN_GROUP(drif1_data0_a),

	SH_PFC_PIN_GROUP(drif1_data1_a),

	SH_PFC_PIN_GROUP(drif1_ctrl_b),

	SH_PFC_PIN_GROUP(drif1_data0_b),

	SH_PFC_PIN_GROUP(drif1_data1_b),

	SH_PFC_PIN_GROUP(drif1_ctrl_c),

	SH_PFC_PIN_GROUP(drif1_data0_c),

	SH_PFC_PIN_GROUP(drif1_data1_c),

	SH_PFC_PIN_GROUP(drif2_ctrl_a),

	SH_PFC_PIN_GROUP(drif2_data0_a),

	SH_PFC_PIN_GROUP(drif2_data1_a),

	SH_PFC_PIN_GROUP(drif2_ctrl_b),

	SH_PFC_PIN_GROUP(drif2_data0_b),

	SH_PFC_PIN_GROUP(drif2_data1_b),

	SH_PFC_PIN_GROUP(drif3_ctrl_a),

	SH_PFC_PIN_GROUP(drif3_data0_a),

	SH_PFC_PIN_GROUP(drif3_data1_a),

	SH_PFC_PIN_GROUP(drif3_ctrl_b),

	SH_PFC_PIN_GROUP(drif3_data0_b),

	SH_PFC_PIN_GROUP(drif3_data1_b),

		SH_PFC_PIN_GROUP(du_rgb666),

		SH_PFC_PIN_GROUP(du_rgb888),

		SH_PFC_PIN_GROUP(du_clk_out_0),
@@ -4467,6 +4438,42 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
		SH_PFC_PIN_GROUP(vin5_field),

		SH_PFC_PIN_GROUP(vin5_clkenb),

		SH_PFC_PIN_GROUP(vin5_clk),

	},

	.r8a779x = {

		SH_PFC_PIN_GROUP(canfd0_data_a),

		SH_PFC_PIN_GROUP(canfd0_data_b),

		SH_PFC_PIN_GROUP(canfd1_data),

		SH_PFC_PIN_GROUP(drif0_ctrl_a),

		SH_PFC_PIN_GROUP(drif0_data0_a),

		SH_PFC_PIN_GROUP(drif0_data1_a),

		SH_PFC_PIN_GROUP(drif0_ctrl_b),

		SH_PFC_PIN_GROUP(drif0_data0_b),

		SH_PFC_PIN_GROUP(drif0_data1_b),

		SH_PFC_PIN_GROUP(drif0_ctrl_c),

		SH_PFC_PIN_GROUP(drif0_data0_c),

		SH_PFC_PIN_GROUP(drif0_data1_c),

		SH_PFC_PIN_GROUP(drif1_ctrl_a),

		SH_PFC_PIN_GROUP(drif1_data0_a),

		SH_PFC_PIN_GROUP(drif1_data1_a),

		SH_PFC_PIN_GROUP(drif1_ctrl_b),

		SH_PFC_PIN_GROUP(drif1_data0_b),

		SH_PFC_PIN_GROUP(drif1_data1_b),

		SH_PFC_PIN_GROUP(drif1_ctrl_c),

		SH_PFC_PIN_GROUP(drif1_data0_c),

		SH_PFC_PIN_GROUP(drif1_data1_c),

		SH_PFC_PIN_GROUP(drif2_ctrl_a),

		SH_PFC_PIN_GROUP(drif2_data0_a),

		SH_PFC_PIN_GROUP(drif2_data1_a),

		SH_PFC_PIN_GROUP(drif2_ctrl_b),

		SH_PFC_PIN_GROUP(drif2_data0_b),

		SH_PFC_PIN_GROUP(drif2_data1_b),

		SH_PFC_PIN_GROUP(drif3_ctrl_a),

		SH_PFC_PIN_GROUP(drif3_data0_a),

		SH_PFC_PIN_GROUP(drif3_data1_a),

		SH_PFC_PIN_GROUP(drif3_ctrl_b),

		SH_PFC_PIN_GROUP(drif3_data0_b),

		SH_PFC_PIN_GROUP(drif3_data1_b),

	}

};



static const char * const audio_clk_groups[] = {
@@ -4962,18 +4969,16 @@ static const char * const vin5_groups[] = { 
	"vin5_clk",

};



static const struct sh_pfc_function pinmux_functions[] = {

static const struct {

	struct sh_pfc_function common[45];

	struct sh_pfc_function r8a779x[6];

} pinmux_functions = {

	.common = {

		SH_PFC_FUNCTION(audio_clk),

		SH_PFC_FUNCTION(avb),

		SH_PFC_FUNCTION(can0),

		SH_PFC_FUNCTION(can1),

		SH_PFC_FUNCTION(can_clk),

	SH_PFC_FUNCTION(canfd0),

	SH_PFC_FUNCTION(canfd1),

	SH_PFC_FUNCTION(drif0),

	SH_PFC_FUNCTION(drif1),

	SH_PFC_FUNCTION(drif2),

	SH_PFC_FUNCTION(drif3),

		SH_PFC_FUNCTION(du),

		SH_PFC_FUNCTION(hdmi0),

		SH_PFC_FUNCTION(hscif0),
@@ -5014,6 +5019,15 @@ static const struct sh_pfc_function pinmux_functions[] = { 
		SH_PFC_FUNCTION(usb30),

		SH_PFC_FUNCTION(vin4),

		SH_PFC_FUNCTION(vin5),

	},

	.r8a779x = {

		SH_PFC_FUNCTION(canfd0),

		SH_PFC_FUNCTION(canfd1),

		SH_PFC_FUNCTION(drif0),

		SH_PFC_FUNCTION(drif1),

		SH_PFC_FUNCTION(drif2),

		SH_PFC_FUNCTION(drif3),

	}

};



static const struct pinmux_cfg_reg pinmux_config_regs[] = {
@@ -6137,6 +6151,32 @@ static const struct sh_pfc_soc_operations r8a7796_pinmux_ops = { 
	.set_bias = r8a7796_pinmux_set_bias,

};



#ifdef CONFIG_PINCTRL_PFC_R8A774A1

const struct sh_pfc_soc_info r8a774a1_pinmux_info = {

	.name = "r8a774a1_pfc",

	.ops = &r8a7796_pinmux_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },



	.pins = pinmux_pins,

	.nr_pins = ARRAY_SIZE(pinmux_pins),

	.groups = pinmux_groups.common,

	.nr_groups = ARRAY_SIZE(pinmux_groups.common),

	.functions = pinmux_functions.common,

	.nr_functions = ARRAY_SIZE(pinmux_functions.common),



	.cfg_regs = pinmux_config_regs,

	.drive_regs = pinmux_drive_regs,

	.bias_regs = pinmux_bias_regs,

	.ioctrl_regs = pinmux_ioctrl_regs,



	.pinmux_data = pinmux_data,

	.pinmux_data_size = ARRAY_SIZE(pinmux_data),

};

#endif



#ifdef CONFIG_PINCTRL_PFC_R8A7796

const struct sh_pfc_soc_info r8a7796_pinmux_info = {

	.name = "r8a77960_pfc",

	.ops = &r8a7796_pinmux_ops,
@@ -6146,10 +6186,12 @@ const struct sh_pfc_soc_info r8a7796_pinmux_info = { 


	.pins = pinmux_pins,

	.nr_pins = ARRAY_SIZE(pinmux_pins),

	.groups = pinmux_groups,

	.nr_groups = ARRAY_SIZE(pinmux_groups),

	.functions = pinmux_functions,

	.nr_functions = ARRAY_SIZE(pinmux_functions),

	.groups = pinmux_groups.common,

	.nr_groups = ARRAY_SIZE(pinmux_groups.common) +

		ARRAY_SIZE(pinmux_groups.r8a779x),

	.functions = pinmux_functions.common,

	.nr_functions = ARRAY_SIZE(pinmux_functions.common) +

		ARRAY_SIZE(pinmux_functions.r8a779x),



	.cfg_regs = pinmux_config_regs,

	.drive_regs = pinmux_drive_regs,
@@ -6159,3 +6201,4 @@ const struct sh_pfc_soc_info r8a7796_pinmux_info = { 
	.pinmux_data = pinmux_data,

	.pinmux_data_size = ARRAY_SIZE(pinmux_data),

};

#endif

drivers/pinctrl/sh-pfc/sh_pfc.h

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ extern const struct sh_pfc_soc_info r8a7740_pinmux_info; 
extern const struct sh_pfc_soc_info r8a7743_pinmux_info;

extern const struct sh_pfc_soc_info r8a7745_pinmux_info;

extern const struct sh_pfc_soc_info r8a77470_pinmux_info;

extern const struct sh_pfc_soc_info r8a774a1_pinmux_info;

extern const struct sh_pfc_soc_info r8a7778_pinmux_info;

extern const struct sh_pfc_soc_info r8a7779_pinmux_info;

extern const struct sh_pfc_soc_info r8a7790_pinmux_info;