Permalink
Browse files

ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test

otherwise it is not executed on systems that use non-twl regulators
  • Loading branch information...
1 parent d968ff3 commit 9e5971bd49bc8310589b9b69189beb8625eb69db @sakoman sakoman committed Jan 24, 2010
Showing with 6 additions and 8 deletions.
  1. +6 −8 arch/arm/mach-omap2/hsmmc.c
View
14 arch/arm/mach-omap2/hsmmc.c
@@ -186,15 +186,13 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot,
if (mmc->slots[0].remux)
mmc->slots[0].remux(dev, slot, power_on);
- if (power_on) {
- /* Only MMC2 supports a CLKIN */
- if (mmc->slots[0].internal_clock) {
- u32 reg;
+ /* Only MMC2 supports a CLKIN */
+ if (mmc->slots[0].internal_clock) {
+ u32 reg;
- reg = omap_ctrl_readl(control_devconf1_offset);
- reg |= OMAP2_MMCSDIO2ADPCLKISEL;
- omap_ctrl_writel(reg, control_devconf1_offset);
- }
+ reg = omap_ctrl_readl(control_devconf1_offset);
+ reg |= OMAP2_MMCSDIO2ADPCLKISEL;
+ omap_ctrl_writel(reg, control_devconf1_offset);
}
}

0 comments on commit 9e5971b

Please sign in to comment.