Xilinx: ARM: Add nand 16-bit buswidth support

This patch adds nand 16-bit buswidth support to
ZC770 XM011 board and AFX NAND module.

Signed-off-by: Jagan <jaganna@xilinx.com>

diff --git a/boards.cfg b/boards.cfg
index f4791d56589b45a89bd6ffc97cffc99627f6f593..3e1f4086526028e9765e6d342b81e91531f28d7a 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -129,12 +129,14 @@ zynq_ep107                   arm         armv7       zynq_common         xilinx
 zynq_ep107_dual_qspi         arm         armv7       zynq_common         xilinx         zynq   zynq_ep107:XILINX_PSS_QSPI_USE_DUAL_FLASH
 zynq_zc770_XM010             arm         armv7       zynq_common         xilinx         zynq   zynq_zc770:ZC770_XM010
 zynq_zc770_XM011             arm         armv7       zynq_common         xilinx         zynq   zynq_zc770:ZC770_XM011
+zynq_zc770_XM011_n16b        arm         armv7       zynq_common         xilinx         zynq   zynq_zc770:ZC770_XM011,XILINX_ZYNQ_NAND_BUSWIDTH_16
 zynq_zc770_XM012             arm         armv7       zynq_common         xilinx         zynq   zynq_zc770:ZC770_XM012
 zynq_zc770_XM013             arm         armv7       zynq_common         xilinx         zynq   zynq_zc770:ZC770_XM013
 zynq_afx_nor                 arm         armv7       zynq_common         xilinx         zynq   zynq_afx:AFX_NOR
 zynq_afx_qspi                arm         armv7       zynq_common         xilinx         zynq   zynq_afx:AFX_QSPI
 zynq_afx_qspi_dual           arm         armv7       zynq_common         xilinx         zynq   zynq_afx:AFX_QSPI,XILINX_PSS_QSPI_USE_DUAL_FLASH
 zynq_afx_nand                arm         armv7       zynq_common         xilinx         zynq   zynq_afx:AFX_NAND
+zynq_afx_nand_16b            arm         armv7       zynq_common         xilinx         zynq   zynq_afx:AFX_NAND,XILINX_ZYNQ_NAND_BUSWIDTH_16
 zynq_zc702                   arm         armv7       zynq_common         xilinx         zynq
 zynq_zc706                   arm         armv7       zynq_common         xilinx         zynq
 zynq_cseflash                arm         armv7       zynq_common         xilinx         zynq

diff --git a/drivers/mtd/nand/zynq_nand.c b/drivers/mtd/nand/zynq_nand.c
index 19b6a73dc82c2d13a502d8c8f16131a3b2c2821e..40b4b1128d7eeff9de52668ea3794ab8f0b718d0 100644 (file)
--- a/drivers/mtd/nand/zynq_nand.c
+++ b/drivers/mtd/nand/zynq_nand.c
@@ -1159,9 +1159,13 @@ int zynq_nand_init(struct nand_chip *nand_chip)
        /* Set the device option and flash width */
 #ifdef LINUX_ONLY_NOT_UBOOT
        nand_chip->options = *((u32 *)pdev->dev.platform_data);
-#else
+#endif
+
+#ifndef CONFIG_XILINX_ZYNQ_NAND_BUSWIDTH_16
        /* arch/arm/mach-xilinx/devices.c */
        nand_chip->options = NAND_NO_AUTOINCR | NAND_USE_FLASH_BBT;
+#else
+       nand_chip->options = NAND_BUSWIDTH_16;
 #endif
 
 #ifdef LINUX_ONLY_NOT_UBOOT