diff options
| author | Patrick Turley <patrick.turley@freescale.com> | 2009-11-09 16:40:15 -0600 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-02-12 17:19:32 +0100 |
| commit | c3eaa781a143fe64a587b80a875856aef687712e (patch) | |
| tree | cda8b0e0b70462f358a67e0e171cd5a8496e12b8 /arch | |
| parent | 0ce90a5be933cf6db0b1c557e0f28bb265e2bc86 (diff) | |
ENGR00118250 [MX23_BSP] GPMI driver crashes when only one chip
Fixed the one-chip branch during GPMI initialization.
Signed-off-by: Patrick Turley <patrick.turley@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-stmp378x/stmp378x_devb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-stmp378x/stmp378x_devb.c b/arch/arm/mach-stmp378x/stmp378x_devb.c index fba9fe551d6f..abfd5163f5d9 100644 --- a/arch/arm/mach-stmp378x/stmp378x_devb.c +++ b/arch/arm/mach-stmp378x/stmp378x_devb.c @@ -213,11 +213,9 @@ static int gpmi_pinmux_handler(bool request) * Platform-specific information the GPMI driver will need. */ -#if defined(CONFIG_MTD_PARTITIONS) static const char *gpmi_partition_source_types[] = { "cmdlinepart", NULL }; -#endif -static struct gpmi_platform_data gpmi_partitions = { +static struct gpmi_platform_data gpmi_data = { .io_uA = 70000, .pinmux_handler = gpmi_pinmux_handler, .boot_area_size_in_bytes = 20 * SZ_1M, @@ -372,7 +370,7 @@ static void __init stmp378x_devb_init(void) stmp3xxx_dbguart.dev.platform_data = dbguart_pinmux; stmp3xxx_appuart.dev.platform_data = appuart_pinmux; - stmp3xxx_gpmi.dev.platform_data = &gpmi_partitions; + stmp3xxx_gpmi.dev.platform_data = &gpmi_data; stmp3xxx_mmc.dev.platform_data = &mmc_data; stmp3xxx_spi1.dev.platform_data = &ssp1_pins; stmp3xxx_spi2.dev.platform_data = &ssp2_pins; |