[PATCH 0/2] mx25_3ds & mx35_3ds: add mmc support

[PATCH 0/2] mx25_3ds & mx35_3ds: add mmc support

[Shawn Guo]

The patch was tested on top of Uwe's build fix below. 

 ARM: mx3: fix build failure concerning MXC_INT_MMC_SDHC2

Shawn Guo (3)
 [PATCH 1/2] mx35_3ds: add mmc support
 [PATCH 2/2] mx25_3ds: add mmc support

 arch/arm/mach-mx25/Kconfig         |    1 +
 arch/arm/mach-mx25/mach-mx25_3ds.c |   10 ++++++++++
 arch/arm/mach-mx3/Kconfig          |    1 +
 arch/arm/mach-mx3/mach-mx35_3ds.c  |    8 ++++++++
 4 files changed, 20 insertions(+), 0 deletions(-)

[PATCH 1/2] mx35_3ds: add mmc support

[Shawn Guo]

Update mx35_3ds board support to register esdhc device

Signed-off-by: Shawn Guo <shawn.gsc@gmail.com>
---
 arch/arm/mach-mx3/Kconfig         |    1 +
 arch/arm/mach-mx3/mach-mx35_3ds.c |    8 ++++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index 096fd33..f50b489 100644
--- a/arch/arm/mach-mx3/Kconfig
+++ b/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/arch/arm/mach-mx3/mach-mx35_3ds.c b/arch/arm/mach-mx3/mach-mx35_3ds.c
index 91bb065..f0277c2 100644
--- a/arch/arm/mach-mx3/mach-mx35_3ds.c
+++ b/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)
-- 
1.7.1

[PATCH 2/2] mx25_3ds: add mmc support

[Shawn Guo]

Update mx25_3ds board support to register esdhc device

Signed-off-by: Shawn Guo <shawn.gsc@gmail.com>
---
 arch/arm/mach-mx25/Kconfig         |    1 +
 arch/arm/mach-mx25/mach-mx25_3ds.c |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mx25/Kconfig b/arch/arm/mach-mx25/Kconfig
index aa57e35..38ca09a 100644
--- a/arch/arm/mach-mx25/Kconfig
+++ b/arch/arm/mach-mx25/Kconfig
@@ -6,6 +6,7 @@ config MACH_MX25_3DS
 	bool "Support MX25PDK (3DS) Platform"
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_MXC_NAND
+	select IMX_HAVE_PLATFORM_ESDHC
 
 config MACH_EUKREA_CPUIMX25
 	bool "Support Eukrea CPUIMX25 Platform"
diff --git a/arch/arm/mach-mx25/mach-mx25_3ds.c b/arch/arm/mach-mx25/mach-mx25_3ds.c
index bd18056..d3d8322 100644
--- a/arch/arm/mach-mx25/mach-mx25_3ds.c
+++ b/arch/arm/mach-mx25/mach-mx25_3ds.c
@@ -96,6 +96,14 @@ static struct pad_desc mx25pdk_pads[] = {
 	MX25_PAD_KPP_COL1__KPP_COL1,
 	MX25_PAD_KPP_COL2__KPP_COL2,
 	MX25_PAD_KPP_COL3__KPP_COL3,
+
+	/* SD1 */
+	MX25_PAD_SD1_CMD__SD1_CMD,
+	MX25_PAD_SD1_CLK__SD1_CLK,
+	MX25_PAD_SD1_DATA0__SD1_DATA0,
+	MX25_PAD_SD1_DATA1__SD1_DATA1,
+	MX25_PAD_SD1_DATA2__SD1_DATA2,
+	MX25_PAD_SD1_DATA3__SD1_DATA3,
 };
 
 static const struct fec_platform_data mx25_fec_pdata __initconst = {
@@ -193,6 +201,8 @@ static void __init mx25pdk_init(void)
 	mx25pdk_fec_reset();
 	imx25_add_fec(&mx25_fec_pdata);
 	mxc_register_device(&mx25_kpp_device, &mx25pdk_keymap_data);
+
+	imx25_add_esdhc(0, NULL);
 }
 
 static void __init mx25pdk_timer_init(void)
-- 
1.7.1

[PATCH 0/2] mx25_3ds & mx35_3ds: add mmc support

[Uwe Kleine-König]

Hi Shawn,

On Fri, Oct 22, 2010 at 12:23:43AM +0800, Shawn Guo wrote:
> The patch was tested on top of Uwe's build fix below. 
> 
>  ARM: mx3: fix build failure concerning MXC_INT_MMC_SDHC2
> 
> Shawn Guo (3)
>  [PATCH 1/2] mx35_3ds: add mmc support
>  [PATCH 2/2] mx25_3ds: add mmc support
Both look ok, Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> 
>  arch/arm/mach-mx25/Kconfig         |    1 +
>  arch/arm/mach-mx25/mach-mx25_3ds.c |   10 ++++++++++
>  arch/arm/mach-mx3/Kconfig          |    1 +
>  arch/arm/mach-mx3/mach-mx35_3ds.c  |    8 ++++++++
>  4 files changed, 20 insertions(+), 0 deletions(-)
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |