Commit 2dbf56ae authored by Kevin Hilman's avatar Kevin Hilman
Browse files

davinci: MMC platform support 



Add SoC and platform-specific data and init for MMC driver.

Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 35652fe1

arch/arm/mach-davinci/board-dm355-evm.c

+29 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <mach/i2c.h>

#include <mach/serial.h>

#include <mach/nand.h>

#include <mach/mmc.h>



#define DAVINCI_ASYNC_EMIF_CONTROL_BASE		0x01e10000

#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE	0x02000000
@@ -191,6 +192,31 @@ static void __init dm355_evm_map_io(void) 
	dm355_init();

}



static int dm355evm_mmc_get_cd(int module)

{

	if (!gpio_is_valid(dm355evm_mmc_gpios))

		return -ENXIO;

	/* low == card present */

	return !gpio_get_value_cansleep(dm355evm_mmc_gpios + 2 * module + 1);

}



static int dm355evm_mmc_get_ro(int module)

{

	if (!gpio_is_valid(dm355evm_mmc_gpios))

		return -ENXIO;

	/* high == card's write protect switch active */

	return gpio_get_value_cansleep(dm355evm_mmc_gpios + 2 * module + 0);

}



static struct davinci_mmc_config dm355evm_mmc_config = {

	.get_cd		= dm355evm_mmc_get_cd,

	.get_ro		= dm355evm_mmc_get_ro,

	.wires		= 4,

	.max_freq       = 50000000,

	.caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.version	= MMC_CTLR_VERSION_1,

};



/* Don't connect anything to J10 unless you're only using USB host

 * mode *and* have to do so with some kind of gender-bender.  If

 * you have proper Mini-B or Mini-A cables (or Mini-A adapters)
@@ -249,6 +275,9 @@ static __init void dm355_evm_init(void) 
	/* irlml6401 switches over 1A in under 8 msec */

	setup_usb(500, 8);



	davinci_setup_mmc(0, &dm355evm_mmc_config);

	davinci_setup_mmc(1, &dm355evm_mmc_config);



	dm355_init_spi0(BIT(0), dm355_evm_spi_info,

			ARRAY_SIZE(dm355_evm_spi_info));

}

arch/arm/mach-davinci/board-dm355-leopard.c

+28 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <mach/i2c.h>

#include <mach/serial.h>

#include <mach/nand.h>

#include <mach/mmc.h>



#define DAVINCI_ASYNC_EMIF_CONTROL_BASE		0x01e10000

#define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE	0x02000000
@@ -190,6 +191,30 @@ static void __init dm355_leopard_map_io(void) 
	dm355_init();

}



static int dm355leopard_mmc_get_cd(int module)

{

	if (!gpio_is_valid(leopard_mmc_gpio))

		return -ENXIO;

	/* low == card present */

	return !gpio_get_value_cansleep(leopard_mmc_gpio + 2 * module + 1);

}



static int dm355leopard_mmc_get_ro(int module)

{

	if (!gpio_is_valid(leopard_mmc_gpio))

		return -ENXIO;

	/* high == card's write protect switch active */

	return gpio_get_value_cansleep(leopard_mmc_gpio + 2 * module + 0);

}



static struct davinci_mmc_config dm355leopard_mmc_config = {

	.get_cd		= dm355leopard_mmc_get_cd,

	.get_ro		= dm355leopard_mmc_get_ro,

	.wires		= 4,

	.max_freq       = 50000000,

	.caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

};



/* Don't connect anything to J10 unless you're only using USB host

 * mode *and* have to do so with some kind of gender-bender.  If

 * you have proper Mini-B or Mini-A cables (or Mini-A adapters)
@@ -248,6 +273,9 @@ static __init void dm355_leopard_init(void) 
	/* irlml6401 switches over 1A in under 8 msec */

	setup_usb(500, 8);



	davinci_setup_mmc(0, &dm355leopard_mmc_config);

	davinci_setup_mmc(1, &dm355leopard_mmc_config);



	dm355_init_spi0(BIT(0), dm355_leopard_spi_info,

			ARRAY_SIZE(dm355_leopard_spi_info));

}

arch/arm/mach-davinci/board-dm644x-evm.c

+24 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <mach/mux.h>

#include <mach/psc.h>

#include <mach/nand.h>

#include <mach/mmc.h>



#define DM644X_EVM_PHY_MASK		(0x2)

#define DM644X_EVM_MDIO_FREQUENCY	(2200000) /* PHY bus frequency */
@@ -545,6 +546,27 @@ static int dm6444evm_msp430_get_pins(void) 
	return (buf[3] << 8) | buf[2];

}



static int dm6444evm_mmc_get_cd(int module)

{

	int status = dm6444evm_msp430_get_pins();



	return (status < 0) ? status : !(status & BIT(1));

}



static int dm6444evm_mmc_get_ro(int module)

{

	int status = dm6444evm_msp430_get_pins();



	return (status < 0) ? status : status & BIT(6 + 8);

}



static struct davinci_mmc_config dm6446evm_mmc_config = {

	.get_cd		= dm6444evm_mmc_get_cd,

	.get_ro		= dm6444evm_mmc_get_ro,

	.wires		= 4,

	.version	= MMC_CTLR_VERSION_1

};



static struct i2c_board_info __initdata i2c_info[] =  {

	{

		I2C_BOARD_INFO("dm6446evm_msp", 0x23),
@@ -671,6 +693,8 @@ static __init void davinci_evm_init(void) 
			     ARRAY_SIZE(davinci_evm_devices));

	evm_init_i2c();



	davinci_setup_mmc(0, &dm6446evm_mmc_config);



	davinci_serial_init(&uart_config);



	/* Register the fixup for PHY on DaVinci */

arch/arm/mach-davinci/devices.c

+157 −0
Original line number Diff line number Diff line
@@ -23,8 +23,13 @@ 
#include <mach/irqs.h>

#include <mach/cputype.h>

#include <mach/mux.h>

#include <mach/edma.h>

#include <mach/mmc.h>



#define DAVINCI_I2C_BASE	     0x01C21000

#define DAVINCI_MMCSD0_BASE	     0x01E10000

#define DM355_MMCSD0_BASE	     0x01E11000

#define DM355_MMCSD1_BASE	     0x01E00000



static struct resource i2c_resources[] = {

	{
@@ -54,6 +59,158 @@ void __init davinci_init_i2c(struct davinci_i2c_platform_data *pdata) 
	(void) platform_device_register(&davinci_i2c_device);

}



#if	defined(CONFIG_MMC_DAVINCI) || defined(CONFIG_MMC_DAVINCI_MODULE)



static u64 mmcsd0_dma_mask = DMA_32BIT_MASK;



static struct resource mmcsd0_resources[] = {

	{

		/* different on dm355 */

		.start = DAVINCI_MMCSD0_BASE,

		.end   = DAVINCI_MMCSD0_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	/* IRQs:  MMC/SD, then SDIO */

	{

		.start = IRQ_MMCINT,

		.flags = IORESOURCE_IRQ,

	}, {

		/* different on dm355 */

		.start = IRQ_SDIOINT,

		.flags = IORESOURCE_IRQ,

	},

	/* DMA channels: RX, then TX */

	{

		.start = DAVINCI_DMA_MMCRXEVT,

		.flags = IORESOURCE_DMA,

	}, {

		.start = DAVINCI_DMA_MMCTXEVT,

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device davinci_mmcsd0_device = {

	.name = "davinci_mmc",

	.id = 0,

	.dev = {

		.dma_mask = &mmcsd0_dma_mask,

		.coherent_dma_mask = DMA_32BIT_MASK,

	},

	.num_resources = ARRAY_SIZE(mmcsd0_resources),

	.resource = mmcsd0_resources,

};



static u64 mmcsd1_dma_mask = DMA_32BIT_MASK;



static struct resource mmcsd1_resources[] = {

	{

		.start = DM355_MMCSD1_BASE,

		.end   = DM355_MMCSD1_BASE + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

	/* IRQs:  MMC/SD, then SDIO */

	{

		.start = IRQ_DM355_MMCINT1,

		.flags = IORESOURCE_IRQ,

	}, {

		.start = IRQ_DM355_SDIOINT1,

		.flags = IORESOURCE_IRQ,

	},

	/* DMA channels: RX, then TX */

	{

		.start = 30,	/* rx */

		.flags = IORESOURCE_DMA,

	}, {

		.start = 31,	/* tx */

		.flags = IORESOURCE_DMA,

	},

};



static struct platform_device davinci_mmcsd1_device = {

	.name = "davinci_mmc",

	.id = 1,

	.dev = {

		.dma_mask = &mmcsd1_dma_mask,

		.coherent_dma_mask = DMA_32BIT_MASK,

	},

	.num_resources = ARRAY_SIZE(mmcsd1_resources),

	.resource = mmcsd1_resources,

};





void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config)

{

	struct platform_device	*pdev = NULL;



	if (WARN_ON(cpu_is_davinci_dm646x()))

		return;



	/* REVISIT: update PINMUX, ARM_IRQMUX, and EDMA_EVTMUX here too;

	 * for example if MMCSD1 is used for SDIO, maybe DAT2 is unused.

	 *

	 * FIXME dm6441 (no MMC/SD), dm357 (one), and dm335 (two) are

	 * not handled right here ...

	 */

	switch (module) {

	case 1:

		if (!cpu_is_davinci_dm355())

			break;



		/* REVISIT we may not need all these pins if e.g. this

		 * is a hard-wired SDIO device...

		 */

		davinci_cfg_reg(DM355_SD1_CMD);

		davinci_cfg_reg(DM355_SD1_CLK);

		davinci_cfg_reg(DM355_SD1_DATA0);

		davinci_cfg_reg(DM355_SD1_DATA1);

		davinci_cfg_reg(DM355_SD1_DATA2);

		davinci_cfg_reg(DM355_SD1_DATA3);



		pdev = &davinci_mmcsd1_device;

		break;

	case 0:

		if (cpu_is_davinci_dm355()) {

			mmcsd0_resources[0].start = DM355_MMCSD0_BASE;

			mmcsd0_resources[0].end = DM355_MMCSD0_BASE + SZ_4K - 1;

			mmcsd0_resources[2].start = IRQ_DM355_SDIOINT0;



			/* expose all 6 MMC0 signals:  CLK, CMD, DATA[0..3] */

			davinci_cfg_reg(DM355_MMCSD0);



			/* enable RX EDMA */

			davinci_cfg_reg(DM355_EVT26_MMC0_RX);

		}



		else if (cpu_is_davinci_dm644x()) {

			/* REVISIT: should this be in board-init code? */

			void __iomem *base =

				IO_ADDRESS(DAVINCI_SYSTEM_MODULE_BASE);



			/* Power-on 3.3V IO cells */

			__raw_writel(0, base + DM64XX_VDD3P3V_PWDN);

			/*Set up the pull regiter for MMC */

			davinci_cfg_reg(DM644X_MSTK);

		}



		pdev = &davinci_mmcsd0_device;

		break;

	}



	if (WARN_ON(!pdev))

		return;



	pdev->dev.platform_data = config;

	platform_device_register(pdev);

}



#else



void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config)

{

}



#endif



/*-------------------------------------------------------------------------*/



static struct resource wdt_resources[] = {

arch/arm/mach-davinci/include/mach/mmc.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 *  Board-specific MMC configuration

 */



#ifndef _DAVINCI_MMC_H

#define _DAVINCI_MMC_H



#include <linux/types.h>

#include <linux/mmc/host.h>



struct davinci_mmc_config {

	/* get_cd()/get_wp() may sleep */

	int	(*get_cd)(int module);

	int	(*get_ro)(int module);

	/* wires == 0 is equivalent to wires == 4 (4-bit parallel) */

	u8	wires;



	u32     max_freq;



	/* any additional host capabilities: OR'd in to mmc->f_caps */

	u32     caps;



	/* Version of the MMC/SD controller */

	u8	version;

};

void davinci_setup_mmc(int module, struct davinci_mmc_config *config);



enum {

	MMC_CTLR_VERSION_1 = 0,	/* DM644x and DM355 */

	MMC_CTLR_VERSION_2,	/* DA830 */

};



#endif