[PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Lee Jones]

The 'name' field in 'struct of_regulator_match' expects to match with
its corresponding regulator device node in the Device Tree. This patch
renames each of the regulators in the ab8500 regulator driver so this
is true.

Cc: linux-kernel@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/regulator/ab8500.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index e1b8c54..a739f5c 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -794,17 +794,17 @@ static __devinit int ab8500_regulator_register(struct platform_device *pdev,
 }
 
 static struct of_regulator_match ab8500_regulator_matches[] = {
-	{ .name	= "LDO-AUX1",    .driver_data = (void *) AB8500_LDO_AUX1, },
-	{ .name	= "LDO-AUX2",    .driver_data = (void *) AB8500_LDO_AUX2, },
-	{ .name	= "LDO-AUX3",    .driver_data = (void *) AB8500_LDO_AUX3, },
-	{ .name	= "LDO-INTCORE", .driver_data = (void *) AB8500_LDO_INTCORE, },
-	{ .name	= "LDO-TVOUT",   .driver_data = (void *) AB8500_LDO_TVOUT, },
-	{ .name = "LDO-USB",     .driver_data = (void *) AB8500_LDO_USB, },
-	{ .name = "LDO-AUDIO",   .driver_data = (void *) AB8500_LDO_AUDIO, },
-	{ .name	= "LDO-ANAMIC1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
-	{ .name	= "LDO-ANAMIC2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
-	{ .name	= "LDO-DMIC",    .driver_data = (void *) AB8500_LDO_DMIC, },
-	{ .name	= "LDO-ANA",     .driver_data = (void *) AB8500_LDO_ANA, },
+	{ .name	= "ab8500_ldo_aux1",    .driver_data = (void *) AB8500_LDO_AUX1, },
+	{ .name	= "ab8500_ldo_aux2",    .driver_data = (void *) AB8500_LDO_AUX2, },
+	{ .name	= "ab8500_ldo_aux3",    .driver_data = (void *) AB8500_LDO_AUX3, },
+	{ .name	= "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, },
+	{ .name	= "ab8500_ldo_tvout",   .driver_data = (void *) AB8500_LDO_TVOUT, },
+	{ .name = "ab8500_ldo_usb",     .driver_data = (void *) AB8500_LDO_USB, },
+	{ .name = "ab8500_ldo_audio",   .driver_data = (void *) AB8500_LDO_AUDIO, },
+	{ .name	= "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
+	{ .name	= "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
+	{ .name	= "ab8500_ldo_dmic",    .driver_data = (void *) AB8500_LDO_DMIC, },
+	{ .name	= "ab8500_ldo_ana",     .driver_data = (void *) AB8500_LDO_ANA, },
 };
 
 static __devinit int
-- 
1.7.9.5

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Linus Walleij]

On Wed, May 30, 2012 at 12:47 PM, Lee Jones <lee.jones@linaro.org> wrote:

> The 'name' field in 'struct of_regulator_match' expects to match with
> its corresponding regulator device node in the Device Tree. This patch
> renames each of the regulators in the ab8500 regulator driver so this
> is true.

OK...

>  static struct of_regulator_match ab8500_regulator_matches[] = {
> -       { .name = "LDO-AUX1",    .driver_data = (void *) AB8500_LDO_AUX1, },
> -       { .name = "LDO-AUX2",    .driver_data = (void *) AB8500_LDO_AUX2, },
> -       { .name = "LDO-AUX3",    .driver_data = (void *) AB8500_LDO_AUX3, },
> -       { .name = "LDO-INTCORE", .driver_data = (void *) AB8500_LDO_INTCORE, },
> -       { .name = "LDO-TVOUT",   .driver_data = (void *) AB8500_LDO_TVOUT, },
> -       { .name = "LDO-USB",     .driver_data = (void *) AB8500_LDO_USB, },
> -       { .name = "LDO-AUDIO",   .driver_data = (void *) AB8500_LDO_AUDIO, },
> -       { .name = "LDO-ANAMIC1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
> -       { .name = "LDO-ANAMIC2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
> -       { .name = "LDO-DMIC",    .driver_data = (void *) AB8500_LDO_DMIC, },
> -       { .name = "LDO-ANA",     .driver_data = (void *) AB8500_LDO_ANA, },
> +       { .name = "ab8500_ldo_aux1",    .driver_data = (void *) AB8500_LDO_AUX1, },
> +       { .name = "ab8500_ldo_aux2",    .driver_data = (void *) AB8500_LDO_AUX2, },
> +       { .name = "ab8500_ldo_aux3",    .driver_data = (void *) AB8500_LDO_AUX3, },
> +       { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, },
> +       { .name = "ab8500_ldo_tvout",   .driver_data = (void *) AB8500_LDO_TVOUT, },
> +       { .name = "ab8500_ldo_usb",     .driver_data = (void *) AB8500_LDO_USB, },
> +       { .name = "ab8500_ldo_audio",   .driver_data = (void *) AB8500_LDO_AUDIO, },
> +       { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
> +       { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
> +       { .name = "ab8500_ldo_dmic",    .driver_data = (void *) AB8500_LDO_DMIC, },
> +       { .name = "ab8500_ldo_ana",     .driver_data = (void *) AB8500_LDO_ANA, },
>  };

So why is the device tree going to use these lowercase names etc?
I guess there is a rationale...

Anyway: the name is used in more parts of the file, so please change
it everywhere if you change it.

Yours,
Linus Walleij

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

On Wed, May 30, 2012 at 02:58:44PM +0800, Linus Walleij wrote:
> On Wed, May 30, 2012 at 12:47 PM, Lee Jones <lee.jones@linaro.org> wrote:

> > +       { .name = "ab8500_ldo_ana",     .driver_data = (void *) AB8500_LDO_ANA, },

> So why is the device tree going to use these lowercase names etc?
> I guess there is a rationale...

If we are changing the names then not including the ab8500 bit would
seem more idiomatic - we've already worked out which chip this is by the
time we're looking here.

> Anyway: the name is used in more parts of the file, so please change
> it everywhere if you change it.

It's only used for a few debug prints AFAICT?

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

On Wed, May 30, 2012 at 07:40:49PM +0800, Lee Jones wrote:
> On May 30, 2012 6:03 PM, "Mark Brown" <broonie@opensource.wolfsonmicro.com>

> > If we are changing the names then not including the ab8500 bit would
> > seem more idiomatic - we've already worked out which chip this is by the
> > time we're looking here.

> No, Linus had the wrong end of the stick. I've just spoken to him in person.

> Those are not the names of the regulators. They're the names of the Device
> Tree nodes. The regulator names shall remain the same.

Fair enough.  My point about the ab8500_ bit still stands though.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Lee Jones]

On 30/05/12 20:15, Mark Brown wrote:
> On Wed, May 30, 2012 at 07:40:49PM +0800, Lee Jones wrote:
>> On May 30, 2012 6:03 PM, "Mark Brown"<broonie@opensource.wolfsonmicro.com>
>
>>> If we are changing the names then not including the ab8500 bit would
>>> seem more idiomatic - we've already worked out which chip this is by the
>>> time we're looking here.
>
>> No, Linus had the wrong end of the stick. I've just spoken to him in person.
>
>> Those are not the names of the regulators. They're the names of the Device
>> Tree nodes. The regulator names shall remain the same.
>
> Fair enough.  My point about the ab8500_ bit still stands though.

It's a Device Tree thing. I do it so we can easily see which regulator 
is driving which device(s).

I personally think:

	vin-supply = <&db8500_vape_reg>;
	vmmc-supply = <&ab8500_ldo_aux2_reg>;

Tells us so much more and is simpler to decrypt at a glance than 
something like:

	vin-supply = <&vape_reg>;
	vmmc-supply = <&ldo_aux2_reg>;

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

On Wed, May 30, 2012 at 11:01:06PM +0800, Lee Jones wrote:
> On 30/05/12 20:15, Mark Brown wrote:

> I personally think:

> 	vin-supply = <&db8500_vape_reg>;
> 	vmmc-supply = <&ab8500_ldo_aux2_reg>;

Oh, oops.  This is going to be fun when someone puts down two of the
same PMIC on a system...

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Lee Jones]

On 30/05/12 23:11, Mark Brown wrote:
> On Wed, May 30, 2012 at 11:01:06PM +0800, Lee Jones wrote:
>> On 30/05/12 20:15, Mark Brown wrote:
>
>> I personally think:
>
>> 	vin-supply =<&db8500_vape_reg>;
>> 	vmmc-supply =<&ab8500_ldo_aux2_reg>;
>
> Oh, oops.  This is going to be fun when someone puts down two of the
> same PMIC on a system...

What does that mean sorry?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

On Wed, May 30, 2012 at 11:22:33PM +0800, Lee Jones wrote:
> On 30/05/12 23:11, Mark Brown wrote:

> >>	vin-supply =<&db8500_vape_reg>;
> >>	vmmc-supply =<&ab8500_ldo_aux2_reg>;

> >Oh, oops.  This is going to be fun when someone puts down two of the
> >same PMIC on a system...

> What does that mean sorry?

Lots of regulators are using this mechanism for identifying child nodes.
If the node name is also used as a handle by other things to reference
the regulator then if you have two PMICs of the same type DTC isn't
going to be able to figure out which node you mean.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Lee Jones]

On 31/05/12 00:41, Mark Brown wrote:
> On Wed, May 30, 2012 at 11:22:33PM +0800, Lee Jones wrote:
>> On 30/05/12 23:11, Mark Brown wrote:
>
>>>> 	vin-supply =<&db8500_vape_reg>;
>>>> 	vmmc-supply =<&ab8500_ldo_aux2_reg>;
>
>>> Oh, oops.  This is going to be fun when someone puts down two of the
>>> same PMIC on a system...
>
>> What does that mean sorry?
>
> Lots of regulators are using this mechanism for identifying child nodes.
> If the node name is also used as a handle by other things to reference
> the regulator then if you have two PMICs of the same type DTC isn't
> going to be able to figure out which node you mean.

I haven't looked at the code yet, so I don't know the answer to this 
question, but; aren't they protected by the compatible string? If not, I 
think they should be. We shouldn't be parsing other platform's Device Trees.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Lee Jones]

On 31/05/12 00:41, Mark Brown wrote:
> On Wed, May 30, 2012 at 11:22:33PM +0800, Lee Jones wrote:
>> On 30/05/12 23:11, Mark Brown wrote:
>
>>>> 	vin-supply =<&db8500_vape_reg>;
>>>> 	vmmc-supply =<&ab8500_ldo_aux2_reg>;
>
>>> Oh, oops.  This is going to be fun when someone puts down two of the
>>> same PMIC on a system...
>
>> What does that mean sorry?
>
> Lots of regulators are using this mechanism for identifying child nodes.
> If the node name is also used as a handle by other things to reference
> the regulator then if you have two PMICs of the same type DTC isn't
> going to be able to figure out which node you mean.

Yes, so it doesn't look like this is an issue.

This:

> sdi@80126000 {
>          vmmc-supply = <&ab8500_ldo_aux3_reg>;
> };

Is the same as, and will cause no more issues than:

> static struct regulator_consumer_supply ab8500_vaux3_consumers[] = {
>         REGULATOR_SUPPLY("vmmc", "sdi0"),
> };

... because only nodes which we care about (dictated by compatible 
declaration protections) will be parsed. So different platforms will not 
affect each other.

Kind regards,
Lee

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 694 bytes --]

On Fri, Jun 01, 2012 at 12:36:28PM +0800, Lee Jones wrote:

> This:

> >sdi@80126000 {
> >         vmmc-supply = <&ab8500_ldo_aux3_reg>;
> >};

> Is the same as, and will cause no more issues than:

> >static struct regulator_consumer_supply ab8500_vaux3_consumers[] = {
> >        REGULATOR_SUPPLY("vmmc", "sdi0"),
> >};

> ... because only nodes which we care about (dictated by compatible
> declaration protections) will be parsed. So different platforms will
> not affect each other.

What makes you say the two are equivalent?  The former is a reference
from a consumer device to a named regulator while the latter is a
reference from a regulator to a named consumer.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Lee Jones]

On 01/06/12 09:48, Mark Brown wrote:
> On Fri, Jun 01, 2012 at 12:36:28PM +0800, Lee Jones wrote:
>
>> This:
>
>>> sdi@80126000 {
>>>          vmmc-supply =<&ab8500_ldo_aux3_reg>;
>>> };
>
>> Is the same as, and will cause no more issues than:
>
>>> static struct regulator_consumer_supply ab8500_vaux3_consumers[] = {
>>>         REGULATOR_SUPPLY("vmmc", "sdi0"),
>>> };
>
>> ... because only nodes which we care about (dictated by compatible
>> declaration protections) will be parsed. So different platforms will
>> not affect each other.
>
> What makes you say the two are equivalent?  The former is a reference
> from a consumer device to a named regulator while the latter is a
> reference from a regulator to a named consumer.

I mean they both link regulator<->consumer and apply the name "vmmc" to 
the supply, or am I missing something / getting confused?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

On Tue, Jun 05, 2012 at 11:31:24AM +0100, Lee Jones wrote:
> On 01/06/12 09:48, Mark Brown wrote:

> >What makes you say the two are equivalent?  The former is a reference
> >from a consumer device to a named regulator while the latter is a
> >reference from a regulator to a named consumer.

> I mean they both link regulator<->consumer and apply the name "vmmc"
> to the supply, or am I missing something / getting confused?

You're missing something - note what I say above about the direction the
mapping is done in, and consider what happens if we've got two of the
same PMIC down in a system.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Lee Jones]

On 05/06/12 11:38, Mark Brown wrote:
> On Tue, Jun 05, 2012 at 11:31:24AM +0100, Lee Jones wrote:
>> On 01/06/12 09:48, Mark Brown wrote:
>
>>> What makes you say the two are equivalent?  The former is a reference
>> >from a consumer device to a named regulator while the latter is a
>>> reference from a regulator to a named consumer.
>
>> I mean they both link regulator<->consumer and apply the name "vmmc"
>> to the supply, or am I missing something / getting confused?
>
> You're missing something - note what I say above about the direction the
> mapping is done in, and consider what happens if we've got two of the
> same PMIC down in a system.

I'm still not seeing how this would cause an issue. The only Device Tree 
nodes which will be parsed are the ones which are specified by a 
particular driver's compatible string, meaning that any other nodes 
referencing similar regulator/supply names would be ignored. In case I 
am still missing a critical point here, would you be kind enough to 
provide an example that we can work though together?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

On Mon, Jun 11, 2012 at 11:27:53AM +0100, Lee Jones wrote:
> On 05/06/12 11:38, Mark Brown wrote:

> >You're missing something - note what I say above about the direction the
> >mapping is done in, and consider what happens if we've got two of the
> >same PMIC down in a system.

> I'm still not seeing how this would cause an issue. The only Device
> Tree nodes which will be parsed are the ones which are specified by
> a particular driver's compatible string, meaning that any other
> nodes referencing similar regulator/supply names would be ignored.

Suppose you have two devices of the same type with an array of name
based regulators, meaning the nodes with constraints have to have a
particular name in order to be matched to the regulator.  How would a
consumer reference a node to specify a supply?

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Lee Jones]

On 11/06/12 11:36, Mark Brown wrote:
> On Mon, Jun 11, 2012 at 11:27:53AM +0100, Lee Jones wrote:
>> On 05/06/12 11:38, Mark Brown wrote:
>
>>> You're missing something - note what I say above about the direction the
>>> mapping is done in, and consider what happens if we've got two of the
>>> same PMIC down in a system.
>
>> I'm still not seeing how this would cause an issue. The only Device
>> Tree nodes which will be parsed are the ones which are specified by
>> a particular driver's compatible string, meaning that any other
>> nodes referencing similar regulator/supply names would be ignored.
>
> Suppose you have two devices of the same type with an array of name
> based regulators, meaning the nodes with constraints have to have a
> particular name in order to be matched to the regulator.  How would a
> consumer reference a node to specify a supply?

some-regulators {
     compatible = "protect_me_from_similarly_named_regulators";

     regulator_node_name_reg: regulator_node_name {
         <blah>
     };
};

[supply_name]-supply = <&regulator_node_name>;

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 913 bytes --]

On Mon, Jun 11, 2012 at 12:28:57PM +0100, Lee Jones wrote:
> On 11/06/12 11:36, Mark Brown wrote:

> >Suppose you have two devices of the same type with an array of name
> >based regulators, meaning the nodes with constraints have to have a
> >particular name in order to be matched to the regulator.  How would a
> >consumer reference a node to specify a supply?

> some-regulators {
>     compatible = "protect_me_from_similarly_named_regulators";
> 
>     regulator_node_name_reg: regulator_node_name {
>         <blah>
>     };
> };

> [supply_name]-supply = <&regulator_node_name>;

I'm not 100% sure you read what I wrote above or in all the previous
mails about having two devices of the same type?  The case where we have
only one regulator of a given type obviously works otherwise people
would have noticed, the problem starts when you have two of the same
regulator device down.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Linus Walleij]

On Wed, May 30, 2012 at 2:58 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Wed, May 30, 2012 at 12:47 PM, Lee Jones <lee.jones@linaro.org> wrote:
>
>> The 'name' field in 'struct of_regulator_match' expects to match with
>> its corresponding regulator device node in the Device Tree. This patch
>> renames each of the regulators in the ab8500 regulator driver so this
>> is true.
>
> Anyway: the name is used in more parts of the file, so please change
> it everywhere if you change it.

I was wrong on this, ignore that comment. I understand this now...
Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

On Wed, May 30, 2012 at 12:47:26PM +0800, Lee Jones wrote:
> The 'name' field in 'struct of_regulator_match' expects to match with
> its corresponding regulator device node in the Device Tree. This patch
> renames each of the regulators in the ab8500 regulator driver so this
> is true.

Applied both, thanks.

> Cc: linux-kernel@vger.kernel.org

It's helpful to avoid inclding things like this (I mostly point this out
as you've got a much wider CC list so you clearly have some other system
that you're using to track where to send things).

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Lee Jones]

The 'name' field in 'struct of_regulator_match' expects to match with
its corresponding regulator device node in the Device Tree. This patch
renames each of the regulators in the db8500-prcum regulator driver so
this is true.

Cc: linux-kernel@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/regulator/db8500-prcmu.c |   40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
index 968f97f..9dbb491 100644
--- a/drivers/regulator/db8500-prcmu.c
+++ b/drivers/regulator/db8500-prcmu.c
@@ -452,26 +452,26 @@ static __devinit int db8500_regulator_register(struct platform_device *pdev,
 }
 
 static struct of_regulator_match db8500_regulator_matches[] = {
-	{ .name	= "db8500-vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
-	{ .name	= "db8500-varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
-	{ .name	= "db8500-vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
-	{ .name	= "db8500-vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
-	{ .name	= "db8500-vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
-	{ .name	= "db8500-vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
-	{ .name	= "db8500-vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
-	{ .name	= "db8500-vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
-	{ .name	= "db8500-sva-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
-	{ .name	= "db8500-sva-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
-	{ .name	= "db8500-sva-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
-	{ .name	= "db8500-sia-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
-	{ .name	= "db8500-sia-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
-	{ .name	= "db8500-sia-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
-	{ .name	= "db8500-sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
-	{ .name	= "db8500-b2r2-mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
-	{ .name	= "db8500-esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
-	{ .name	= "db8500-esram12-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
-	{ .name	= "db8500-esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
-	{ .name	= "db8500-esram34-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
+	{ .name	= "db8500_vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
+	{ .name	= "db8500_varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
+	{ .name	= "db8500_vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
+	{ .name	= "db8500_vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
+	{ .name	= "db8500_vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
+	{ .name	= "db8500_vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
+	{ .name	= "db8500_vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
+	{ .name	= "db8500_vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
+	{ .name	= "db8500_sva_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
+	{ .name	= "db8500_sva_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
+	{ .name	= "db8500_sva_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
+	{ .name	= "db8500_sia_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
+	{ .name	= "db8500_sia_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
+	{ .name	= "db8500_sia_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
+	{ .name	= "db8500_sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
+	{ .name	= "db8500_b2r2_mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
+	{ .name	= "db8500_esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
+	{ .name	= "db8500_esram12_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
+	{ .name	= "db8500_esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
+	{ .name	= "db8500_esram34_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
 };
 
 static __devinit int
-- 
1.7.9.5

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Linus Walleij]

On Wed, May 30, 2012 at 12:47 PM, Lee Jones <lee.jones@linaro.org> wrote:

>  static struct of_regulator_match db8500_regulator_matches[] = {
> -       { .name = "db8500-vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
> -       { .name = "db8500-varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
> -       { .name = "db8500-vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
> -       { .name = "db8500-vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
> -       { .name = "db8500-vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
> -       { .name = "db8500-vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
> -       { .name = "db8500-vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
> -       { .name = "db8500-vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
> -       { .name = "db8500-sva-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
> -       { .name = "db8500-sva-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
> -       { .name = "db8500-sva-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
> -       { .name = "db8500-sia-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
> -       { .name = "db8500-sia-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
> -       { .name = "db8500-sia-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
> -       { .name = "db8500-sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
> -       { .name = "db8500-b2r2-mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
> -       { .name = "db8500-esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
> -       { .name = "db8500-esram12-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
> -       { .name = "db8500-esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
> -       { .name = "db8500-esram34-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
> +       { .name = "db8500_vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
> +       { .name = "db8500_varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
> +       { .name = "db8500_vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
> +       { .name = "db8500_vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
> +       { .name = "db8500_vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
> +       { .name = "db8500_vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
> +       { .name = "db8500_vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
> +       { .name = "db8500_vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
> +       { .name = "db8500_sva_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
> +       { .name = "db8500_sva_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
> +       { .name = "db8500_sva_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
> +       { .name = "db8500_sia_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
> +       { .name = "db8500_sia_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
> +       { .name = "db8500_sia_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
> +       { .name = "db8500_sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
> +       { .name = "db8500_b2r2_mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
> +       { .name = "db8500_esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
> +       { .name = "db8500_esram12_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
> +       { .name = "db8500_esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
> +       { .name = "db8500_esram34_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },

So again what is the rationale for changing the names, and
again the strings are in several places in this file.

Yours,
Linus Walleij

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Lee Jones]

Hi Mark,

Are you sending this for -rc2?

Kind regards,
Lee

On 30/05/12 05:47, Lee Jones wrote:
> The 'name' field in 'struct of_regulator_match' expects to match with
> its corresponding regulator device node in the Device Tree. This patch
> renames each of the regulators in the db8500-prcum regulator driver so
> this is true.
>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Lee Jones<lee.jones@linaro.org>
> ---
>   drivers/regulator/db8500-prcmu.c |   40 +++++++++++++++++++-------------------
>   1 file changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
> index 968f97f..9dbb491 100644
> --- a/drivers/regulator/db8500-prcmu.c
> +++ b/drivers/regulator/db8500-prcmu.c
> @@ -452,26 +452,26 @@ static __devinit int db8500_regulator_register(struct platform_device *pdev,
>   }
>
>   static struct of_regulator_match db8500_regulator_matches[] = {
> -	{ .name	= "db8500-vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
> -	{ .name	= "db8500-varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
> -	{ .name	= "db8500-vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
> -	{ .name	= "db8500-vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
> -	{ .name	= "db8500-vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
> -	{ .name	= "db8500-vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
> -	{ .name	= "db8500-vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
> -	{ .name	= "db8500-vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
> -	{ .name	= "db8500-sva-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
> -	{ .name	= "db8500-sva-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
> -	{ .name	= "db8500-sva-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
> -	{ .name	= "db8500-sia-mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
> -	{ .name	= "db8500-sia-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
> -	{ .name	= "db8500-sia-pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
> -	{ .name	= "db8500-sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
> -	{ .name	= "db8500-b2r2-mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
> -	{ .name	= "db8500-esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
> -	{ .name	= "db8500-esram12-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
> -	{ .name	= "db8500-esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
> -	{ .name	= "db8500-esram34-ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
> +	{ .name	= "db8500_vape",          .driver_data = (void *) DB8500_REGULATOR_VAPE, },
> +	{ .name	= "db8500_varm",          .driver_data = (void *) DB8500_REGULATOR_VARM, },
> +	{ .name	= "db8500_vmodem",        .driver_data = (void *) DB8500_REGULATOR_VMODEM, },
> +	{ .name	= "db8500_vpll",          .driver_data = (void *) DB8500_REGULATOR_VPLL, },
> +	{ .name	= "db8500_vsmps1",        .driver_data = (void *) DB8500_REGULATOR_VSMPS1, },
> +	{ .name	= "db8500_vsmps2",        .driver_data = (void *) DB8500_REGULATOR_VSMPS2, },
> +	{ .name	= "db8500_vsmps3",        .driver_data = (void *) DB8500_REGULATOR_VSMPS3, },
> +	{ .name	= "db8500_vrf1",          .driver_data = (void *) DB8500_REGULATOR_VRF1, },
> +	{ .name	= "db8500_sva_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, },
> +	{ .name	= "db8500_sva_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, },
> +	{ .name	= "db8500_sva_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, },
> +	{ .name	= "db8500_sia_mmdsp",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, },
> +	{ .name	= "db8500_sia_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, },
> +	{ .name	= "db8500_sia_pipe",      .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, },
> +	{ .name	= "db8500_sga",           .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, },
> +	{ .name	= "db8500_b2r2_mcde",     .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, },
> +	{ .name	= "db8500_esram12",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, },
> +	{ .name	= "db8500_esram12_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, },
> +	{ .name	= "db8500_esram34",       .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, },
> +	{ .name	= "db8500_esram34_ret",   .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
>   };
>
>   static __devinit int


-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

On Tue, Jun 05, 2012 at 11:24:24AM +0100, Lee Jones wrote:

Don't top post!

> Are you sending this for -rc2?

No, nothing about this looks like an urgent fix?

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Lee Jones]

> Don't top post!

=:)

>> Are you sending this for -rc2?
>
> No, nothing about this looks like an urgent fix?

Well without it all regulator requests from DT will fail.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

On Tue, Jun 05, 2012 at 11:34:12AM +0100, Lee Jones wrote:

> >>Are you sending this for -rc2?

> >No, nothing about this looks like an urgent fix?

> Well without it all regulator requests from DT will fail.

Oh, ffs.  Why wasn't this mentioned when the patch was posted, and how
were the original patches tested?

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Lee Jones]

On 05/06/12 11:42, Mark Brown wrote:
> On Tue, Jun 05, 2012 at 11:34:12AM +0100, Lee Jones wrote:
>
>>>> Are you sending this for -rc2?
>
>>> No, nothing about this looks like an urgent fix?
>
>> Well without it all regulator requests from DT will fail.
>
> Oh, ffs.  Why wasn't this mentioned when the patch was posted,

I did. My 00 patch mentioned that these were all clean-ups/bug fixes 
destined for the for RCs.

> and how were the original patches tested?

So it looks like this may have been my fault when testing the patch-set 
before this one. There are some hacks required to test Device Tree with 
Snowball at the moment, as the u-boot we use isn't DT compatible yet. I 
_may_ have (i.e. my best guess is that I) tested the patch-set in it's 
purest form, thus omitting the ARM_APPENDED_DTB_FILE hack required to 
append the DTB onto the kernel. Without it, the kernel just boots using 
the original platform code.

A genuine mistake on my part for which I unreservedly apologise.

Nevertheless, these two patches are required for a decent boot.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 841 bytes --]

On Mon, Jun 11, 2012 at 12:21:00PM +0100, Lee Jones wrote:
> On 05/06/12 11:42, Mark Brown wrote:
> >On Tue, Jun 05, 2012 at 11:34:12AM +0100, Lee Jones wrote:

> >>Well without it all regulator requests from DT will fail.

> >Oh, ffs.  Why wasn't this mentioned when the patch was posted,

> I did. My 00 patch mentioned that these were all clean-ups/bug fixes
> destined for the for RCs.

You didn't CC me on that as far as I can tell so I never saw it, and
even if you had it's rather burying the lead with a large series of what
mostly looks like random cleanups from the bits I see in my archive.  I
think I assumed another patch in the series changed the names in the
device tree or added the device tree.

> Nevertheless, these two patches are required for a decent boot.

Fail.  Well, I guess I'll end up dulplicating the commits :/

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Lee Jones]

>> Nevertheless, these two patches are required for a decent boot.
>
> Fail.

I'm well aware of that, hence why I submitted the fix.

 > Well, I guess I'll end up dulplicating the commits :/

Duplicating them?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Lee Jones]

>> Well, I guess I'll end up dulplicating the commits :/
>
> Duplicating them?

Ah, you mean that you've already sent them to -next?

That's no problem though. Won't Git just sling them out at pull-time?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

On Mon, Jun 11, 2012 at 03:07:43PM +0100, Lee Jones wrote:
> >>Well, I guess I'll end up dulplicating the commits :/

> >Duplicating them?

> Ah, you mean that you've already sent them to -next?

Yeah, I've already got them on a branch I don't really want to rebase.

> That's no problem though. Won't Git just sling them out at pull-time?

It'll merge out fine, it's just icky having the same thing appear twice
in history.  Not the end of the world.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Lee Jones]

On 11/06/12 15:27, Mark Brown wrote:
> On Mon, Jun 11, 2012 at 03:07:43PM +0100, Lee Jones wrote:
>>>> Well, I guess I'll end up dulplicating the commits :/
>
>>> Duplicating them?
>
>> Ah, you mean that you've already sent them to -next?
>
> Yeah, I've already got them on a branch I don't really want to rebase.

Ah I see. Makes sense.

>> That's no problem though. Won't Git just sling them out at pull-time?
>
> It'll merge out fine, it's just icky having the same thing appear twice
> in history.  Not the end of the world.

Understood. So does this mean you will to push them into the -rcs?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 292 bytes --]

On Mon, Jun 11, 2012 at 03:50:29PM +0100, Lee Jones wrote:
> On 11/06/12 15:27, Mark Brown wrote:

> >It'll merge out fine, it's just icky having the same thing appear twice
> >in history.  Not the end of the world.

> Understood. So does this mean you will to push them into the -rcs?

Yes.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Lee Jones]

On 11/06/12 16:15, Mark Brown wrote:
> On Mon, Jun 11, 2012 at 03:50:29PM +0100, Lee Jones wrote:
>> On 11/06/12 15:27, Mark Brown wrote:
>
>>> It'll merge out fine, it's just icky having the same thing appear twice
>>> in history.  Not the end of the world.
>
>> Understood. So does this mean you will to push them into the -rcs?
>
> Yes.

Thanks Mark. Appreciate it.

Were you happy with my answer on the other email too?

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

On Mon, Jun 11, 2012 at 04:18:18PM +0100, Lee Jones wrote:

> Were you happy with my answer on the other email too?

Not sure which e-mail you mean?

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Lee Jones]

On 11/06/12 16:39, Mark Brown wrote:
> On Mon, Jun 11, 2012 at 04:18:18PM +0100, Lee Jones wrote:
> 
>> Were you happy with my answer on the other email too?
> 
> Not sure which e-mail you mean?

[PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515 
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 09/22] regulator: Change db8500-prcmu match names to reflect Device Tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

On Mon, Jun 11, 2012 at 04:59:38PM +0100, Lee Jones wrote:
> On 11/06/12 16:39, Mark Brown wrote:

> > Not sure which e-mail you mean?

> [PATCH 08/22] regulator: Change ab8500 match names to reflect Device Tree

I replied to the last mail I saw from you?  It's late here so it'll be
tomorrow before I can check.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 16/22] mfd: ab8500-gpadc: Enable IRQF_ONESHOT when requesting a threaded IRQ

[Lee Jones]

The kernel now forces IRQs to be ONESHOT if no IRQ handler is passed.

Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mfd/ab8500-gpadc.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index c39fc71..358d502 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -599,7 +599,8 @@ static int __devinit ab8500_gpadc_probe(struct platform_device *pdev)
 	/* Register interrupt  - SwAdcComplete */
 	ret = request_threaded_irq(gpadc->irq, NULL,
 		ab8500_bm_gpswadcconvend_handler,
-		IRQF_NO_SUSPEND | IRQF_SHARED, "ab8500-gpadc", gpadc);
+		IRQF_ONESHOT | IRQF_NO_SUSPEND | IRQF_SHARED,
+				"ab8500-gpadc", gpadc);
 	if (ret < 0) {
 		dev_err(gpadc->dev, "Failed to register interrupt, irq: %d\n",
 			gpadc->irq);
-- 
1.7.9.5

Re: [PATCH 16/22] mfd: ab8500-gpadc: Enable IRQF_ONESHOT when requesting a threaded IRQ

[Linus Walleij]

On Wed, May 30, 2012 at 12:47 PM, Lee Jones <lee.jones@linaro.org> wrote:

> The kernel now forces IRQs to be ONESHOT if no IRQ handler is passed.
>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/mfd/ab8500-gpadc.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
> index c39fc71..358d502 100644
> --- a/drivers/mfd/ab8500-gpadc.c
> +++ b/drivers/mfd/ab8500-gpadc.c
> @@ -599,7 +599,8 @@ static int __devinit ab8500_gpadc_probe(struct platform_device *pdev)
>        /* Register interrupt  - SwAdcComplete */
>        ret = request_threaded_irq(gpadc->irq, NULL,
>                ab8500_bm_gpswadcconvend_handler,
> -               IRQF_NO_SUSPEND | IRQF_SHARED, "ab8500-gpadc", gpadc);
> +               IRQF_ONESHOT | IRQF_NO_SUSPEND | IRQF_SHARED,
> +                               "ab8500-gpadc", gpadc);

Looks correct to me I think this one should be ONESHOT anyway.

Yours,
Linus Walleij

Re: [PATCH 16/22] mfd: ab8500-gpadc: Enable IRQF_ONESHOT when requesting a threaded IRQ

[Samuel Ortiz]

Hi Lee,

On Wed, May 30, 2012 at 12:47:34PM +0800, Lee Jones wrote:
> The kernel now forces IRQs to be ONESHOT if no IRQ handler is passed.
> 
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/mfd/ab8500-gpadc.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
Patch applied, thanks.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

[PATCH 18/22] mfd: Remove redundant Kconfig entry

[Lee Jones]

During ab8500-core clean-up the Kconfig entry for AB8500_I2C_CORE
was left remnant. This patch simply removes it.

Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mfd/Kconfig |   10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 11a1b65..b697136 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -660,16 +660,6 @@ config AB8500_CORE
 	  the irq_chip parts for handling the Mixed Signal chip events.
 	  This chip embeds various other multimedia funtionalities as well.
 
-config AB8500_I2C_CORE
-	bool "AB8500 register access via PRCMU I2C"
-	depends on AB8500_CORE && MFD_DB8500_PRCMU
-	default y
-	help
-	  This enables register access to the AB8500 chip via PRCMU I2C.
-	  The AB8500 chip can be accessed via SPI or I2C. On DB8500 hardware
-	  the I2C bus is connected to the Power Reset
-	  and Mangagement Unit, PRCMU.
-
 config AB8500_DEBUG
        bool "Enable debug info via debugfs"
        depends on AB8500_CORE && DEBUG_FS
-- 
1.7.9.5

Re: [PATCH 18/22] mfd: Remove redundant Kconfig entry

[Linus Walleij]

On Wed, May 30, 2012 at 12:47 PM, Lee Jones <lee.jones@linaro.org> wrote:

> During ab8500-core clean-up the Kconfig entry for AB8500_I2C_CORE
> was left remnant. This patch simply removes it.
>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/mfd/Kconfig |   10 ----------
>  1 file changed, 10 deletions(-)
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 11a1b65..b697136 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -660,16 +660,6 @@ config AB8500_CORE
>          the irq_chip parts for handling the Mixed Signal chip events.
>          This chip embeds various other multimedia funtionalities as well.
>
> -config AB8500_I2C_CORE
> -       bool "AB8500 register access via PRCMU I2C"
> -       depends on AB8500_CORE && MFD_DB8500_PRCMU

You need to move these dependencies under the AB8500_CORE config
entry instead.

> -       default y

I wonder if in  arch/arm/mach-ux500/Kconfig MACH_MOP500 should
select this instead, all MOP500 children have this an *won't* work
without it.

Yours,
Linus Walleij

Re: [PATCH 18/22] mfd: Remove redundant Kconfig entry

[Lee Jones]

On 30/05/12 15:15, Linus Walleij wrote:
> On Wed, May 30, 2012 at 12:47 PM, Lee Jones<lee.jones@linaro.org>  wrote:
>
>> During ab8500-core clean-up the Kconfig entry for AB8500_I2C_CORE
>> was left remnant. This patch simply removes it.
>>
>> Cc: Samuel Ortiz<sameo@linux.intel.com>
>> Cc: linux-kernel@vger.kernel.org
>> Signed-off-by: Lee Jones<lee.jones@linaro.org>
>> ---
>>   drivers/mfd/Kconfig |   10 ----------
>>   1 file changed, 10 deletions(-)
>>
>> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
>> index 11a1b65..b697136 100644
>> --- a/drivers/mfd/Kconfig
>> +++ b/drivers/mfd/Kconfig
>> @@ -660,16 +660,6 @@ config AB8500_CORE
>>           the irq_chip parts for handling the Mixed Signal chip events.
>>           This chip embeds various other multimedia funtionalities as well.
>>
>> -config AB8500_I2C_CORE
>> -       bool "AB8500 register access via PRCMU I2C"
>> -       depends on AB8500_CORE&&  MFD_DB8500_PRCMU
>
> You need to move these dependencies under the AB8500_CORE config
> entry instead.

Already done and upstreamed: 21f082a66177852365df0c955ecaef50fba9a691

>> -       default y
>
> I wonder if in  arch/arm/mach-ux500/Kconfig MACH_MOP500 should
> select this instead, all MOP500 children have this an *won't* work
> without it.

As described, I have already moved the dependency in the Kconfig file.

I guess what you've just mentioned is a separate patch (for another 
time). I'll stick it on my ever growing TODO.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
M: +44 77 88 633 515
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 18/22] mfd: Remove redundant Kconfig entry

[Linus Walleij]

On Wed, May 30, 2012 at 3:37 PM, Lee Jones <lee.jones@linaro.org> wrote:

>> You need to move these dependencies under the AB8500_CORE config
>> entry instead.
>
> Already done and upstreamed: 21f082a66177852365df0c955ecaef50fba9a691

Yes the PRCMU driver will select this one, I was more thinking if it shoul
select both but this will work.
Acked-by.

Linus Walleij

Re: [PATCH 18/22] mfd: Remove redundant Kconfig entry

[Samuel Ortiz]

Hi Lee,

On Wed, May 30, 2012 at 12:47:36PM +0800, Lee Jones wrote:
> During ab8500-core clean-up the Kconfig entry for AB8500_I2C_CORE
> was left remnant. This patch simply removes it.
> 
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/mfd/Kconfig |   10 ----------
>  1 file changed, 10 deletions(-)
Applied as well, thanks.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

[PATCH 22/22] mfd: Enable DT probing of the DB8500 PRCMU

[Lee Jones]

This patch adds the correct compatible string for use during Device Tree
population. Without it the DB8500 PRCMU will not be probed.

Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mfd/db8500-prcmu.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 74595e1..01f01f3 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2994,11 +2994,16 @@ static int __init db8500_prcmu_probe(struct platform_device *pdev)
 no_irq_return:
 	return err;
 }
+static const struct of_device_id db8500_prcmu_match[] = {
+	{ .compatible = "stericsson,db8500-prcmu"},
+	{ },
+};
 
 static struct platform_driver db8500_prcmu_driver = {
 	.driver = {
 		.name = "db8500-prcmu",
 		.owner = THIS_MODULE,
+		.of_match_table = db8500_prcmu_match,
 	},
 };
 
-- 
1.7.9.5

Re: [PATCH 22/22] mfd: Enable DT probing of the DB8500 PRCMU

[Linus Walleij]

On Wed, May 30, 2012 at 12:47 PM, Lee Jones <lee.jones@linaro.org> wrote:

> This patch adds the correct compatible string for use during Device Tree
> population. Without it the DB8500 PRCMU will not be probed.
>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij