OSDN Git Service

pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 24 Oct 2019 13:13:08 +0000 (15:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 4 Jan 2020 12:34:14 +0000 (13:34 +0100)
commit5cd08667c927ad01f7a73fb17a2fcbaf541a1ec0
tree577ea9b6b2051dbd89ecee65710eadc932c85224
parent20ba9b9569f39c75f9031efb26ee1b8b9fe0eb6f
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: 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
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/sh/include/cpu-sh4/cpu/sh7734.h
drivers/pinctrl/sh-pfc/pfc-sh7734.c