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

From: Sascha Hauer <[email-masked]>
Date: Mon, 7 Mar 2011 09:53:58 +0100

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