lkml.org 
[lkml]   [2020]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 110/116] pinctrl: sh-pfc: r8a7778: Fix duplicate SDSELF_B and SD1_CLK_B
    Date
    From: Geert Uytterhoeven <geert+renesas@glider.be>

    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>

    ---
    drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- 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 pinmu
    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] */
    @@ -2366,7 +2366,7 @@ static const struct pinmux_cfg_reg pinmu
    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,

    \
     
     \ /
      Last update: 2020-02-13 17:03    [W:8.944 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site