AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-29 21:26:56 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

omap_hsmmc: Allow for a shared VccQ

Browse Source 
EMMC can have two voltage supplies, Vcc and VccQ
which are implemented in the code as consumer
supplies vmmc and vmmc_aux.

If the regulator that supplies vmmc_aux is shared
with other consumers, then sending it to sleep
will disrupt those consumers.  However, the
TWL4030-family regulators may have OFF remapped
to SLEEP, in which case 'regulator_disable()'
will put the regulator to sleep only when all
consumers are disabled - which is the desired
behaviour.

This patch adds a platform data field to allow
that option.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Adrian Hunter 2010-02-15 10:03:34 -08:00 committed by Tony Lindgren
parent 6da20c89af
commit e0eb242446
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap2/hsmmc.c
View File

@ -205,6 +205,9 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
if (c->no_off) if (c->no_off)
mmc->slots[0].no_off = 1; mmc->slots[0].no_off = 1;
if (c->vcc_aux_disable_is_sleep)
mmc->slots[0].vcc_aux_disable_is_sleep = 1;
/* NOTE: MMC slots should have a Vcc regulator set up. /* NOTE: MMC slots should have a Vcc regulator set up.
* This may be from a TWL4030-family chip, another * This may be from a TWL4030-family chip, another
* controllable regulator, or a fixed supply. * controllable regulator, or a fixed supply.

1
arch/arm/mach-omap2/hsmmc.h
View File

@ -15,6 +15,7 @@ struct omap2_hsmmc_info {
bool nonremovable; /* Nonremovable e.g. eMMC */ bool nonremovable; /* Nonremovable e.g. eMMC */
bool power_saving; /* Try to sleep or power off when possible */ bool power_saving; /* Try to sleep or power off when possible */
bool no_off; /* power_saving and power is not to go off */ bool no_off; /* power_saving and power is not to go off */
bool vcc_aux_disable_is_sleep; /* Regulator off remapped to sleep */
int gpio_cd; /* or -EINVAL */ int gpio_cd; /* or -EINVAL */
int gpio_wp; /* or -EINVAL */ int gpio_wp; /* or -EINVAL */
char *name; /* or NULL for default */ char *name; /* or NULL for default */

3
arch/arm/plat-omap/include/plat/mmc.h
View File

@ -99,6 +99,9 @@ struct omap_mmc_platform_data {
/* If using power_saving and the MMC power is not to go off */ /* If using power_saving and the MMC power is not to go off */
unsigned no_off:1; unsigned no_off:1;
/* Regulator off remapped to sleep */
unsigned vcc_aux_disable_is_sleep:1;
int switch_pin; /* gpio (card detect) */ int switch_pin; /* gpio (card detect) */
int gpio_wp; /* gpio (write protect) */ int gpio_wp; /* gpio (write protect) */

16
drivers/mmc/host/omap_hsmmc.c
View File

@ -347,7 +347,14 @@ static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep,
err = regulator_set_mode(host->vcc, mode); err = regulator_set_mode(host->vcc, mode);
if (err) if (err)
return err; return err;
return regulator_set_mode(host->vcc_aux, mode);
if (!mmc_slot(host).vcc_aux_disable_is_sleep)
return regulator_set_mode(host->vcc_aux, mode);
if (sleep)
return regulator_disable(host->vcc_aux);
else
return regulator_enable(host->vcc_aux);
} }
static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata) static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
@ -1982,6 +1989,13 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
else else
mmc->ops = &omap_hsmmc_ops; mmc->ops = &omap_hsmmc_ops;
/*
* If regulator_disable can only put vcc_aux to sleep then there is
* no off state.
*/
if (mmc_slot(host).vcc_aux_disable_is_sleep)
mmc_slot(host).no_off = 1;
mmc->f_min = 400000; mmc->f_min = 400000;
mmc->f_max = 52000000; mmc->f_max = 52000000;