Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef7a4567 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-mmc 

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [ARM] 3457/1: i.MX: SD/MMC support for i.MX/MX1
  [ARM] 3456/1: AT91RM9200 support for 2.6 (MMC/SD driver)
parents a2308b7f 56ca9040

arch/arm/mach-imx/generic.c

+13 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <asm/arch/imx-regs.h>



#include <asm/mach/map.h>

#include <asm/arch/mmc.h>



void imx_gpio_mode(int gpio_mode)

{
@@ -175,13 +176,25 @@ static struct resource imx_mmc_resources[] = { 
	},

};



static u64 imxmmmc_dmamask = 0xffffffffUL;



static struct platform_device imx_mmc_device = {

	.name		= "imx-mmc",

	.id		= 0,

	.dev		= {

		.dma_mask = &imxmmmc_dmamask,

		.coherent_dma_mask = 0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(imx_mmc_resources),

	.resource	= imx_mmc_resources,

};



void __init imx_set_mmc_info(struct imxmmc_platform_data *info)

{

	imx_mmc_device.dev.platform_data = info;

}

EXPORT_SYMBOL(imx_set_mmc_info);



static struct resource imx_uart1_resources[] = {

	[0] = {

		.start	= 0x00206000,

drivers/mmc/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -91,4 +91,22 @@ config MMC_AU1X 


	  If unsure, say N.



config MMC_AT91RM9200

	tristate "AT91RM9200 SD/MMC Card Interface support"

	depends on ARCH_AT91RM9200 && MMC

	help

	  This selects the AT91RM9200 MCI controller.



	  If unsure, say N.



config MMC_IMX

	tristate "Motorola i.MX Multimedia Card Interface support"

	depends on ARCH_IMX && MMC

	help

	  This selects the Motorola i.MX Multimedia card Interface.

	  If you have a i.MX platform with a Multimedia Card slot,

	  say Y or M here.



	  If unsure, say N.



endmenu

drivers/mmc/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ obj-$(CONFIG_MMC_BLOCK) += mmc_block.o 
#

obj-$(CONFIG_MMC_ARMMMCI)	+= mmci.o

obj-$(CONFIG_MMC_PXA)		+= pxamci.o

obj-$(CONFIG_MMC_IMX)		+= imxmmc.o

obj-$(CONFIG_MMC_SDHCI)		+= sdhci.o

obj-$(CONFIG_MMC_WBSD)		+= wbsd.o

obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o

obj-$(CONFIG_MMC_OMAP)		+= omap.o

obj-$(CONFIG_MMC_AT91RM9200)	+= at91_mci.o



mmc_core-y := mmc.o mmc_queue.o mmc_sysfs.o

drivers/mmc/at91_mci.c

0 → 100644
+988 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/mmc/imxmmc.c

0 → 100644
+1096 −0

File added.

Preview size limit exceeded, changes collapsed.