Re: [patch 2.6.29-rc7-omap 5/5] mmc-twl4030 uses regulator framework

[Adrian Hunter <adrian.hunter@nokia.com>]

David Brownell wrote:
> From: David Brownell <dbrownell@users.sourceforge.net>
> Subject: mmc-twl4030 uses regulator framework
> 
> Finish decoupling the HSMMC glue from the twl4030 as the only
> regulator provider, using the regulator framework instead.
> This makes the glue's "mmc-twl4030" name become a complete
> misnomer ... this code could probably all migrate into the
> HSMMC driver now.
> 
> Tested on 3430SDP (SD and low-voltage MMC) and Beagle (SD),
> plus some other boards (including Overo) after they were
> converted to set up MMC regulators properly.
> 
> Eventually all boards should just associate a regulator with
> each MMC controller they use.  In some cases (Overo MMC2 and
> Pandora MMC3, at least) that would be a fixed-voltage regulator
> with no real software control.  As a temporary hack (pending
> regulator-next updates to make the "fixed.c" regulator become
> usable) there's a new ocr_mask field for those boards.
> 
> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
> ---

snip

> @@ -349,24 +276,23 @@ static int twl_mmc2_set_power(struct dev
>                         reg |= OMAP2_MMCSDIO2ADPCLKISEL;
>                         omap_ctrl_writel(reg, control_devconf1_offset);
>                 }
> -               ret = twl_mmc_set_voltage(c, vdd);
> +               ret = mmc_regulator_set_ocr(c->vcc, vdd);
> +               /* enable interface voltage rail, if needed */
> +               if (ret == 0 && c->vcc_aux) {
> +                       ret = regulator_enable(c->vcc_aux);
> +                       if (ret < 0)
> +                               ret = mmc_regulator_set_ocr(c->vcc, 0);
> +               }
>         } else {
> -               ret = twl_mmc_set_voltage(c, 0);
> +               if (c->vcc_aux)
> +                       ret = regulator_enable(c->vcc_aux);

Sorry for slow reply.  Shouldn't that be regulator_disable() ?

> +               if (ret == 0)
> +                       ret = mmc_regulator_set_ocr(c->vcc, 0);
>         }
> 
>         return ret;
>  }
> 

snip