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

Commit 46a6730e authored by Tony Lindgren's avatar Tony Lindgren Committed by Pierre Ossman
Browse files

mmc-omap: Fix omap to use MMC_POWER_ON 

As discussed earlier on LKML:

http://lkml.org/lkml/2006/5/4/44



Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 3647afce

drivers/mmc/host/omap.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -969,8 +969,10 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		mmc_omap_power(host, 0);

		mmc_omap_power(host, 0);

		break;

		break;

	case MMC_POWER_UP:

	case MMC_POWER_UP:

	case MMC_POWER_ON:

		/* Cannot touch dsor yet, just power up MMC */

		mmc_omap_power(host, 1);

		mmc_omap_power(host, 1);

		return;

	case MMC_POWER_ON:

		dsor |= 1 << 11;

		dsor |= 1 << 11;

		break;

		break;

	}

	}
@@ -986,7 +988,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	 * Writing to the CON register twice seems to do the trick. */

	 * Writing to the CON register twice seems to do the trick. */

	for (i = 0; i < 2; i++)

	for (i = 0; i < 2; i++)

		OMAP_MMC_WRITE(host, CON, dsor);

		OMAP_MMC_WRITE(host, CON, dsor);

	if (ios->power_mode == MMC_POWER_UP) {

	if (ios->power_mode == MMC_POWER_ON) {

		/* Send clock cycles, poll completion */

		/* Send clock cycles, poll completion */

		OMAP_MMC_WRITE(host, IE, 0);

		OMAP_MMC_WRITE(host, IE, 0);

		OMAP_MMC_WRITE(host, STAT, 0xffff);

		OMAP_MMC_WRITE(host, STAT, 0xffff);