On Thu, Nov 5, 2009 at 6:39 PM, Anuj Aggarwal <anuj.aggarwal@xxxxxx> wrote:
> Supply names are renamed from vmmc -> mmc and vmmc_aux -> mmc_aux.
> This is done to have simple supply names both in the driver
> and in the board-evm file.
>
> Signed-off-by: Anuj Aggarwal <anuj.aggarwal@xxxxxx>
> ---
> arch/arm/mach-omap2/mmc-twl4030.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
> index 3403914..af3b1be 100644
> --- a/arch/arm/mach-omap2/mmc-twl4030.c
> +++ b/arch/arm/mach-omap2/mmc-twl4030.c
> @@ -109,9 +109,9 @@ static int twl_mmc_late_init(struct device *dev)
>
> hsmmc[i].mmc = mmc;
>
> - reg = regulator_get(dev, "vmmc");
> + reg = regulator_get(dev, "mmc");
It will break all existing OMAP3 boards.
> if (IS_ERR(reg)) {
> - dev_dbg(dev, "vmmc regulator missing\n");
> + dev_dbg(dev, "mmc regulator missing\n");
> /* HACK: until fixed.c regulator is usable,
> * we don't require a main regulator
> * for MMC2 or MMC3
> @@ -126,7 +126,7 @@ static int twl_mmc_late_init(struct device *dev)
> mmc->slots[0].ocr_mask = mmc_regulator_get_ocrmask(reg);
>
> /* allow an aux regulator */
> - reg = regulator_get(dev, "vmmc_aux");
> + reg = regulator_get(dev, "mmc_aux");
ditto.
> hsmmc[i].vcc_aux = IS_ERR(reg) ? NULL : reg;
>
> /* UGLY HACK: workaround regulator framework bugs.
> --
> 1.6.2.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Sincerely Yours,
Mike.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
