diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-flash.c')
-rw-r--r-- | arch/arm/mach-omap2/board-flash.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index fd38c05bb47f..f6b72533c089 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c | |||
@@ -139,11 +139,13 @@ static struct omap_nand_platform_data board_nand_data = { | |||
139 | }; | 139 | }; |
140 | 140 | ||
141 | void | 141 | void |
142 | __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs) | 142 | __init board_nand_init(struct mtd_partition *nand_parts, |
143 | u8 nr_parts, u8 cs, int nand_type) | ||
143 | { | 144 | { |
144 | board_nand_data.cs = cs; | 145 | board_nand_data.cs = cs; |
145 | board_nand_data.parts = nand_parts; | 146 | board_nand_data.parts = nand_parts; |
146 | board_nand_data.nr_parts = nr_parts; | 147 | board_nand_data.nr_parts = nr_parts; |
148 | board_nand_data.devsize = nand_type; | ||
147 | 149 | ||
148 | gpmc_nand_init(&board_nand_data); | 150 | gpmc_nand_init(&board_nand_data); |
149 | } | 151 | } |
@@ -194,7 +196,7 @@ unmap: | |||
194 | * @return - void. | 196 | * @return - void. |
195 | */ | 197 | */ |
196 | void board_flash_init(struct flash_partitions partition_info[], | 198 | void board_flash_init(struct flash_partitions partition_info[], |
197 | char chip_sel_board[][GPMC_CS_NUM]) | 199 | char chip_sel_board[][GPMC_CS_NUM], int nand_type) |
198 | { | 200 | { |
199 | u8 cs = 0; | 201 | u8 cs = 0; |
200 | u8 norcs = GPMC_CS_NUM + 1; | 202 | u8 norcs = GPMC_CS_NUM + 1; |
@@ -250,5 +252,5 @@ void board_flash_init(struct flash_partitions partition_info[], | |||
250 | "in GPMC\n"); | 252 | "in GPMC\n"); |
251 | else | 253 | else |
252 | board_nand_init(partition_info[2].parts, | 254 | board_nand_init(partition_info[2].parts, |
253 | partition_info[2].nr_parts, nandcs); | 255 | partition_info[2].nr_parts, nandcs, nand_type); |
254 | } | 256 | } |