[PATCH] ARM: mx51_efika: update platform data for new mfd changes

[PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Andres Salomon]

Note that this relies on stuff currently in mfd's next tree, but this
is also a newer driver.  I'm not sure which tree it should go through,
as it's a problem that shows up in next.



From: Andres Salomon <dilinger@queued.net>

MFD changes in c738892f cause the mc13xxx_platform_data struct
to change.  This changes one more (new) user of it, fixing a build
error.

Signed-off-by: Andres Salomon <dilinger@queued.net>
---
 arch/arm/mach-mx5/mx51_efika.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
index 74991c9..6451fb4 100644
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-mx5/mx51_efika.c
@@ -572,8 +572,10 @@ static struct mc13xxx_regulator_init_data mx51_efika_regulators[] = {
 
 static struct mc13xxx_platform_data mx51_efika_mc13892_data = {
 	.flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR,
-	.num_regulators = ARRAY_SIZE(mx51_efika_regulators),
-	.regulators = mx51_efika_regulators,
+	.regulators = {
+		.num_regulators = ARRAY_SIZE(mx51_efika_regulators),
+		.regulators = mx51_efika_regulators,
+	},
 };
 
 static struct spi_board_info mx51_efika_spi_board_info[] __initdata = {
-- 
1.7.2.3

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Sergei Shtylyov]

Hello.

Andres Salomon wrote:

> Note that this relies on stuff currently in mfd's next tree, but this
> is also a newer driver.  I'm not sure which tree it should go through,
> as it's a problem that shows up in next.

    This passage should be under --- tear line.

> From: Andres Salomon <dilinger@queued.net>

> MFD changes in c738892f cause the mc13xxx_platform_data struct

    Linus asks to also specify the commit summary in parens.

> to change.  This changes one more (new) user of it, fixing a build
> error.

> Signed-off-by: Andres Salomon <dilinger@queued.net>

WBR, Sergei

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Andres Salomon]

On Fri, 04 Mar 2011 19:14:49 +0300
Sergei Shtylyov <sshtylyov@mvista.com> wrote:

> Hello.
> 
> Andres Salomon wrote:
> 
> > Note that this relies on stuff currently in mfd's next tree, but
> > this is also a newer driver.  I'm not sure which tree it should go
> > through, as it's a problem that shows up in next.
> 
>     This passage should be under --- tear line.

What?


> 
> > From: Andres Salomon <dilinger@queued.net>
> 
> > MFD changes in c738892f cause the mc13xxx_platform_data struct
> 
>     Linus asks to also specify the commit summary in parens.
> 

Also, what?  If there are changes to how patches should be submitted,
please provide a reference (Documentation/SubmittingPatches should
be updated, as well).



> > to change.  This changes one more (new) user of it, fixing a build
> > error.
> 
> > Signed-off-by: Andres Salomon <dilinger@queued.net>
> 
> WBR, Sergei

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Sergei Shtylyov]

Hello.

Andres Salomon wrote:

>>> Note that this relies on stuff currently in mfd's next tree, but
>>> this is also a newer driver.  I'm not sure which tree it should go
>>> through, as it's a problem that shows up in next.

>>     This passage should be under --- tear line.

> What?

    See Documentation/SubmittingPatches, section 15, "The canonical patch format".

>>> From: Andres Salomon <dilinger@queued.net>

>>> MFD changes in c738892f cause the mc13xxx_platform_data struct

>>     Linus asks to also specify the commit summary in parens.

> Also, what?  If there are changes to how patches should be submitted,
> please provide a reference (Documentation/SubmittingPatches should
> be updated, as well).

    I have no time to rummage in the mail archives, sorry.

>>> to change.  This changes one more (new) user of it, fixing a build
>>> error.
>>> Signed-off-by: Andres Salomon <dilinger@queued.net>

WBR, Sergei

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Mark Brown]

On Fri, Mar 04, 2011 at 09:58:56PM +0300, Sergei Shtylyov wrote:
> Andres Salomon wrote:

>>>> MFD changes in c738892f cause the mc13xxx_platform_data struct

>>>     Linus asks to also specify the commit summary in parens.

>> Also, what?  If there are changes to how patches should be submitted,
>> please provide a reference (Documentation/SubmittingPatches should
>> be updated, as well).

>    I have no time to rummage in the mail archives, sorry.

There's been multiple discussions of this.  The issue is that commit IDs
only mean something in specific trees and go bad if someone rebases,
and they aren't legibile by humans (so even if the commit is in
something like Linus' tree the reader still needs a git repository to
figure out what changes are being talked about).

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Andres Salomon]

On Mon, 7 Mar 2011 14:47:00 +0000
Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:

> On Fri, Mar 04, 2011 at 09:58:56PM +0300, Sergei Shtylyov wrote:
> > Andres Salomon wrote:
> 
> >>>> MFD changes in c738892f cause the mc13xxx_platform_data struct
> 
> >>>     Linus asks to also specify the commit summary in parens.
> 
> >> Also, what?  If there are changes to how patches should be
> >> submitted, please provide a reference
> >> (Documentation/SubmittingPatches should be updated, as well).
> 
> >    I have no time to rummage in the mail archives, sorry.
> 
> There's been multiple discussions of this.  The issue is that commit
> IDs only mean something in specific trees and go bad if someone
> rebases, and they aren't legibile by humans (so even if the commit is
> in something like Linus' tree the reader still needs a git repository
> to figure out what changes are being talked about).

Ah, thanks, that makes sense.  Sergei's original statement was unclear
("...instead of just the commit ID" would've helped).

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Uwe Kleine-König]

On Fri, Mar 04, 2011 at 08:38:22AM -0800, Andres Salomon wrote:
> On Fri, 04 Mar 2011 19:14:49 +0300
> Sergei Shtylyov <sshtylyov@mvista.com> wrote:
> 
> > Hello.
> > 
> > Andres Salomon wrote:
> > 
> > > Note that this relies on stuff currently in mfd's next tree, but
> > > this is also a newer driver.  I'm not sure which tree it should go
> > > through, as it's a problem that shows up in next.
> > 
> >     This passage should be under --- tear line.
> 
> What?
Actually putting it above the commit log and separating it by a scissors
line (see git-mailinfo(1), git am -c) should be fine, too.

This is all about selecting which part of the message should end up in
the commit log.  Git ignores everything after the tripple dash (apart
from the patch of course).

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Sascha Hauer]

On Fri, Mar 04, 2011 at 08:06:53AM -0800, Andres Salomon wrote:
> Note that this relies on stuff currently in mfd's next tree, but this
> is also a newer driver.  I'm not sure which tree it should go through,
> as it's a problem that shows up in next.

Please ping me again when the mfd tree is in Linus master. I see no
other chance fixing this on my side other than removing regulator
support for efika completely for now. So I guess you have to live with
the compile breakage for some time.

Sascha

> 
> 
> 
> From: Andres Salomon <dilinger@queued.net>
> 
> MFD changes in c738892f cause the mc13xxx_platform_data struct
> to change.  This changes one more (new) user of it, fixing a build
> error.
> 
> Signed-off-by: Andres Salomon <dilinger@queued.net>
> ---
>  arch/arm/mach-mx5/mx51_efika.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
> index 74991c9..6451fb4 100644
> --- a/arch/arm/mach-mx5/mx51_efika.c
> +++ b/arch/arm/mach-mx5/mx51_efika.c
> @@ -572,8 +572,10 @@ static struct mc13xxx_regulator_init_data mx51_efika_regulators[] = {
>  
>  static struct mc13xxx_platform_data mx51_efika_mc13892_data = {
>  	.flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR,
> -	.num_regulators = ARRAY_SIZE(mx51_efika_regulators),
> -	.regulators = mx51_efika_regulators,
> +	.regulators = {
> +		.num_regulators = ARRAY_SIZE(mx51_efika_regulators),
> +		.regulators = mx51_efika_regulators,
> +	},
>  };
>  
>  static struct spi_board_info mx51_efika_spi_board_info[] __initdata = {
> -- 
> 1.7.2.3
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Samuel Ortiz]

Hi Sascha,

On Mon, Mar 07, 2011 at 09:53:58AM +0100, Sascha Hauer wrote:
> On Fri, Mar 04, 2011 at 08:06:53AM -0800, Andres Salomon wrote:
> > Note that this relies on stuff currently in mfd's next tree, but this
> > is also a newer driver.  I'm not sure which tree it should go through,
> > as it's a problem that shows up in next.
> 
> Please ping me again when the mfd tree is in Linus master. I see no
> other chance fixing this on my side other than removing regulator
> support for efika completely for now. So I guess you have to live with
> the compile breakage for some time.
It would probably make sense for me to carry this driver then. Sascha, would
you be ok with it ? If that's so, could you please point me at a git commit
from your tree ?

Cheers,
Samuel.

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

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Sascha Hauer]

Hi samuel,

On Fri, Mar 11, 2011 at 09:44:05PM +0100, Samuel Ortiz wrote:
> Hi Sascha,
> 
> On Mon, Mar 07, 2011 at 09:53:58AM +0100, Sascha Hauer wrote:
> > On Fri, Mar 04, 2011 at 08:06:53AM -0800, Andres Salomon wrote:
> > > Note that this relies on stuff currently in mfd's next tree, but this
> > > is also a newer driver.  I'm not sure which tree it should go through,
> > > as it's a problem that shows up in next.
> > 
> > Please ping me again when the mfd tree is in Linus master. I see no
> > other chance fixing this on my side other than removing regulator
> > support for efika completely for now. So I guess you have to live with
> > the compile breakage for some time.
> It would probably make sense for me to carry this driver then. Sascha, would
> you be ok with it ? If that's so, could you please point me at a git commit
> from your tree ?

The file which is changed only got created in my tree, so no way for you
to apply it.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH] ARM: mx51_efika: update platform data for new mfd changes

[Andres Salomon]

On Mon, 7 Mar 2011 09:53:58 +0100
Sascha Hauer <s.hauer@pengutronix.de> wrote:

> On Fri, Mar 04, 2011 at 08:06:53AM -0800, Andres Salomon wrote:
> > Note that this relies on stuff currently in mfd's next tree, but
> > this is also a newer driver.  I'm not sure which tree it should go
> > through, as it's a problem that shows up in next.
> 
> Please ping me again when the mfd tree is in Linus master. I see no
> other chance fixing this on my side other than removing regulator
> support for efika completely for now. So I guess you have to live with
> the compile breakage for some time.

FYI, the mfd changes are now in Linus master, so this patch should
probably be applied.


> 
> Sascha
> 
> > 
> > 
> > 
> > From: Andres Salomon <dilinger@queued.net>
> > 
> > MFD changes in c738892f cause the mc13xxx_platform_data struct
> > to change.  This changes one more (new) user of it, fixing a build
> > error.
> > 
> > Signed-off-by: Andres Salomon <dilinger@queued.net>
> > ---
> >  arch/arm/mach-mx5/mx51_efika.c |    6 ++++--
> >  1 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/mach-mx5/mx51_efika.c
> > b/arch/arm/mach-mx5/mx51_efika.c index 74991c9..6451fb4 100644
> > --- a/arch/arm/mach-mx5/mx51_efika.c
> > +++ b/arch/arm/mach-mx5/mx51_efika.c
> > @@ -572,8 +572,10 @@ static struct mc13xxx_regulator_init_data
> > mx51_efika_regulators[] = { 
> >  static struct mc13xxx_platform_data mx51_efika_mc13892_data = {
> >  	.flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR,
> > -	.num_regulators = ARRAY_SIZE(mx51_efika_regulators),
> > -	.regulators = mx51_efika_regulators,
> > +	.regulators = {
> > +		.num_regulators =
> > ARRAY_SIZE(mx51_efika_regulators),
> > +		.regulators = mx51_efika_regulators,
> > +	},
> >  };
> >  
> >  static struct spi_board_info mx51_efika_spi_board_info[]
> > __initdata = { -- 
> > 1.7.2.3
> > 
> > 
>