leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: omap_hsmmc: remove pbias workaround

Browse Source 
remove pbias workaround

Signed-off-by: Balaji T K <balajitk@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Florian Vaussard <florian.vaussard@epfl.ch>
Tested-by: Stefan Roese <sr@denx.de>
Signed-off-by: Chris Ball <chris@printf.net>
This commit is contained in:
Balaji T K 2014-02-19 20:26:40 +05:30 committed by Chris Ball
parent 12a7108787
commit 2cf171cb25
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,6 @@ struct omap_hsmmc_host {
struct regulator *vcc_aux; struct regulator *vcc_aux;
struct regulator *pbias; struct regulator *pbias;
bool pbias_enabled; bool pbias_enabled;
int pbias_disable;
void __iomem *base; void __iomem *base;
resource_size_t mapbase; resource_size_t mapbase;
spinlock_t irq_lock; /* Prevent races with irq handler */ spinlock_t irq_lock; /* Prevent races with irq handler */
@ -272,13 +271,6 @@ static int omap_hsmmc_set_power(struct device *dev, int slot, int power_on,
*/ */
if (!host->vcc) if (!host->vcc)
return 0; return 0;
/*
* With DT, never turn OFF the regulator for MMC1. This is because
* the pbias cell programming support is still missing when
* booting with Device tree
*/
if (host->pbias_disable && !vdd)
return 0;
if (mmc_slot(host).before_set_reg) if (mmc_slot(host).before_set_reg)
mmc_slot(host).before_set_reg(dev, slot, power_on, vdd); mmc_slot(host).before_set_reg(dev, slot, power_on, vdd);
@ -1543,13 +1535,7 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
* of external transceiver; but they all handle 1.8V. * of external transceiver; but they all handle 1.8V.
*/ */
if ((OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET) && if ((OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET) &&
(ios->vdd == DUAL_VOLT_OCR_BIT) && (ios->vdd == DUAL_VOLT_OCR_BIT)) {
/*
* With pbias cell programming missing, this
* can't be allowed on MMC1 when booting with device
* tree.
*/
!host->pbias_disable) {
/* /*
* The mmc_select_voltage fn of the core does * The mmc_select_voltage fn of the core does
* not seem to set the power_mode to * not seem to set the power_mode to
@ -1901,10 +1887,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
omap_hsmmc_context_save(host); omap_hsmmc_context_save(host);
/* This can be removed once we support PBIAS with DT */
if (host->dev->of_node && res->start == 0x4809c000)
host->pbias_disable = 1;
host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck"); host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
/* /*
* MMC can still work without debounce clock. * MMC can still work without debounce clock.