Pandora Sourcecodes - openembedded.git/blob

   1 From 2ad52b20e2f1cdb591a7ed027a01e6825eb45548 Mon Sep 17 00:00:00 2001
   2 From: Steve Sakoman <steve@sakoman.com>
   3 Date: Sun, 24 Jan 2010 09:33:56 -0800
   4 Subject: [PATCH 22/48] ARM: OMAP2: mmc-twl4030: move clock input selection prior to vcc test
   5
   6 otherwise it is not executed on systems that use non-twl regulators
   7 ---
   8  arch/arm/mach-omap2/hsmmc.c |   14 ++++++--------
   9  1 files changed, 6 insertions(+), 8 deletions(-)
  10
  11 diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
  12 index 34272e4..a74631d 100644
  13 --- a/arch/arm/mach-omap2/hsmmc.c
  14 +++ b/arch/arm/mach-omap2/hsmmc.c
  15 @@ -186,15 +186,13 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot,
  16         if (mmc->slots[0].remux)
  17                 mmc->slots[0].remux(dev, slot, power_on);
  18
  19 -       if (power_on) {
  20 -               /* Only MMC2 supports a CLKIN */
  21 -               if (mmc->slots[0].internal_clock) {
  22 -                       u32 reg;
  23 +       /* Only MMC2 supports a CLKIN */
  24 +       if (mmc->slots[0].internal_clock) {
  25 +               u32 reg;
  26
  27 -                       reg = omap_ctrl_readl(control_devconf1_offset);
  28 -                       reg |= OMAP2_MMCSDIO2ADPCLKISEL;
  29 -                       omap_ctrl_writel(reg, control_devconf1_offset);
  30 -               }
  31 +               reg = omap_ctrl_readl(control_devconf1_offset);
  32 +               reg |= OMAP2_MMCSDIO2ADPCLKISEL;
  33 +               omap_ctrl_writel(reg, control_devconf1_offset);
  34         }
  35  }
  36
  37 --
  38 1.6.6.1
  39