From 8d5519b2d7dd58118e670a1a9eb2eee2b6fea08b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Sat, 2 Oct 2010 17:15:29 +0200 Subject: [PATCH] --- yaml --- r: 212551 b: refs/heads/master c: 6f8460eb823c37f6ba236cd261a6edceea4805e5 h: refs/heads/master i: 212549: 52c762b059bbc3c6d854c6efd0e107654cf81acf 212547: ba98a5c5f7ac19a33f69c0956651851f0f7047b8 212543: a929442e4ea7b26f4188eef90022fce12f9d5f04 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx25/Kconfig | 2 ++ trunk/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ae66cb23a650..ff463f5e0c47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5e40c28b63939ee63f1f9d865eece0a28444fd0 +refs/heads/master: 6f8460eb823c37f6ba236cd261a6edceea4805e5 diff --git a/trunk/arch/arm/mach-mx25/Kconfig b/trunk/arch/arm/mach-mx25/Kconfig index 326bb648f466..aa57e35ce3cd 100644 --- a/trunk/arch/arm/mach-mx25/Kconfig +++ b/trunk/arch/arm/mach-mx25/Kconfig @@ -12,6 +12,8 @@ config MACH_EUKREA_CPUIMX25 select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_NAND + select IMX_HAVE_PLATFORM_FLEXCAN + select IMX_HAVE_PLATFORM_ESDHC select MXC_ULPI if USB_ULPI choice diff --git a/trunk/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c b/trunk/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c index 2062dd930955..c1fe048c445e 100644 --- a/trunk/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c +++ b/trunk/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c @@ -89,6 +89,9 @@ static struct pad_desc eukrea_mbimxsd_pads[] = { MX25_PAD_KPP_COL2__AUD5_TXC, MX25_PAD_KPP_COL1__AUD5_RXD, MX25_PAD_KPP_COL0__AUD5_TXD, + /* CAN */ + MX25_PAD_GPIO_D__CAN2_RX, + MX25_PAD_GPIO_C__CAN2_TX, }; #define GPIO_LED1 83 @@ -241,6 +244,9 @@ void __init eukrea_mbimxsd25_baseboard_init(void) mxc_register_device(&mx25_fb_device, &eukrea_mximxsd_fb_pdata); imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata); + imx25_add_flexcan1(NULL); + imx25_add_esdhc0(NULL); + gpio_request(GPIO_LED1, "LED1"); gpio_direction_output(GPIO_LED1, 1); gpio_free(GPIO_LED1);