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

Commit 90c62bf0 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap mmc: Add low-level initialization for hsmmc controller 



Add low-level initialization for hsmmc controller. Merged into
this patch patch are various improvments and board support by
Grazvydas Ignotas and David Brownell.

Also change wire4 to be wires, as some newer controllers support
8 data lines.

Cc: Pierre Ossman <drzeus-mmc@drzeus.cx>
Signed-off-by: default avatarGrazvydas Ignotas <notasas@gmail.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d8874665

arch/arm/mach-omap1/board-innovator.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static struct omap_mmc_platform_data mmc1_data = { 
	.nr_slots                       = 1,

	.slots[0]       = {

		.set_power		= mmc_set_power,

		.wire4			= 1,

		.wires			= 4,

		.name                   = "mmcblk",

	},

};

arch/arm/mach-omap1/devices.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller, 
			omap_cfg_reg(P19_1710_MMC_CMDDIR);

			omap_cfg_reg(P20_1710_MMC_DATDIR0);

		}

		if (mmc_controller->slots[0].wire4) {

		if (mmc_controller->slots[0].wires == 4) {

			omap_cfg_reg(MMC_DAT1);

			/* NOTE: DAT2 can be on W10 (here) or M15 */

			if (!mmc_controller->slots[0].nomux)
@@ -132,7 +132,7 @@ static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller, 
			omap_cfg_reg(Y10_1610_MMC2_CLK);

			omap_cfg_reg(R18_1610_MMC2_CLKIN);

			omap_cfg_reg(W8_1610_MMC2_DAT0);

			if (mmc_controller->slots[1].wire4) {

			if (mmc_controller->slots[1].wires == 4) {

				omap_cfg_reg(V8_1610_MMC2_DAT1);

				omap_cfg_reg(W15_1610_MMC2_DAT2);

				omap_cfg_reg(R10_1610_MMC2_DAT3);

arch/arm/mach-omap2/Makefile

+10 −5
Original line number Diff line number Diff line
@@ -27,10 +27,15 @@ obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o 
# Specific board support

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o

obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o

obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o \

					   mmc-twl4030.o

obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o

obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o

obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o

obj-$(CONFIG_MACH_OVERO)		+= board-overo.o

obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o

obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o \

					   mmc-twl4030.o

obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o \

					   mmc-twl4030.o

obj-$(CONFIG_MACH_OVERO)		+= board-overo.o \

					   mmc-twl4030.o

obj-$(CONFIG_MACH_OMAP3_PANDORA)	+= board-omap3pandora.o \

					   mmc-twl4030.o

arch/arm/mach-omap2/board-2430sdp.c

+48 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/delay.h>

#include <linux/i2c/twl4030.h>

#include <linux/err.h>

#include <linux/clk.h>

#include <linux/io.h>
@@ -35,6 +36,7 @@ 
#include <mach/common.h>

#include <mach/gpmc.h>



#include "mmc-twl4030.h"



#define	SDP2430_FLASH_CS	0

#define	SDP2430_SMC91X_CS	5
@@ -197,12 +199,58 @@ static struct omap_board_config_kernel sdp2430_config[] = { 
	{OMAP_TAG_UART, &sdp2430_uart_config},

};





static struct twl4030_gpio_platform_data sdp2430_gpio_data = {

	.gpio_base	= OMAP_MAX_GPIO_LINES,

	.irq_base	= TWL4030_GPIO_IRQ_BASE,

	.irq_end	= TWL4030_GPIO_IRQ_END,

};



static struct twl4030_platform_data sdp2430_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,



	/* platform_data for children goes here */

	.gpio		= &sdp2430_gpio_data,

};



static struct i2c_board_info __initdata sdp2430_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl4030", 0x48),

		.flags = I2C_CLIENT_WAKE,

		.irq = INT_24XX_SYS_NIRQ,

		.platform_data = &sdp2430_twldata,

	},

};



static int __init omap2430_i2c_init(void)

{

	omap_register_i2c_bus(1, 400, NULL, 0);

	omap_register_i2c_bus(2, 2600, sdp2430_i2c_boardinfo,

			ARRAY_SIZE(sdp2430_i2c_boardinfo));

	return 0;

}



static struct twl4030_hsmmc_info mmc[] __initdata = {

	{

		.mmc		= 1,

		.wires		= 4,

		.gpio_cd	= -EINVAL,

		.gpio_wp	= -EINVAL,

		.ext_clock	= 1,

	},

	{}	/* Terminator */

};



static void __init omap_2430sdp_init(void)

{

	omap2430_i2c_init();



	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	omap_board_config = sdp2430_config;

	omap_board_config_size = ARRAY_SIZE(sdp2430_config);

	omap_serial_init();

	twl4030_mmc_init(mmc);

}



static void __init omap_2430sdp_map_io(void)

arch/arm/mach-omap2/board-ldp.c

+39 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/clk.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/i2c/twl4030.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -38,6 +39,8 @@ 
#include <asm/delay.h>

#include <mach/control.h>



#include "mmc-twl4030.h"



#define SDP3430_SMC91X_CS	3



static struct resource ldp_smc911x_resources[] = {
@@ -109,14 +112,48 @@ static struct omap_board_config_kernel ldp_config[] __initdata = { 
	{ OMAP_TAG_UART,	&ldp_uart_config },

};



static struct twl4030_gpio_platform_data ldp_gpio_data = {

	.gpio_base	= OMAP_MAX_GPIO_LINES,

	.irq_base	= TWL4030_GPIO_IRQ_BASE,

	.irq_end	= TWL4030_GPIO_IRQ_END,

};



static struct twl4030_platform_data ldp_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,



	/* platform_data for children goes here */

	.gpio		= &ldp_gpio_data,

};



static struct i2c_board_info __initdata ldp_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl4030", 0x48),

		.flags = I2C_CLIENT_WAKE,

		.irq = INT_34XX_SYS_NIRQ,

		.platform_data = &ldp_twldata,

	},

};



static int __init omap_i2c_init(void)

{

	omap_register_i2c_bus(1, 2600, NULL, 0);

	omap_register_i2c_bus(1, 2600, ldp_i2c_boardinfo,

			ARRAY_SIZE(ldp_i2c_boardinfo));

	omap_register_i2c_bus(2, 400, NULL, 0);

	omap_register_i2c_bus(3, 400, NULL, 0);

	return 0;

}



static struct twl4030_hsmmc_info mmc[] __initdata = {

	{

		.mmc		= 1,

		.wires		= 4,

		.gpio_cd	= -EINVAL,

		.gpio_wp	= -EINVAL,

	},

	{}	/* Terminator */

};



static void __init omap_ldp_init(void)

{

	omap_i2c_init();
@@ -124,6 +161,7 @@ static void __init omap_ldp_init(void) 
	omap_board_config = ldp_config;

	omap_board_config_size = ARRAY_SIZE(ldp_config);

	omap_serial_init();

	twl4030_mmc_init(mmc);

}



static void __init omap_ldp_map_io(void)