]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
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)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 29 Jan 2020 04:45:21 +0000 (23:45 -0500)
commitdb45308aebcb9808c1b565baa565fe24d440d019
tree38c099aca3d1519a9c54e3e02971b3f67bce788c
parent98870f3cbe3cf4d03abac1f3b74716ea728dd63e
pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B

BugLink: https://bugs.launchpad.net/bugs/1859712
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
arch/sh/include/cpu-sh4/cpu/sh7734.h
drivers/pinctrl/sh-pfc/pfc-sh7734.c