Skip to contentSkip to conversation

ARM: mx51_efika: update platform data for new mfd changes

PATCH In review Andres Salomon 6 participants 11 messages Mar 4, 2011 – Mar 24, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: mx51_efika: update platform data for new mfd changes

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 <[email protected]>

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

---
 arch/arm/mach-mx5/mx51_efika.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-mx5/mx51_efika.c +4 -2
index 74991c9..6451fb4 100644
@@ -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 = {
Signature · 1 line
1.7.2.3
#1 lore raw

Hello.

Quoted 3 lines · 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.

This passage should be under --- tear line.

Quoted 3 lines

From: Andres Salomon <[email protected]>

MFD changes in c738892f cause the mc13xxx_platform_data struct

Linus asks to also specify the commit summary in parens.

Quoted 4 lines

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

WBR, Sergei

#2 lore raw
Quoted 9 lines · On Fri, 04 Mar 2011 19:14:49 +0300 Sergei Shtylyov <[email protected]> wrote:

Hello.

Quoted 3 lines · 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.

This passage should be under --- tear line.

What?

Quoted 7 lines
Quoted 4 lines

From: Andres Salomon <[email protected]>

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).

Quoted 6 lines
Quoted 4 lines

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

WBR, Sergei

#3 lore raw

Hello.

Quoted 7 lines · Andres Salomon
Quoted 5 lines
Quoted 3 lines

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".

Quoted 9 lines
Quoted 5 lines
Quoted 3 lines

From: Andres Salomon <[email protected]>

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.

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

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

WBR, Sergei

#4 lore raw
Quoted 11 lines · Sergei Shtylyov
Quoted 7 lines · Andres Salomon
Quoted 3 lines
Quoted 1 line

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).

#5 lore raw
Quoted 11 lines · On Mon, 7 Mar 2011 14:47:00 +0000 Mark Brown…
Quoted 9 lines · Sergei Shtylyov
Quoted 7 lines · Andres Salomon
Quoted 3 lines
Quoted 1 line

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).

Quoted 7 lines
Quoted 1 line

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).

#6 lore raw
In reply to Andres Salomon
Quoted 7 lines · Andres Salomon
Quoted 4 lines · On Fri, 04 Mar 2011 19:14:49 +0300 Sergei Shtylyov <[email protected]> wrote:

Hello.

Andres Salomon wrote:

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

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

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#7 lore raw
In reply to Andres Salomon
Quoted 3 lines · 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.

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

Quoted 35 lines

From: Andres Salomon <[email protected]>

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

---
 arch/arm/mach-mx5/mx51_efika.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-mx5/mx51_efika.c +4 -2
index 74991c9..6451fb4 100644
@@ -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 = {
Signature · 1 line
1.7.2.3
Signature · 4 lines
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 |
#8 lore raw

Hi Sascha,

Quoted 9 lines · Sascha Hauer
Quoted 3 lines · 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.

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.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#9 lore raw

Hi samuel,

Quoted 8 lines · Samuel Ortiz

Hi Sascha,

Quoted 5 lines · Sascha Hauer
Quoted 3 lines · 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.

Quoted 7 lines
Quoted 4 lines

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

Signature · 4 lines
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 |
#10 lore raw
In reply to Sascha Hauer
Quoted 9 lines · On Mon, 7 Mar 2011 09:53:58 +0100 Sascha Hauer <[email protected]> wrote:
Quoted 3 lines · 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.

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.

Quoted 40 lines

Sascha

Quoted 36 lines

From: Andres Salomon <[email protected]>

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

---
 arch/arm/mach-mx5/mx51_efika.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-mx5/mx51_efika.c index 74991c9..6451fb4 100644

arch/arm/mach-mx5/mx51_efika.c +4 -2
@@ -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