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

Commit 0005ae73 authored by Kishore Kadiyala's avatar Kishore Kadiyala Committed by Tony Lindgren
Browse files

OMAP: hsmmc: Rename the device and driver 



Modifying the device & driver name from "mmci-omap-hs" to
"omap_hsmmc".

Signed-off-by: default avatarKishore Kadiyala <kishore.kadiyala@ti.com>
Acked-by: default avatarBenoit <Cousson&lt;b-cousson@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4621d5f8

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ static void __init omap_2430sdp_init_early(void) 
}

}





static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {

static struct regulator_consumer_supply sdp2430_vmmc1_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0"),

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};

};





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

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

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -410,15 +410,15 @@ static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = { 
};

};





static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {

static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0"),

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};

};





static struct regulator_consumer_supply sdp3430_vsim_supplies[] = {

static struct regulator_consumer_supply sdp3430_vsim_supplies[] = {

	REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.0"),

	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),

};

};





static struct regulator_consumer_supply sdp3430_vmmc2_supplies[] = {

static struct regulator_consumer_supply sdp3430_vmmc2_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),

};

};





/*

/*

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -348,11 +348,6 @@ static struct twl4030_usb_data omap4_usbphy_data = { 
};

};





static struct omap2_hsmmc_info mmc[] = {

static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= -EINVAL,

	},

	{

	{

		.mmc		= 2,

		.mmc		= 2,

		.caps		=  MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.caps		=  MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
@@ -361,19 +356,24 @@ static struct omap2_hsmmc_info mmc[] = { 
		.nonremovable   = true,

		.nonremovable   = true,

		.ocr_mask	= MMC_VDD_29_30,

		.ocr_mask	= MMC_VDD_29_30,

	},

	},

	{

		.mmc		= 1,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

		.gpio_wp	= -EINVAL,

	},

	{}	/* Terminator */

	{}	/* Terminator */

};

};





static struct regulator_consumer_supply sdp4430_vaux_supply[] = {

static struct regulator_consumer_supply sdp4430_vaux_supply[] = {

	{

	{

		.supply = "vmmc",

		.supply = "vmmc",

		.dev_name = "mmci-omap-hs.1",

		.dev_name = "omap_hsmmc.1",

	},

	},

};

};

static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {

static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {

	{

	{

		.supply = "vmmc",

		.supply = "vmmc",

		.dev_name = "mmci-omap-hs.0",

		.dev_name = "omap_hsmmc.0",

	},

	},

};

};

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ static void devkit8000_panel_disable_dvi(struct omap_dss_device *dssdev) 
}

}





static struct regulator_consumer_supply devkit8000_vmmc1_supply =

static struct regulator_consumer_supply devkit8000_vmmc1_supply =

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0");

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");









/* ads7846 on SPI */

/* ads7846 on SPI */

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -250,7 +250,7 @@ static inline void __init igep2_init_smsc911x(void) { } 
#endif

#endif





static struct regulator_consumer_supply igep2_vmmc1_supply =

static struct regulator_consumer_supply igep2_vmmc1_supply =

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0");

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");





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

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

static struct regulator_init_data igep2_vmmc1 = {

static struct regulator_init_data igep2_vmmc1 = {
@@ -268,7 +268,7 @@ static struct regulator_init_data igep2_vmmc1 = { 
};

};





static struct regulator_consumer_supply igep2_vio_supply =

static struct regulator_consumer_supply igep2_vio_supply =

	REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.1");

	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1");





static struct regulator_init_data igep2_vio = {

static struct regulator_init_data igep2_vio = {

	.constraints = {

	.constraints = {
@@ -286,7 +286,7 @@ static struct regulator_init_data igep2_vio = { 
};

};





static struct regulator_consumer_supply igep2_vmmc2_supply =

static struct regulator_consumer_supply igep2_vmmc2_supply =

	REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1");

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1");





static struct regulator_init_data igep2_vmmc2 = {

static struct regulator_init_data igep2_vmmc2 = {

	.constraints		= {

	.constraints		= {