• R/O
  • HTTP
  • SSH
  • HTTPS

kernel_xiaomi_msm8998: 提交

Mirror: https://github.com/0ranko0P/kernel_xiaomi_msm8998/


Commit MetaInfo

修订版c6d00f4ce816263a293337bfea34570f61dd2c6b (tree)
时间2020-02-15 06:30:01
作者Geert Uytterhoeven <geert+renesas@glid...>
CommiterGreg Kroah-Hartman

Log Message

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: 87f8c988636db0d4 ("sh-pfc: Add r8a7778 pinmux support")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191218194812.12741-2-geert+renesas@glider.be
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

更改概述

差异

--- a/drivers/pinctrl/sh-pfc/pfc-r8a7778.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7778.c
@@ -2324,7 +2324,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
23242324 FN_ATAG0_A, 0, FN_REMOCON_B, 0,
23252325 /* IP0_11_8 [4] */
23262326 FN_SD1_DAT2_A, FN_MMC_D2, 0, FN_BS,
2327- FN_ATADIR0_A, 0, FN_SDSELF_B, 0,
2327+ FN_ATADIR0_A, 0, FN_SDSELF_A, 0,
23282328 FN_PWM4_B, 0, 0, 0,
23292329 0, 0, 0, 0,
23302330 /* IP0_7_5 [3] */
@@ -2366,7 +2366,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
23662366 FN_TS_SDAT0_A, 0, 0, 0,
23672367 0, 0, 0, 0,
23682368 /* IP1_10_8 [3] */
2369- FN_SD1_CLK_B, FN_MMC_D6, 0, FN_A24,
2369+ FN_SD1_CD_A, FN_MMC_D6, 0, FN_A24,
23702370 FN_DREQ1_A, 0, FN_HRX0_B, FN_TS_SPSYNC0_A,
23712371 /* IP1_7_5 [3] */
23722372 FN_A23, FN_HTX0_B, FN_TX2_B, FN_DACK2_A,
Show on old repository browser