pinctrl: sh-pfc: r8a77965: Fix DU_DOTCLKIN3 drive/bias control
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 13 Nov 2019 10:16:53 +0000 (11:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Feb 2020 21:34:19 +0000 (16:34 -0500)
commit a34cd9dfd03fa9ec380405969f1d638bc63b8d63 upstream.

R-Car Gen3 Hardware Manual Errata for Rev. 2.00 of October 24, 2019
changed the configuration bits for drive and bias control for the
DU_DOTCLKIN3 pin on R-Car M3-N, to match the same pin on R-Car H3.
Update the driver to reflect this.

After this, the handling of drive and bias control for the various
DU_DOTCLKINx pins is consistent across all of the R-Car H3, M3-W,
M3-W+, and M3-N SoCs.

Fixes: 86c045c2e4201e94 ("pinctrl: sh-pfc: r8a77965: Replace DU_DOTCLKIN2 by DU_DOTCLKIN3")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191113101653.28428-1-geert+renesas@glider.be
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pinctrl/sh-pfc/pfc-r8a77965.c

index 697c77a..773d3bc 100644 (file)
@@ -5984,7 +5984,7 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {
                { PIN_DU_DOTCLKIN1,    0, 2 },  /* DU_DOTCLKIN1 */
        } },
        { PINMUX_DRIVE_REG("DRVCTRL12", 0xe6060330) {
-               { PIN_DU_DOTCLKIN3,   28, 2 },  /* DU_DOTCLKIN3 */
+               { PIN_DU_DOTCLKIN3,   24, 2 },  /* DU_DOTCLKIN3 */
                { PIN_FSCLKST,        20, 2 },  /* FSCLKST */
                { PIN_TMS,             4, 2 },  /* TMS */
        } },
@@ -6240,8 +6240,8 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {
                [31] = PIN_DU_DOTCLKIN1,        /* DU_DOTCLKIN1 */
        } },
        { PINMUX_BIAS_REG("PUEN3", 0xe606040c, "PUD3", 0xe606044c) {
-               [ 0] = PIN_DU_DOTCLKIN3,        /* DU_DOTCLKIN3 */
-               [ 1] = SH_PFC_PIN_NONE,
+               [ 0] = SH_PFC_PIN_NONE,
+               [ 1] = PIN_DU_DOTCLKIN3,        /* DU_DOTCLKIN3 */
                [ 2] = PIN_FSCLKST,             /* FSCLKST */
                [ 3] = PIN_EXTALR,              /* EXTALR*/
                [ 4] = PIN_TRST_N,              /* TRST# */