|
@@ -129,15 +129,11 @@ static void omap4_hsmmc1_before_set_reg(struct device *dev, int slot,
|
|
* Assume we power both OMAP VMMC1 (for CMD, CLK, DAT0..3) and the
|
|
* Assume we power both OMAP VMMC1 (for CMD, CLK, DAT0..3) and the
|
|
* card with Vcc regulator (from twl4030 or whatever). OMAP has both
|
|
* card with Vcc regulator (from twl4030 or whatever). OMAP has both
|
|
* 1.8V and 3.0V modes, controlled by the PBIAS register.
|
|
* 1.8V and 3.0V modes, controlled by the PBIAS register.
|
|
- *
|
|
|
|
- * In 8-bit modes, OMAP VMMC1A (for DAT4..7) needs a supply, which
|
|
|
|
- * is most naturally TWL VSIM; those pins also use PBIAS.
|
|
|
|
- *
|
|
|
|
- * FIXME handle VMMC1A as needed ...
|
|
|
|
*/
|
|
*/
|
|
reg = omap4_ctrl_pad_readl(control_pbias_offset);
|
|
reg = omap4_ctrl_pad_readl(control_pbias_offset);
|
|
reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
|
|
reg &= ~(OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
|
|
- OMAP4_MMC1_PWRDNZ_MASK);
|
|
|
|
|
|
+ OMAP4_MMC1_PWRDNZ_MASK |
|
|
|
|
+ OMAP4_MMC1_PBIASLITE_VMODE_MASK);
|
|
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
|
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -172,12 +168,6 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
|
|
reg &= ~(OMAP4_MMC1_PWRDNZ_MASK);
|
|
reg &= ~(OMAP4_MMC1_PWRDNZ_MASK);
|
|
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
|
omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
- reg = omap4_ctrl_pad_readl(control_pbias_offset);
|
|
|
|
- reg |= (OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK |
|
|
|
|
- OMAP4_MMC1_PWRDNZ_MASK |
|
|
|
|
- OMAP4_MMC1_PBIASLITE_VMODE_MASK);
|
|
|
|
- omap4_ctrl_pad_writel(reg, control_pbias_offset);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|