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

Commit 8430281b authored by Tim Nordell's avatar Tim Nordell Committed by Tony Lindgren
Browse files

ARM: OMAP3LOGIC: Adding SDMMC support 



Add low-level initialization for hsmmc controller for
LogicPD's OMAP 3530 LV SOM and OMAP 35x Torpedo board.

Signed-off-by: default avatarTim Nordell <tim.nordell@logicpd.com>
[tony@atomide.com: updated for the recent mmc platform init changes]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d40f3f15

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

+38 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/regulator/machine.h>



#include <linux/i2c/twl.h>

#include <linux/mmc/host.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -33,6 +34,7 @@ 
#include <asm/mach/map.h>



#include "mux.h"

#include "hsmmc.h"



#include <plat/mux.h>

#include <plat/board.h>
@@ -87,6 +89,7 @@ static struct twl4030_platform_data omap3logic_twldata = { 


	/* platform_data for children goes here */

	.gpio		= &omap3logic_gpio_data,

	.vmmc1		= &omap3logic_vmmc1,

};



static struct i2c_board_info __initdata omap3logic_i2c_boardinfo[] = {
@@ -105,6 +108,40 @@ static int __init omap3logic_i2c_init(void) 
	return 0;

}



static struct omap2_hsmmc_info __initdata board_mmc_info[] = {

	{

		.name		= "external",

		.mmc		= 1,

		.caps		= MMC_CAP_4_BIT_DATA,

		.gpio_cd	= -EINVAL,

		.gpio_wp	= -EINVAL,

	},

	{}      /* Terminator */

};



static void __init board_mmc_init(void)

{

	if (machine_is_omap3530_lv_som()) {

		/* OMAP3530 LV SOM board */

		board_mmc_info[0].gpio_cd = OMAP3530_LV_SOM_MMC_GPIO_CD;

		board_mmc_info[0].gpio_wp = OMAP3530_LV_SOM_MMC_GPIO_WP;

		omap_mux_init_signal("gpio_110", OMAP_PIN_OUTPUT);

		omap_mux_init_signal("gpio_126", OMAP_PIN_OUTPUT);

	} else if (machine_is_omap3_torpedo()) {

		/* OMAP3 Torpedo board */

		board_mmc_info[0].gpio_cd = OMAP3_TORPEDO_MMC_GPIO_CD;

		omap_mux_init_signal("gpio_127", OMAP_PIN_OUTPUT);

	} else {

		/* unsupported board */

		printk(KERN_ERR "%s(): unknown machine type\n", __func__);

		return;

	}



	omap2_hsmmc_init(board_mmc_info);

	/* link regulators to MMC adapters */

	omap3logic_vmmc1_supply.dev = board_mmc_info[0].dev;

}



static void __init omap3logic_init_irq(void)

{

	omap2_init_common_hw(NULL, NULL);
@@ -116,7 +153,7 @@ static void __init omap3logic_init(void) 
{

	omap3logic_i2c_init();

	omap_serial_init();



	board_mmc_init();

	/* Ensure SDRC pins are mux'd for self-refresh */

	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);

	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);