mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
mmc: omap: restore original power up/down steps
Commite519f0bb64
("ARM/mmc: Convert old mmci-omap to GPIO descriptors") moved Nokia N810 MMC power up/down from the board file into the MMC driver. The change removed some delays, and ordering without a valid reason. Restore power up/down to match the original code. This matters only on N810 where the 2nd GPIO is in use. Other boards will see an additional delay but that should be a lesser concern than omitting delays altogether. Fixes:e519f0bb64
("ARM/mmc: Convert old mmci-omap to GPIO descriptors") Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Message-ID: <20240223181439.1099750-6-aaro.koskinen@iki.fi> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
f6862c7f15
commit
894ad61b85
1 changed files with 19 additions and 4 deletions
|
@ -1119,10 +1119,25 @@ static void mmc_omap_set_power(struct mmc_omap_slot *slot, int power_on,
|
|||
|
||||
host = slot->host;
|
||||
|
||||
if (slot->vsd)
|
||||
gpiod_set_value(slot->vsd, power_on);
|
||||
if (slot->vio)
|
||||
gpiod_set_value(slot->vio, power_on);
|
||||
if (power_on) {
|
||||
if (slot->vsd) {
|
||||
gpiod_set_value(slot->vsd, power_on);
|
||||
msleep(1);
|
||||
}
|
||||
if (slot->vio) {
|
||||
gpiod_set_value(slot->vio, power_on);
|
||||
msleep(1);
|
||||
}
|
||||
} else {
|
||||
if (slot->vio) {
|
||||
gpiod_set_value(slot->vio, power_on);
|
||||
msleep(50);
|
||||
}
|
||||
if (slot->vsd) {
|
||||
gpiod_set_value(slot->vsd, power_on);
|
||||
msleep(50);
|
||||
}
|
||||
}
|
||||
|
||||
if (slot->pdata->set_power != NULL)
|
||||
slot->pdata->set_power(mmc_dev(slot->mmc), slot->id, power_on,
|
||||
|
|
Loading…
Reference in a new issue