summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-mx25_3ds.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2011-07-08 19:59:50 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-08-26 10:08:04 +0200
commit91dcc7f437d3e8224dec51f2e0808ba8171309a9 (patch)
tree35f0b805049593dbc9e42a9959cdecef4a83692d /arch/arm/mach-imx/mach-mx25_3ds.c
parentARM: i.MX: initialize l2x0 at early_init time (diff)
downloadlinux-91dcc7f437d3e8224dec51f2e0808ba8171309a9.tar.xz
linux-91dcc7f437d3e8224dec51f2e0808ba8171309a9.zip
ARM: mach-imx/mx25_3ds: Add FlexCAN support
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx25_3ds.c')
-rw-r--r--arch/arm/mach-imx/mach-mx25_3ds.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c
index 7f66a91df361..aae2d8ce3c4d 100644
--- a/arch/arm/mach-imx/mach-mx25_3ds.c
+++ b/arch/arm/mach-imx/mach-mx25_3ds.c
@@ -43,6 +43,8 @@
#include "devices-imx25.h"
+#define MX25PDK_CAN_PWDN IMX_GPIO_NR(4, 6)
+
static const struct imxuart_platform_data uart_pdata __initconst = {
.flags = IMXUART_HAVE_RTSCTS,
};
@@ -108,6 +110,11 @@ static iomux_v3_cfg_t mx25pdk_pads[] = {
/* I2C1 */
MX25_PAD_I2C1_CLK__I2C1_CLK,
MX25_PAD_I2C1_DAT__I2C1_DAT,
+
+ /* CAN1 */
+ MX25_PAD_GPIO_A__CAN1_TX,
+ MX25_PAD_GPIO_B__CAN1_RX,
+ MX25_PAD_D14__GPIO_4_6, /* CAN_PWDN */
};
static const struct fec_platform_data mx25_fec_pdata __initconst = {
@@ -240,6 +247,9 @@ static void __init mx25pdk_init(void)
imx25_add_sdhci_esdhc_imx(0, &mx25pdk_esdhc_pdata);
imx25_add_imx_i2c0(&mx25_3ds_i2c0_data);
+
+ gpio_request_one(MX25PDK_CAN_PWDN, GPIOF_OUT_INIT_LOW, "can-pwdn");
+ imx25_add_flexcan0(NULL);
}
static void __init mx25pdk_timer_init(void)