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

Commit 17babad6 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Simon Horman
Browse files

pinctrl: sh-pfc: fix r8a7790 Function Select register tables 



Fix several errors in Peripheral Function Select register tables for
r8a7790, which prevent various function pins from being correctly
configured.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent d64d0050

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

+6 −8
Original line number Diff line number Diff line
@@ -3175,7 +3175,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { 
		FN_SIM0_D_B, 0, 0, 0, 0, 0, 0, 0, }

	},

	{ PINMUX_CFG_REG_VAR("IPSR11", 0xE606004C, 32,

			     2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3) {

			     2, 3, 3, 2, 4, 3, 2, 2, 2, 2, 2, 1, 4) {

		/* IP11_31_30 [2] */

		FN_SSI_SCK0129, FN_CAN_CLK_B, FN_MOUT0, 0,

		/* IP11_29_27 [3] */
@@ -3441,12 +3441,10 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { 
		FN_SEL_SOF0_0, FN_SEL_SOF0_1, }

	},

	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xE6060094, 32,

			     2, 1, 1, 1, 1, 2, 1, 2, 1,

			     2, 1, 1, 1, 3, 3, 2, 3, 2, 2) {

		/* RESEVED [2] */

			     3, 1, 1, 1, 2, 1, 2, 1, 2,

			     1, 1, 1, 3, 3, 2, 3, 2, 2) {

		/* RESEVED [3] */

		0, 0, 0, 0, 0, 0, 0, 0,

		/* RESEVED [1] */

		0, 0,

		/* SEL_TMU1 [1] */

		FN_SEL_TMU1_0, FN_SEL_TMU1_1,

		/* SEL_HSCIF1 [1] */
@@ -3462,8 +3460,8 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { 
		/* SEL_CAN1 [1] */

		FN_SEL_CAN1_0, FN_SEL_CAN1_1,

		/* RESEVED [2] */

		0, 0, 0, 0, 0, 0, 0, 0,

		/* RESEVED [1] */

		0, 0, 0, 0,

		/* RESEVED [1] (actually TX2, RX2 vs. TX2_B, RX2_B of SCIF2) */

		0, 0,

		/* SEL_ADI [1] */

		FN_SEL_ADI_0, FN_SEL_ADI_1,