diff options
| author | Eric Bénard <eric@eukrea.com> | 2010-10-02 17:15:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-11 15:22:14 +0200 |
| commit | 6f8460eb823c37f6ba236cd261a6edceea4805e5 (patch) | |
| tree | f55df13db58bff2c3ddb48cba54149463ec7d300 /arch/arm/mach-mx25 | |
| parent | i.mx25: add esdhc support (diff) | |
| download | linux-6f8460eb823c37f6ba236cd261a6edceea4805e5.tar.xz linux-6f8460eb823c37f6ba236cd261a6edceea4805e5.zip | |
eukrea_mbimxsd for cpuimx25: add CAN & SDCard support
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx25')
| -rw-r--r-- | arch/arm/mach-mx25/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-mx25/Kconfig b/arch/arm/mach-mx25/Kconfig index 326bb648f466..aa57e35ce3cd 100644 --- a/arch/arm/mach-mx25/Kconfig +++ b/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/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c b/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c index 2062dd930955..c1fe048c445e 100644 --- a/arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c +++ b/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); |