1 files changed, 11 insertions, 0 deletions

diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c
index dd25ee82e70a..88dccf122243 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)
@@ -257,6 +267,7 @@ MACHINE_START(MX25_3DS, "Freescale MX25PDK (3DS)")
         .map_io = mx25_map_io,
         .init_early = imx25_init_early,
         .init_irq = mx25_init_irq,
+        .handle_irq = imx25_handle_irq,
         .timer = &mx25pdk_timer,
         .init_machine = mx25pdk_init,
 MACHINE_END