| Submitter | Aggarwal, Anuj |
|---|---|
| Date | 2009-11-05 16:39:49 |
| Message ID | <1257439189-29594-1-git-send-email-anuj.aggarwal@ti.com> |
| Download | mbox | patch |
| Permalink | /patch/57910/ |
| State | Awaiting Upstream, archived |
| Headers | show |
Comments
On Thu, Nov 5, 2009 at 6:39 PM, Anuj Aggarwal <anuj.aggarwal@ti.com> 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@ti.com> > --- > 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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
> -----Original Message----- > From: Mike Rapoport [mailto:mike.rapoport@gmail.com] > Sent: Friday, November 06, 2009 2:47 AM > To: Aggarwal, Anuj > Cc: linux-omap@vger.kernel.org; broonie@opensource.wolfsonmicro.com; > lrg@slimlogic.co.uk > Subject: Re: [PATCH 5/5] Regulator: Renaming the supplies used in MMC > driver > > On Thu, Nov 5, 2009 at 6:39 PM, Anuj Aggarwal <anuj.aggarwal@ti.com> > 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@ti.com> > > --- > > 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. [Aggarwal, Anuj] This was done to have the same naming conventions across the board. I could not find an extra "v" in supply names except MMC. Hence modified this. Regulator supply names should be simple and easy to understand. I can revert this change or change the dependent board files for SDP/LDP etc. What do you suggest? > > > 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@vger.kernel.org > > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Nov 6, 2009 at 7:51 AM, Aggarwal, Anuj <anuj.aggarwal@ti.com> wrote: >> -----Original Message----- >> From: Mike Rapoport [mailto:mike.rapoport@gmail.com] >> Sent: Friday, November 06, 2009 2:47 AM >> To: Aggarwal, Anuj >> Cc: linux-omap@vger.kernel.org; broonie@opensource.wolfsonmicro.com; >> lrg@slimlogic.co.uk >> Subject: Re: [PATCH 5/5] Regulator: Renaming the supplies used in MMC >> driver >> >> On Thu, Nov 5, 2009 at 6:39 PM, Anuj Aggarwal <anuj.aggarwal@ti.com> >> 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@ti.com> >> > --- >> > 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. > [Aggarwal, Anuj] This was done to have the same naming conventions across > the board. I could not find an extra "v" in supply names except MMC. > Hence modified this. Regulator supply names should be simple and easy to > understand. > I can revert this change or change the dependent board files for SDP/LDP > etc. What do you suggest? Extra 'v' letter that stands for "voltage" does not make naming conventions simpler. Moreover, VMMC, VDAC etc directly correspond to PMIC datasheet naming convention. Please revert the change and keep "v" in the regulator name. >> >> > 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@vger.kernel.org >> > More majordomo info at http://vger.kernel.org/majordomo-info.html >> > >> >> >> >> -- >> Sincerely Yours, >> Mike. > >
On Fri, Nov 06, 2009 at 11:21:14AM +0530, Aggarwal, Anuj wrote: > [Aggarwal, Anuj] This was done to have the same naming conventions across > the board. I could not find an extra "v" in supply names except MMC. > Hence modified this. Regulator supply names should be simple and easy to > understand. > I can revert this change or change the dependent board files for SDP/LDP > etc. What do you suggest? These names normally come from the names of the supplies in the datasheets for the consumer devices rather than the names of the rails on the boards - those would normally be specified as the names in the constraints where they are used for display purposes. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
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"); 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"); hsmmc[i].vcc_aux = IS_ERR(reg) ? NULL : reg; /* UGLY HACK: workaround regulator framework bugs.
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@ti.com> --- arch/arm/mach-omap2/mmc-twl4030.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)