mtd: cfi_flash: Revert Xilinx specific hack

Revert the hack to force the write buffer size to 256 bits. The
hack breaks any flash devices that have a write buffer that is not
256bits (e.g. JS28F256P30T95, on the ML507).

Signed-off-by: Jason Wu <huanyu@xilinx.com>
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
---
Reverting this patch it is causing the problem on zc770-xm012
flash timeout issue

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 11ca01d10689865c59f666491523caefe2c3d1a5..60dbb7864f2b40476e7dab9a03930aa89dc50158 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -2213,14 +2213,7 @@ ulong flash_get_size (phys_addr_t base, int banknum)
                }
 
                info->sector_count = sect_cnt;
-               /* info->buffer_size =
-                       1 << le16_to_cpu(qry.max_buf_write_size); */
-               /*
-                * Xilinx hack for now due to numonyx bug with 8 bit mode
-                * The CFI data for the buffer size is wrong in the part.
-                * It may be feasible to fix this better.
-                */
-               info->buffer_size = 256;
+               info->buffer_size = 1 << le16_to_cpu(qry.max_buf_write_size);
                tmp = 1 << qry.block_erase_timeout_typ;
                info->erase_blk_tout = tmp *
                        (1 << qry.block_erase_timeout_max);