From 92e65ab2e5d56557133aa1fd30a8ee0640cc1aeb Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Fri, 22 Oct 2010 00:23:44 +0800 Subject: [PATCH] --- yaml --- r: 221037 b: refs/heads/master c: 6207c833940dd9183719f6428099f389a2a7d98e h: refs/heads/master i: 221035: d8175e3dfdb56ebc86e1eb7776b44f45876f24c5 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/Kconfig | 1 + trunk/arch/arm/mach-mx3/mach-mx35_3ds.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 79cd3feab134..fbbe03cd42d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7223066c3bd927c47673d21fd5e4774b7c4d8346 +refs/heads/master: 6207c833940dd9183719f6428099f389a2a7d98e diff --git a/trunk/arch/arm/mach-mx3/Kconfig b/trunk/arch/arm/mach-mx3/Kconfig index 096fd33f8ab9..f50b489aa109 100644 --- a/trunk/arch/arm/mach-mx3/Kconfig +++ b/trunk/arch/arm/mach-mx3/Kconfig @@ -145,6 +145,7 @@ config MACH_MX35_3DS select ARCH_MX35 select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_NAND + select IMX_HAVE_PLATFORM_ESDHC default n help Include support for MX35PDK platform. This includes specific diff --git a/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c b/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c index 91bb06552af1..f0277c293f1a 100644 --- a/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c +++ b/trunk/arch/arm/mach-mx3/mach-mx35_3ds.c @@ -108,6 +108,13 @@ static struct pad_desc mx35pdk_pads[] = { /* USBH1 */ MX35_PAD_I2C2_CLK__USB_TOP_USBH2_PWR, MX35_PAD_I2C2_DAT__USB_TOP_USBH2_OC, + /* SDCARD */ + MX35_PAD_SD1_CMD__ESDHC1_CMD, + MX35_PAD_SD1_CLK__ESDHC1_CLK, + MX35_PAD_SD1_DATA0__ESDHC1_DAT0, + MX35_PAD_SD1_DATA1__ESDHC1_DAT1, + MX35_PAD_SD1_DATA2__ESDHC1_DAT2, + MX35_PAD_SD1_DATA3__ESDHC1_DAT3, }; /* OTG config */ @@ -140,6 +147,7 @@ static void __init mxc_board_init(void) mxc_register_device(&mxc_usbh1, &usb_host_pdata); imx35_add_mxc_nand(&mx35pdk_nand_board_info); + imx35_add_esdhc(0, NULL); } static void __init mx35pdk_timer_init(void)