Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-imx/mach-mx27_3ds.c arch/arm/mach-imx/mach-pcm038.c
arch/arm/mach-mx3/mach-mx31_3ds.c arch/arm/mach-mx3/mach-mx31moboard.c
between commit 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 ("ARM: imx+mx3:
convert to mc13xxx MFD") from the i.MX tree and commit
e84e545d47d26644275a79fe5ebc1797bcb80910 ("mfd: mfd_cell is now
implicitly available to mc13xxx drivers") from the mfd tree.
I fixed it up (I think - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell [email protected]
diff --cc arch/arm/mach-imx/mach-mx27_3ds.c
index ba88417,4bf1962..0000000
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@@ -231,10 -227,13 +231,13 @@@ static struct mc13xxx_regulator_init_da
};
/* MC13783 */
-static struct mc13783_platform_data mc13783_pdata = {
+static struct mc13xxx_platform_data mc13783_pdata __initdata = {
- .regulators = mx27_3ds_regulators,
- .num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
+ .regulators = {
+ .regulators = mx27_3ds_regulators,
+ .num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
+
+ },
- .flags = MC13783_USE_REGULATOR,
+ .flags = MC13XXX_USE_REGULATOR,
};
/* SPI */
diff --cc arch/arm/mach-imx/mach-pcm038.c
index 38c7708,c4c8fb1..0000000
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@@ -262,11 -262,13 +262,13 @@@ static struct mc13xxx_regulator_init_da
},
};
-static struct mc13783_platform_data pcm038_pmic = {
+static struct mc13xxx_platform_data pcm038_pmic = {
- .regulators = pcm038_regulators,
- .num_regulators = ARRAY_SIZE(pcm038_regulators),
+ .regulators = {
+ .regulators = pcm038_regulators,
+ .num_regulators = ARRAY_SIZE(pcm038_regulators),
+ },
- .flags = MC13783_USE_ADC | MC13783_USE_REGULATOR |
- MC13783_USE_TOUCHSCREEN,
+ .flags = MC13XXX_USE_ADC | MC13XXX_USE_REGULATOR |
+ MC13XXX_USE_TOUCHSCREEN,
};
static struct spi_board_info pcm038_spi_board_info[] __initdata = {
diff --cc arch/arm/mach-mx3/mach-mx31_3ds.c
index b7d0953,88516af..0000000
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@@ -152,10 -156,12 +152,13 @@@ static struct mc13xxx_regulator_init_da
};
/* MC13783 */
+static struct mc13xxx_platform_data mc13783_pdata __initdata = {
- .regulators = mx31_3ds_regulators,
- .num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
- .flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN
+ static struct mc13783_platform_data mc13783_pdata = {
+ .regulators = {
+ .regulators = mx31_3ds_regulators,
+ .num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
+ },
- .flags = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN,
++ .flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN,
};
/* SPI */
diff --cc arch/arm/mach-mx3/mach-mx31moboard.c
index 845d0b6,3a9c589..0000000
--- a/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/arch/arm/mach-mx3/mach-mx31moboard.c
@@@ -267,12 -267,14 +267,14 @@@ static struct mc13783_leds_platform_dat
.tc2_period = MC13783_LED_PERIOD_10MS,
};
-static struct mc13783_platform_data moboard_pmic = {
+static struct mc13xxx_platform_data moboard_pmic = {
- .regulators = moboard_regulators,
- .num_regulators = ARRAY_SIZE(moboard_regulators),
+ .regulators = {
+ .regulators = moboard_regulators,
+ .num_regulators = ARRAY_SIZE(moboard_regulators),
+ },
.leds = &moboard_leds,
- .flags = MC13783_USE_REGULATOR | MC13783_USE_RTC |
- MC13783_USE_ADC | MC13783_USE_LED,
+ .flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_RTC |
+ MC13XXX_USE_ADC | MC13XXX_USE_LED,
};
static struct spi_board_info moboard_spi_board_info[] __initdata = {
Hi Stephen,
On Tue, 1 Mar 2011 14:54:36 +1100
Stephen Rothwell <[email protected]> wrote:
> Today's linux-next merge of the mfd tree got a conflict in
> arch/arm/mach-imx/mach-mx27_3ds.c arch/arm/mach-imx/mach-pcm038.c
> arch/arm/mach-mx3/mach-mx31_3ds.c arch/arm/mach-mx3/mach-mx31moboard.c
> between commit 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 ("ARM: imx+mx3:
> convert to mc13xxx MFD") from the i.MX tree and commit
> e84e545d47d26644275a79fe5ebc1797bcb80910 ("mfd: mfd_cell is now
> implicitly available to mc13xxx drivers") from the mfd tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
Your fix seems correct, although I fear I am too dumb to understand why commit
e84e545d47d26644275a79fe5ebc1797bcb80910 introduces this extra struct
nesting.... AFAICS gcc will end up doing the same as without the extra nest.
Btw, include/linux/mfd/mc13783.h should end up disappearing after you're done
merging... I hope so.
Best regards,
--
David Jander
Protonic Holland.
On Tue, 1 Mar 2011 09:35:28 +0100
David Jander <[email protected]> wrote:
>
> Hi Stephen,
>
> On Tue, 1 Mar 2011 14:54:36 +1100
> Stephen Rothwell <[email protected]> wrote:
> > Today's linux-next merge of the mfd tree got a conflict in
> > arch/arm/mach-imx/mach-mx27_3ds.c arch/arm/mach-imx/mach-pcm038.c
> > arch/arm/mach-mx3/mach-mx31_3ds.c
> > arch/arm/mach-mx3/mach-mx31moboard.c between commit
> > 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 ("ARM: imx+mx3: convert to
> > mc13xxx MFD") from the i.MX tree and commit
> > e84e545d47d26644275a79fe5ebc1797bcb80910 ("mfd: mfd_cell is now
> > implicitly available to mc13xxx drivers") from the mfd tree.
> >
> > I fixed it up (I think - see below) and can carry the fix as
> > necessary.
>
> Your fix seems correct, although I fear I am too dumb to understand
> why commit e84e545d47d26644275a79fe5ebc1797bcb80910 introduces this
> extra struct nesting.... AFAICS gcc will end up doing the same as
> without the extra nest.
It was requested in this thread:
https://patchwork.kernel.org/patch/551441/
> On Tue, 1 Mar 2011 09:35:28 +0100
> David Jander <[email protected]> wrote:
>
>>
>> Hi Stephen,
>>
>> On Tue, 1 Mar 2011 14:54:36 +1100
>> Stephen Rothwell <[email protected]> wrote:
>> > Today's linux-next merge of the mfd tree got a conflict in
>> > arch/arm/mach-imx/mach-mx27_3ds.c arch/arm/mach-imx/mach-pcm038.c
>> > arch/arm/mach-mx3/mach-mx31_3ds.c
>> > arch/arm/mach-mx3/mach-mx31moboard.c between commit
>> > 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 ("ARM: imx+mx3: convert to
>> > mc13xxx MFD") from the i.MX tree and commit
>> > e84e545d47d26644275a79fe5ebc1797bcb80910 ("mfd: mfd_cell is now
>> > implicitly available to mc13xxx drivers") from the mfd tree.
>> >
>> > I fixed it up (I think - see below) and can carry the fix as
>> > necessary.
>>
>> Your fix seems correct, although I fear I am too dumb to understand
>> why commit e84e545d47d26644275a79fe5ebc1797bcb80910 introduces this
>> extra struct nesting.... AFAICS gcc will end up doing the same as
>> without the extra nest.
>
> It was requested in this thread:
> https://patchwork.kernel.org/patch/551441/
Ah, ok. I thought this change was somehow necessary for your patch to
work. I would have expected a separate patch otherwise.
Best regards,
--
David Jander
Hi David,
On Tue, 1 Mar 2011 09:35:28 +0100 David Jander <[email protected]> wrote:
>
> Your fix seems correct, although I fear I am too dumb to understand why commit
> e84e545d47d26644275a79fe5ebc1797bcb80910 introduces this extra struct
> nesting.... AFAICS gcc will end up doing the same as without the extra nest.
Thanks.
> Btw, include/linux/mfd/mc13783.h should end up disappearing after you're done
> merging... I hope so.
That file is still included by several others:
$ git grep -w mfd/mc13783.h
arch/arm/mach-imx/mach-mx27_3ds.c:#include <linux/mfd/mc13783.h>
arch/arm/mach-imx/mach-pcm038.c:#include <linux/mfd/mc13783.h>
arch/arm/mach-mx3/mach-mx31_3ds.c:#include <linux/mfd/mc13783.h>
arch/arm/mach-mx3/mach-mx31lilly.c:#include <linux/mfd/mc13783.h>
arch/arm/mach-mx3/mach-mx31lite.c:#include <linux/mfd/mc13783.h>
arch/arm/mach-mx3/mach-mx31moboard.c:#include <linux/mfd/mc13783.h>
drivers/hwmon/mc13783-adc.c:#include <linux/mfd/mc13783.h>
drivers/input/touchscreen/mc13783_ts.c:#include <linux/mfd/mc13783.h>
drivers/leds/leds-mc13783.c:#include <linux/mfd/mc13783.h>
drivers/mfd/mc13xxx-core.c:#include <linux/mfd/mc13783.h>
drivers/regulator/mc13783-regulator.c:#include <linux/mfd/mc13783.h>
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
> Hi David,
>
> On Tue, 1 Mar 2011 09:35:28 +0100 David Jander <[email protected]>
> wrote:
>>
>> Your fix seems correct, although I fear I am too dumb to understand why
>> commit
>> e84e545d47d26644275a79fe5ebc1797bcb80910 introduces this extra struct
>> nesting.... AFAICS gcc will end up doing the same as without the extra
>> nest.
>
> Thanks.
>
>> Btw, include/linux/mfd/mc13783.h should end up disappearing after you're
>> done
>> merging... I hope so.
>
> That file is still included by several others:
>
> $ git grep -w mfd/mc13783.h
> arch/arm/mach-imx/mach-mx27_3ds.c:#include <linux/mfd/mc13783.h>
> arch/arm/mach-imx/mach-pcm038.c:#include <linux/mfd/mc13783.h>
> arch/arm/mach-mx3/mach-mx31_3ds.c:#include <linux/mfd/mc13783.h>
> arch/arm/mach-mx3/mach-mx31lilly.c:#include <linux/mfd/mc13783.h>
> arch/arm/mach-mx3/mach-mx31lite.c:#include <linux/mfd/mc13783.h>
> arch/arm/mach-mx3/mach-mx31moboard.c:#include <linux/mfd/mc13783.h>
> drivers/hwmon/mc13783-adc.c:#include <linux/mfd/mc13783.h>
> drivers/input/touchscreen/mc13783_ts.c:#include <linux/mfd/mc13783.h>
> drivers/leds/leds-mc13783.c:#include <linux/mfd/mc13783.h>
> drivers/mfd/mc13xxx-core.c:#include <linux/mfd/mc13783.h>
> drivers/regulator/mc13783-regulator.c:#include <linux/mfd/mc13783.h>
These should all be either removed or changed to mc13xxx.h by subsequent
patches.
Sascha, where is the rest?
AFAICR, I already fixed all of these...
Best Regards,
--
David Jander