diff options
| author | Patrick Turley <patrick.turley@freescale.com> | 2010-03-17 13:33:08 -0500 |
|---|---|---|
| committer | Patrick Turley <patrick.turley@freescale.com> | 2010-03-19 00:09:41 -0500 |
| commit | 7c01e87a19807f920265894793d3a1eb0ebee05b (patch) | |
| tree | f16d6a47c399b463c2e7d52d4a66d30d7136c6f8 /drivers | |
| parent | 9307cd09f9870a6982e681167d98d797f5098b3a (diff) | |
ENGR00121689 i.MX28 GPMI driver doesn't compile correctly under some conditions
Changed the driver to ignore CONFIG_MTD_CONCAT, and work correctly with
CONFIG_MTD_PARTITIONS. Also turned on the GPMI driver and UBIFS in the
default config.
Signed-off-by: Patrick Turley <patrick.turley@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/gpmi1/gpmi-base.c | 6 | ||||
| -rw-r--r-- | drivers/mtd/nand/gpmi1/gpmi.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/gpmi1/gpmi-base.c b/drivers/mtd/nand/gpmi1/gpmi-base.c index ea1bb9f52ec2..7c91b44678da 100644 --- a/drivers/mtd/nand/gpmi1/gpmi-base.c +++ b/drivers/mtd/nand/gpmi1/gpmi-base.c @@ -2231,11 +2231,11 @@ static int gpmi_scan_middle(struct gpmi_nand_data *g) */ static int gpmi_register_with_mtd(struct gpmi_nand_data *g) { + struct mtd_info *mtd = &g->mtd; #if defined(CONFIG_MTD_PARTITIONS) int r; unsigned i; struct gpmi_platform_data *gpd = g->gpd; - struct mtd_info *mtd = &g->mtd; struct nand_chip *nand = &g->nand; struct mtd_partition partitions[2]; struct mtd_info *search_mtd; @@ -2379,7 +2379,7 @@ static int gpmi_register_with_mtd(struct gpmi_nand_data *g) pr_info("MTD partitioning and/or concatenation are disabled.\n" "Registering the entire GPMI medium...\n"); - add_mtd_device(g->mtd); + add_mtd_device(mtd); #else @@ -2524,9 +2524,9 @@ static int gpmi_register_with_mtd(struct gpmi_nand_data *g) */ static void gpmi_unregister_with_mtd(struct gpmi_nand_data *g) { + struct mtd_info *mtd = &g->mtd; #if defined(CONFIG_MTD_PARTITIONS) struct gpmi_platform_data *gpd = g->gpd; - struct mtd_info *mtd = &g->mtd; #endif /* diff --git a/drivers/mtd/nand/gpmi1/gpmi.h b/drivers/mtd/nand/gpmi1/gpmi.h index c49268ce9442..45db15c3b7ba 100644 --- a/drivers/mtd/nand/gpmi1/gpmi.h +++ b/drivers/mtd/nand/gpmi1/gpmi.h @@ -288,7 +288,7 @@ struct gpmi_nand_data { struct nand_device_info device_info; -#if defined(CONFIG_MTD_PARTITIONS) && defined(CONFIG_MTD_CONCAT) +#if defined(CONFIG_MTD_PARTITIONS) struct mtd_info *general_use_mtd; struct mtd_partition *partitions; unsigned partition_count; |