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

Commit a498e02d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B 



[ Upstream commit 884caadad128efad8e00c1cdc3177bc8912ee8ec ]

The definitions for bit field [19:18] of the Peripheral Function Select
Register 3 were accidentally copied from bit field [20], leading to
duplicates for the TCLK1_B function, and missing TCLK0, CAN_CLK_B, and
ET0_ETXD4 functions.

Fix this by adding the missing GPIO_FN_CAN_CLK_B and GPIO_FN_ET0_ETXD4
enum values, and correcting the functions.

Reported-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191024131308.16659-1-geert+renesas@glider.be


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4e004c31

arch/sh/include/cpu-sh4/cpu/sh7734.h

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ enum { 
	GPIO_FN_EX_WAIT1, GPIO_FN_SD1_DAT0_A, GPIO_FN_DREQ2, GPIO_FN_CAN1_TX_C,

		GPIO_FN_ET0_LINK_C, GPIO_FN_ET0_ETXD5_A,

	GPIO_FN_EX_WAIT0, GPIO_FN_TCLK1_B,

	GPIO_FN_RD_WR, GPIO_FN_TCLK0,

	GPIO_FN_RD_WR, GPIO_FN_TCLK0, GPIO_FN_CAN_CLK_B, GPIO_FN_ET0_ETXD4,

	GPIO_FN_EX_CS5, GPIO_FN_SD1_CMD_A, GPIO_FN_ATADIR, GPIO_FN_QSSL_B,

		GPIO_FN_ET0_ETXD3_A,

	GPIO_FN_EX_CS4, GPIO_FN_SD1_WP_A, GPIO_FN_ATAWR, GPIO_FN_QMI_QIO1_B,

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

+2 −2
Original line number Diff line number Diff line
@@ -1453,7 +1453,7 @@ static const struct pinmux_func pinmux_func_gpios[] = { 
	GPIO_FN(ET0_ETXD2_A),

	GPIO_FN(EX_CS5), GPIO_FN(SD1_CMD_A), GPIO_FN(ATADIR), GPIO_FN(QSSL_B),

	GPIO_FN(ET0_ETXD3_A),

	GPIO_FN(RD_WR), GPIO_FN(TCLK1_B),

	GPIO_FN(RD_WR), GPIO_FN(TCLK0), GPIO_FN(CAN_CLK_B), GPIO_FN(ET0_ETXD4),

	GPIO_FN(EX_WAIT0), GPIO_FN(TCLK1_B),

	GPIO_FN(EX_WAIT1), GPIO_FN(SD1_DAT0_A), GPIO_FN(DREQ2),

		GPIO_FN(CAN1_TX_C), GPIO_FN(ET0_LINK_C), GPIO_FN(ET0_ETXD5_A),
@@ -1949,7 +1949,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { 
	    /* IP3_20 [1] */

		FN_EX_WAIT0, FN_TCLK1_B,

	    /* IP3_19_18 [2] */

		FN_RD_WR, FN_TCLK1_B, 0, 0,

		FN_RD_WR, FN_TCLK0, FN_CAN_CLK_B, FN_ET0_ETXD4,

	    /* IP3_17_15 [3] */

		FN_EX_CS5, FN_SD1_CMD_A, FN_ATADIR, FN_QSSL_B,

		FN_ET0_ETXD3_A, 0, 0, 0,