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

Commit b245f26f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'devel-omap-misc' into omap-for-linus

parents 5a37e784 3a63833e

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

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

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/mmc/host.h>

#include <linux/delay.h>

#include <linux/i2c/twl.h>

#include <linux/err.h>
@@ -190,7 +191,7 @@ static int __init omap2430_i2c_init(void) 
static struct omap2_hsmmc_info mmc[] __initdata = {

	{

		.mmc		= 1,

		.wires		= 4,

		.caps		= MMC_CAP_4_BIT_DATA,

		.gpio_cd	= -EINVAL,

		.gpio_wp	= -EINVAL,

		.ext_clock	= 1,

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

+3 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/regulator/machine.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/mmc/host.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -353,12 +354,12 @@ static struct omap2_hsmmc_info mmc[] = { 
		/* 8 bits (default) requires S6.3 == ON,

		 * so the SIM card isn't used; else 4 bits.

		 */

		.wires		= 8,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= 4,

	},

	{

		.mmc		= 2,

		.wires		= 8,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= 7,

	},

	{}	/* Terminator */

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

+2 −2
Original line number Diff line number Diff line
@@ -193,12 +193,12 @@ static struct omap_musb_board_data musb_board_data = { 
static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,

		.wires		= 8,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= -EINVAL,

	},

	{

		.mmc		= 2,

		.wires		= 8,

		.caps		=  MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_cd	= -EINVAL,

		.gpio_wp	= -EINVAL,

		.nonremovable   = true,

arch/arm/mach-omap2/board-cm-t35.c

+3 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/i2c/at24.h>

#include <linux/i2c/twl.h>

#include <linux/regulator/machine.h>

#include <linux/mmc/host.h>



#include <linux/spi/spi.h>

#include <linux/spi/tdo24m.h>
@@ -579,14 +580,14 @@ static struct twl4030_keypad_data cm_t35_kp_data = { 
static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,

		.wires		= 4,

		.caps		= MMC_CAP_4_BIT_DATA,

		.gpio_cd	= -EINVAL,

		.gpio_wp	= -EINVAL,



	},

	{

		.mmc		= 2,

		.wires		= 4,

		.caps		= MMC_CAP_4_BIT_DATA,

		.transceiver	= 1,

		.gpio_cd	= -EINVAL,

		.gpio_wp	= -EINVAL,

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

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/nand.h>

#include <linux/mmc/host.h>



#include <linux/regulator/machine.h>

#include <linux/i2c/twl.h>
@@ -105,7 +106,7 @@ static struct omap_nand_platform_data devkit8000_nand_data = { 
static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,

		.wires		= 8,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= 29,

	},

	{}	/* Terminator */