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

Commit 72f381ba authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by Tony Lindgren
Browse files

omap3: Remove VMMC2 regulator on IGEP v2 



VMMC2 regulator is configured but it's not used for the IGEP v2, so
remove this regulator from board.

Signed-off-by: default avatarEnric Balletbo i Serra <eballetbo@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 91d139cf

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

+3 −23
Original line number Diff line number Diff line
@@ -261,10 +261,6 @@ static struct regulator_consumer_supply igep2_vmmc1_supply = { 
	.supply		= "vmmc",

};



static struct regulator_consumer_supply igep2_vmmc2_supply = {

	.supply		= "vmmc",

};



/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */

static struct regulator_init_data igep2_vmmc1 = {

	.constraints = {
@@ -280,21 +276,6 @@ static struct regulator_init_data igep2_vmmc1 = { 
	.consumer_supplies      = &igep2_vmmc1_supply,

};



/* VMMC2 for OMAP VDD_MMC2 (i/o) and MMC2 WIFI */

static struct regulator_init_data igep2_vmmc2 = {

	.constraints = {

		.min_uV			= 1850000,

		.max_uV			= 3150000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = 1,

	.consumer_supplies      = &igep2_vmmc2_supply,

};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,
@@ -391,11 +372,11 @@ static int igep2_twl_gpio_setup(struct device *dev, 
	mmc[0].gpio_cd = gpio + 0;

	omap2_hsmmc_init(mmc);



	/* link regulators to MMC adapters ... we "know" the

	/*

	 * link regulators to MMC adapters ... we "know" the

	 * regulators will be set up only *after* we return.

	 */

	igep2_vmmc1_supply.dev = mmc[0].dev;

	igep2_vmmc2_supply.dev = mmc[1].dev;



	/*

	 * REVISIT: need ehci-omap hooks for external VBUS
@@ -537,7 +518,6 @@ static struct twl4030_platform_data igep2_twldata = { 
	.codec		= &igep2_codec_data,

	.gpio		= &igep2_twl4030_gpio_pdata,

	.vmmc1          = &igep2_vmmc1,

	.vmmc2		= &igep2_vmmc2,

	.vpll2		= &igep2_vpll2,



};