pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / pinctrl / sh-pfc / pfc-sh7734.c

diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7734.c b/drivers/pinctrl/sh-pfc/pfc-sh7734.c
index 9842bb1..ab09d38 100644 (file)
--- a/drivers/pinctrl/sh-pfc/pfc-sh7734.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7734.c
@@ -1458,7 +1458,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {
        GPIO_FN(ET0_ETXD2_A),
        GPIO_FN(EX_CS5), GPIO_FN(SD1_CMD_A), GPIO_FN(ATADIR), GPIO_FN(QSSL_B),
        GPIO_FN(ET0_ETXD3_A),
-       GPIO_FN(RD_WR), GPIO_FN(TCLK1_B),
+       GPIO_FN(RD_WR), GPIO_FN(TCLK0), GPIO_FN(CAN_CLK_B), GPIO_FN(ET0_ETXD4),
        GPIO_FN(EX_WAIT0), GPIO_FN(TCLK1_B),
        GPIO_FN(EX_WAIT1), GPIO_FN(SD1_DAT0_A), GPIO_FN(DREQ2),
                GPIO_FN(CAN1_TX_C), GPIO_FN(ET0_LINK_C), GPIO_FN(ET0_ETXD5_A),
@@ -1954,7 +1954,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
            /* IP3_20 [1] */
                FN_EX_WAIT0, FN_TCLK1_B,
            /* IP3_19_18 [2] */
-               FN_RD_WR, FN_TCLK1_B, 0, 0,
+               FN_RD_WR, FN_TCLK0, FN_CAN_CLK_B, FN_ET0_ETXD4,
            /* IP3_17_15 [3] */
                FN_EX_CS5, FN_SD1_CMD_A, FN_ATADIR, FN_QSSL_B,
                FN_ET0_ETXD3_A, 0, 0, 0,
@@ -2218,22 +2218,22 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
            /* IP10_22 [1] */
                FN_CAN_CLK_A, FN_RX4_D,
            /* IP10_21_19 [3] */
-               FN_AUDIO_CLKOUT, FN_TX1_E, FN_HRTS0_C, FN_FSE_B,
-               FN_LCD_M_DISP_B, 0, 0, 0,
+               FN_AUDIO_CLKOUT, FN_TX1_E, 0, FN_HRTS0_C, FN_FSE_B,
+               FN_LCD_M_DISP_B, 0, 0,
            /* IP10_18_16 [3] */
-               FN_AUDIO_CLKC, FN_SCK1_E, FN_HCTS0_C, FN_FRB_B,
-               FN_LCD_VEPWC_B, 0, 0, 0,
+               FN_AUDIO_CLKC, FN_SCK1_E, 0, FN_HCTS0_C, FN_FRB_B,
+               FN_LCD_VEPWC_B, 0, 0,
            /* IP10_15 [1] */
                FN_AUDIO_CLKB_A, FN_LCD_CLK_B,
            /* IP10_14_12 [3] */
                FN_AUDIO_CLKA_A, FN_VI1_CLK_B, FN_SCK1_D, FN_IECLK_B,
                FN_LCD_FLM_B, 0, 0, 0,
            /* IP10_11_9 [3] */
-               FN_SSI_SDATA3, FN_VI1_7_B, FN_HTX0_C, FN_FWE_B,
-               FN_LCD_CL2_B, 0, 0, 0,
+               FN_SSI_SDATA3, FN_VI1_7_B, 0, FN_HTX0_C, FN_FWE_B,
+               FN_LCD_CL2_B, 0, 0,
            /* IP10_8_6 [3] */
-               FN_SSI_SDATA2, FN_VI1_6_B, FN_HRX0_C, FN_FRE_B,
-               FN_LCD_CL1_B, 0, 0, 0,
+               FN_SSI_SDATA2, FN_VI1_6_B, 0, FN_HRX0_C, FN_FRE_B,
+               FN_LCD_CL1_B, 0, 0,
            /* IP10_5_3 [3] */
                FN_SSI_WS23, FN_VI1_5_B, FN_TX1_D, FN_HSCK0_C, FN_FALE_B,
                FN_LCD_DON_B, 0, 0, 0,