Commit 237fb5e6 authored Jan 31, 2013 by Lee Jones Committed by Linus Walleij Mar 01, 2013

mmc: mmci: Move ios_handler functionality into the driver



There are currently two instances of the ios_handler being used.
Both of which mearly toy with some regulator settings. Now there
is a GPIO regulator API, we can use that instead, and lessen the
per platform burden. By doing this, we also become more Device
Tree compatible.

Acked-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent b6c23019

drivers/mmc/host/mmci.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1141,6 +1141,11 @@ static void mmci_set_ios(struct mmc_host mmc, struct mmc_ios ios)
		case MMC_POWER_OFF:
		if (!IS_ERR(mmc->supply.vmmc))
		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);

		if (!IS_ERR(mmc->supply.vqmmc) &&
		regulator_is_enabled(mmc->supply.vqmmc))
		regulator_disable(mmc->supply.vqmmc);

		break;
		case MMC_POWER_UP:
		if (!IS_ERR(mmc->supply.vmmc))
		@@ -1155,6 +1160,10 @@ static void mmci_set_ios(struct mmc_host mmc, struct mmc_ios ios)

		break;
		case MMC_POWER_ON:
		if (!IS_ERR(mmc->supply.vqmmc) &&
		!regulator_is_enabled(mmc->supply.vqmmc))
		regulator_enable(mmc->supply.vqmmc);

		pwr \|= MCI_PWR_ON;
		break;
		}