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

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

pinctrl: sh-pfc: r8a7778: Fix duplicate SDSELF_B and SD1_CLK_B 



commit 805f635703b2562b5ddd822c62fc9124087e5dd5 upstream.

The FN_SDSELF_B and FN_SD1_CLK_B enum IDs are used twice, which means
one set of users must be wrong.  Replace them by the correct enum IDs.

Fixes: 87f8c988 ("sh-pfc: Add r8a7778 pinmux support")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191218194812.12741-2-geert+renesas@glider.be


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db5c1454

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

+2 −2
Original line number Diff line number Diff line
@@ -2325,7 +2325,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { 
		FN_ATAG0_A,	0,		FN_REMOCON_B,	0,

		/* IP0_11_8 [4] */

		FN_SD1_DAT2_A,	FN_MMC_D2,	0,		FN_BS,

		FN_ATADIR0_A,	0,		FN_SDSELF_B,	0,

		FN_ATADIR0_A,	0,		FN_SDSELF_A,	0,

		FN_PWM4_B,	0,		0,		0,

		0,		0,		0,		0,

		/* IP0_7_5 [3] */
@@ -2367,7 +2367,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { 
		FN_TS_SDAT0_A,	0,		0,		0,

		0,		0,		0,		0,

		/* IP1_10_8 [3] */

		FN_SD1_CLK_B,	FN_MMC_D6,	0,		FN_A24,

		FN_SD1_CD_A,	FN_MMC_D6,	0,		FN_A24,

		FN_DREQ1_A,	0,		FN_HRX0_B,	FN_TS_SPSYNC0_A,

		/* IP1_7_5 [3] */

		FN_A23,		FN_HTX0_B,	FN_TX2_B,	FN_DACK2_A,