mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 14:27:48 +00:00
Koen Kooi
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 66bba5baf225a1420c734aa0268e7dd37fc3f73b Mon Sep 17 00:00:00 2001
|
|
From: Steve Sakoman <steve@sakoman.com>
|
|
Date: Sun, 24 Jan 2010 09:33:56 -0800
|
|
Subject: [PATCH 24/28] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test
|
|
|
|
otherwise it is not executed on systems that use non-twl regulators
|
|
---
|
|
arch/arm/mach-omap2/hsmmc.c | 14 ++++++--------
|
|
1 files changed, 6 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
|
|
index 34272e4..a74631d 100644
|
|
--- a/arch/arm/mach-omap2/hsmmc.c
|
|
+++ b/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);
|
|
}
|
|
}
|
|
|
|
--
|
|
1.6.6.1
|
|
|