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

Commit 68ff0423 authored by Adrian Hunter's avatar Adrian Hunter Committed by Tony Lindgren
Browse files

omap: Rename hsmmc symbols to reflect independence from twl4030 



hsmmc.[ch] no longer has any dependency on twl4030
and variable names should be renamed to reflect that.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d02a900b

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

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int __init omap2430_i2c_init(void) 
	return 0;

}



static struct twl4030_hsmmc_info mmc[] __initdata = {

static struct omap2_hsmmc_info mmc[] __initdata = {

	{

		.mmc		= 1,

		.wires		= 4,
@@ -201,7 +201,7 @@ static void __init omap_2430sdp_init(void) 


	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));

	omap_serial_init();

	twl4030_mmc_init(mmc);

	omap2_hsmmc_init(mmc);

	usb_musb_init();

	board_smc91x_init();

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

+2 −2
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static struct twl4030_bci_platform_data sdp3430_bci_data = { 
	.tblsize		= ARRAY_SIZE(sdp3430_batt_table),

};



static struct twl4030_hsmmc_info mmc[] = {

static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,

		/* 8 bits (default) requires S6.3 == ON,
@@ -365,7 +365,7 @@ static int sdp3430_twl_gpio_setup(struct device *dev, 
	 */

	mmc[0].gpio_cd = gpio + 0;

	mmc[1].gpio_cd = gpio + 1;

	twl4030_mmc_init(mmc);

	omap2_hsmmc_init(mmc);



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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static struct twl4030_keypad_data cm_t35_kp_data = { 
	.rep		= 1,

};



static struct twl4030_hsmmc_info mmc[] = {

static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,

		.wires		= 4,
@@ -642,7 +642,7 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio, 


	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	mmc[0].gpio_cd = gpio + 0;

	twl4030_mmc_init(mmc);

	omap2_hsmmc_init(mmc);



	/* link regulators to MMC adapters */

	cm_t35_vmmc1_supply.dev = mmc[0].dev;

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

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static struct regulator_init_data igep2_vmmc1 = { 
	.consumer_supplies      = &igep2_vmmc1_supply,

};



static struct twl4030_hsmmc_info mmc[] = {

static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,

		.wires		= 4,
@@ -142,7 +142,7 @@ static int igep2_twl_gpio_setup(struct device *dev, 
{

	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	mmc[0].gpio_cd = gpio + 0;

	twl4030_mmc_init(mmc);

	omap2_hsmmc_init(mmc);



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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static int __init omap_i2c_init(void) 
	return 0;

}



static struct twl4030_hsmmc_info mmc[] __initdata = {

static struct omap2_hsmmc_info mmc[] __initdata = {

	{

		.mmc		= 1,

		.wires		= 4,
@@ -396,7 +396,7 @@ static void __init omap_ldp_init(void) 
	omap_serial_init();

	usb_musb_init();



	twl4030_mmc_init(mmc);

	omap2_hsmmc_init(mmc);

	/* link regulators to MMC adapters */

	ldp_vmmc1_supply.dev = mmc[0].dev;

}