pinctrl: sh-pfc: sh7264: Fix CAN function GPIOs

[linux-2.6-microblaze.git] / drivers / pinctrl / sh-pfc / pfc-sh7264.c

diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7264.c b/drivers/pinctrl/sh-pfc/pfc-sh7264.c
index 4117bd8..908837e 100644 (file)
--- a/drivers/pinctrl/sh-pfc/pfc-sh7264.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7264.c
@@ -497,17 +497,15 @@ enum {
        SD_WP_MARK, SD_CLK_MARK, SD_CMD_MARK,
        CRX0_MARK, CRX1_MARK,
        CTX0_MARK, CTX1_MARK,
+       CRX0_CRX1_MARK, CTX0_CTX1_MARK,
 
        PWM1A_MARK, PWM1B_MARK, PWM1C_MARK, PWM1D_MARK,
        PWM1E_MARK, PWM1F_MARK, PWM1G_MARK, PWM1H_MARK,
        PWM2A_MARK, PWM2B_MARK, PWM2C_MARK, PWM2D_MARK,
        PWM2E_MARK, PWM2F_MARK, PWM2G_MARK, PWM2H_MARK,
        IERXD_MARK, IETXD_MARK,
-       CRX0_CRX1_MARK,
        WDTOVF_MARK,
 
-       CRX0X1_MARK,
-
        /* DMAC */
        TEND0_MARK, DACK0_MARK, DREQ0_MARK,
        TEND1_MARK, DACK1_MARK, DREQ1_MARK,
@@ -995,12 +993,12 @@ static const u16 pinmux_data[] = {
 
        PINMUX_DATA(PJ3_DATA, PJ3MD_00),
        PINMUX_DATA(CRX1_MARK, PJ3MD_01),
-       PINMUX_DATA(CRX0X1_MARK, PJ3MD_10),
+       PINMUX_DATA(CRX0_CRX1_MARK, PJ3MD_10),
        PINMUX_DATA(IRQ1_PJ_MARK, PJ3MD_11),
 
        PINMUX_DATA(PJ2_DATA, PJ2MD_000),
        PINMUX_DATA(CTX1_MARK, PJ2MD_001),
-       PINMUX_DATA(CRX0_CRX1_MARK, PJ2MD_010),
+       PINMUX_DATA(CTX0_CTX1_MARK, PJ2MD_010),
        PINMUX_DATA(CS2_MARK, PJ2MD_011),
        PINMUX_DATA(SCK0_MARK, PJ2MD_100),
        PINMUX_DATA(LCD_M_DISP_MARK, PJ2MD_101),
@@ -1245,6 +1243,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {
        GPIO_FN(CTX1),
        GPIO_FN(CRX1),
        GPIO_FN(CTX0),
+       GPIO_FN(CTX0_CTX1),
        GPIO_FN(CRX0),
        GPIO_FN(CRX0_CRX1),