From: Dong Aisheng Date: Wed, 30 Nov 2011 08:23:19 +0000 (+0800) Subject: ENGR00163615 mx6q: sabrelite RevC: change GPIO for flexcan X-Git-Tag: v3.0.35-fsl_4.1.0~1992 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=49e3e4a1904ed4385cc203a463b8974a65b0deaf;p=karo-tx-linux.git ENGR00163615 mx6q: sabrelite RevC: change GPIO for flexcan GPIOs used by flexcan are changed on RevC board. Updating the code for RevC board. Signed-off-by: Dong Aisheng --- diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index 589a57b1a3ed..118b6e0538d0 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -80,8 +80,8 @@ #define MX6Q_SABRELITE_USB_OTG_PWR IMX_GPIO_NR(3, 22) #define MX6Q_SABRELITE_CAP_TCH_INT1 IMX_GPIO_NR(1, 9) #define MX6Q_SABRELITE_USB_HUB_RESET IMX_GPIO_NR(7, 12) -#define MX6Q_SABRELITE_CAN1_STBY IMX_GPIO_NR(1, 25) -#define MX6Q_SABRELITE_CAN1_EN IMX_GPIO_NR(1, 27) +#define MX6Q_SABRELITE_CAN1_STBY IMX_GPIO_NR(1, 2) +#define MX6Q_SABRELITE_CAN1_EN IMX_GPIO_NR(1, 4) #define MX6Q_SABRELITE_SD3_WP_PADCFG (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_MED | \ @@ -106,9 +106,9 @@ static iomux_v3_cfg_t mx6q_sabrelite_pads[] = { /* CAN1 */ MX6Q_PAD_KEY_ROW2__CAN1_RXCAN, MX6Q_PAD_KEY_COL2__CAN1_TXCAN, - MX6Q_PAD_ENET_CRS_DV__GPIO_1_25, /* STNDBY */ - MX6Q_PAD_ENET_RXD1__GPIO_1_26, /* NERR */ - MX6Q_PAD_ENET_RXD0__GPIO_1_27, /* Enable */ + MX6Q_PAD_GPIO_2__GPIO_1_2, /* STNDBY */ + MX6Q_PAD_GPIO_7__GPIO_1_7, /* NERR */ + MX6Q_PAD_GPIO_4__GPIO_1_4, /* Enable */ /* CCM */ MX6Q_PAD_GPIO_0__CCM_CLKO, /* SGTL500 sys_mclk */