* [PATCH 5/5] Regulator: Renaming the supplies used in MMC driver
@ 2009-11-05 16:39 Anuj Aggarwal
2009-11-05 21:17 ` Mike Rapoport
0 siblings, 1 reply; 5+ messages in thread
From: Anuj Aggarwal @ 2009-11-05 16:39 UTC (permalink / raw)
To: linux-omap; +Cc: broonie, lrg, Anuj Aggarwal
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");
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.
--
1.6.2.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] Regulator: Renaming the supplies used in MMC driver
2009-11-05 16:39 [PATCH 5/5] Regulator: Renaming the supplies used in MMC driver Anuj Aggarwal
@ 2009-11-05 21:17 ` Mike Rapoport
2009-11-06 5:51 ` Aggarwal, Anuj
0 siblings, 1 reply; 5+ messages in thread
From: Mike Rapoport @ 2009-11-05 21:17 UTC (permalink / raw)
To: Anuj Aggarwal; +Cc: linux-omap, broonie, lrg
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
>
--
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH 5/5] Regulator: Renaming the supplies used in MMC driver
2009-11-05 21:17 ` Mike Rapoport
@ 2009-11-06 5:51 ` Aggarwal, Anuj
2009-11-06 14:28 ` Mike Rapoport
2009-11-06 15:12 ` Mark Brown
0 siblings, 2 replies; 5+ messages in thread
From: Aggarwal, Anuj @ 2009-11-06 5:51 UTC (permalink / raw)
To: Mike Rapoport
Cc: linux-omap@vger.kernel.org, broonie@opensource.wolfsonmicro.com,
lrg@slimlogic.co.uk
> -----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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] Regulator: Renaming the supplies used in MMC driver
2009-11-06 5:51 ` Aggarwal, Anuj
@ 2009-11-06 14:28 ` Mike Rapoport
2009-11-06 15:12 ` Mark Brown
1 sibling, 0 replies; 5+ messages in thread
From: Mike Rapoport @ 2009-11-06 14:28 UTC (permalink / raw)
To: Aggarwal, Anuj
Cc: linux-omap@vger.kernel.org, broonie@opensource.wolfsonmicro.com,
lrg@slimlogic.co.uk
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.
>
>
--
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] Regulator: Renaming the supplies used in MMC driver
2009-11-06 5:51 ` Aggarwal, Anuj
2009-11-06 14:28 ` Mike Rapoport
@ 2009-11-06 15:12 ` Mark Brown
1 sibling, 0 replies; 5+ messages in thread
From: Mark Brown @ 2009-11-06 15:12 UTC (permalink / raw)
To: Aggarwal, Anuj
Cc: Mike Rapoport, linux-omap@vger.kernel.org, lrg@slimlogic.co.uk
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-11-06 15:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-05 16:39 [PATCH 5/5] Regulator: Renaming the supplies used in MMC driver Anuj Aggarwal
2009-11-05 21:17 ` Mike Rapoport
2009-11-06 5:51 ` Aggarwal, Anuj
2009-11-06 14:28 ` Mike Rapoport
2009-11-06 15:12 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox