tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B

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: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191024131308.16659-1-geert+renesas@glider.be

Geert Uytterhoeven 884caada 708c69e9

+3 -3
+1 -1
arch/sh/include/cpu-sh4/cpu/sh7734.h
··· 134 134 GPIO_FN_EX_WAIT1, GPIO_FN_SD1_DAT0_A, GPIO_FN_DREQ2, GPIO_FN_CAN1_TX_C, 135 135 GPIO_FN_ET0_LINK_C, GPIO_FN_ET0_ETXD5_A, 136 136 GPIO_FN_EX_WAIT0, GPIO_FN_TCLK1_B, 137 - GPIO_FN_RD_WR, GPIO_FN_TCLK0, 137 + GPIO_FN_RD_WR, GPIO_FN_TCLK0, GPIO_FN_CAN_CLK_B, GPIO_FN_ET0_ETXD4, 138 138 GPIO_FN_EX_CS5, GPIO_FN_SD1_CMD_A, GPIO_FN_ATADIR, GPIO_FN_QSSL_B, 139 139 GPIO_FN_ET0_ETXD3_A, 140 140 GPIO_FN_EX_CS4, GPIO_FN_SD1_WP_A, GPIO_FN_ATAWR, GPIO_FN_QMI_QIO1_B,
+2 -2
drivers/pinctrl/sh-pfc/pfc-sh7734.c
··· 1450 1450 GPIO_FN(ET0_ETXD2_A), 1451 1451 GPIO_FN(EX_CS5), GPIO_FN(SD1_CMD_A), GPIO_FN(ATADIR), GPIO_FN(QSSL_B), 1452 1452 GPIO_FN(ET0_ETXD3_A), 1453 - GPIO_FN(RD_WR), GPIO_FN(TCLK1_B), 1453 + GPIO_FN(RD_WR), GPIO_FN(TCLK0), GPIO_FN(CAN_CLK_B), GPIO_FN(ET0_ETXD4), 1454 1454 GPIO_FN(EX_WAIT0), GPIO_FN(TCLK1_B), 1455 1455 GPIO_FN(EX_WAIT1), GPIO_FN(SD1_DAT0_A), GPIO_FN(DREQ2), 1456 1456 GPIO_FN(CAN1_TX_C), GPIO_FN(ET0_LINK_C), GPIO_FN(ET0_ETXD5_A), ··· 1949 1949 /* IP3_20 [1] */ 1950 1950 FN_EX_WAIT0, FN_TCLK1_B, 1951 1951 /* IP3_19_18 [2] */ 1952 - FN_RD_WR, FN_TCLK1_B, 0, 0, 1952 + FN_RD_WR, FN_TCLK0, FN_CAN_CLK_B, FN_ET0_ETXD4, 1953 1953 /* IP3_17_15 [3] */ 1954 1954 FN_EX_CS5, FN_SD1_CMD_A, FN_ATADIR, FN_QSSL_B, 1955 1955 FN_ET0_ETXD3_A, 0, 0, 0,