public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/3] OMAP: Adding Support for 2K nand page support for omap2430
@ 2007-07-27 17:14 sshahrom
  2007-08-10 10:43 ` Tony Lindgren
  0 siblings, 1 reply; 5+ messages in thread
From: sshahrom @ 2007-07-27 17:14 UTC (permalink / raw)
  To: linux-omap-open-source

Hi,
Continuing with rest of the patch series on linux.omap.com. 


Signed-off-by: Shahrom Sharif-Kashani <sshahrom@micron.com>


:000000 100644 0000000... 8ec2004... A	drivers/mtd/nand/omap2.c
:000000 100644 0000000... 051d7d9... A	include/asm-arm/arch-omap/nand.h

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
new file mode 100644
index 0000000..8ec2004
--- /dev/null
+++ b/drivers/mtd/nand/omap2.c
@@ -0,0 +1,625 @@
+/*
+ * drivers/mtd/nand/omap2.c
+ *
+ * Copyright (c) 2004 Texas Instruments, Jian Zhang <jzhang@ti.com>
+ * Copyright (c) 2004 Micron Technology Inc. 
+ * Copyright (c) 2004 David Brownell
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/types.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/io.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/mach/flash.h>
+#include <asm/arch/tc.h>
+#include <asm/arch/gpmc.h>
+
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/nand.h>
+
+#define GPMC_IRQ_STATUS         0x18
+#define GPMC_ECC_CONFIG         0x1F4
+#define GPMC_ECC_CONTROL        0x1F8
+#define GPMC_ECC_SIZE_CONFIG    0x1FC
+#define GPMC_ECC1_RESULT        0x200
+
+#define	DRIVER_NAME	"omap2-nand"
+#define	NAND_IO_SIZE	SZ_4K
+
+#define	NAND_WP_ON	1
+#define	NAND_WP_OFF	0
+#define NAND_WP_BIT	0x00000010
+#define WR_RD_PIN_MONITORING             0x00600000
+
+#define	GPMC_BUF_FULL	0x00000001
+#define	GPMC_BUF_EMPTY	0x00000000
+
+#ifdef CONFIG_MTD_PARTITIONS
+static const char *part_probes[] = { "cmdlinepart", NULL };
+#endif
+
+static int hw_ecc = 1;
+
+/* new oob placement block for use with hardware ecc generation */
+static struct nand_ecclayout omap_hw_eccoob = {
+	.eccbytes = 12,
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
+	.oobfree = {{16, 32}, {33, 63} },
+};
+
+struct omap_nand_info {
+	struct nand_hw_control		controller;
+	struct nand_platform_data	*pdata;
+	struct mtd_info			mtd;
+	struct mtd_partition		*parts;
+	struct nand_chip		nand;
+	struct platform_device		*pdev;
+	/*~~~~~*/
+	int				gpmc_cs;
+	unsigned long 			physBase;
+	void __iomem            	*gpmcCsBaseAddr;
+	void __iomem            	*gpmcBaseAddr;
+};
+static void omap_nandWP(struct mtd_info *mtd, int mode)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+
+	unsigned long config = __raw_readl(info->gpmcBaseAddr+GPMC_CONFIG);
+
+	if (mode)
+		config &= ~(NAND_WP_BIT);	/* WP is ON */
+	else
+		config |= (NAND_WP_BIT);	/* WP is OFF */
+
+	__raw_writel(config, (info->gpmcBaseAddr+GPMC_CONFIG));
+}
+
+/*
+ *	hardware specific access to control-lines
+ *	NOTE:  boards may use different bits for these!!
+ *
+ *	ctrl:
+ *	NAND_NCE: bit 0 - don't care
+ *	NAND_CLE: bit 1 -> Command Latch
+ *	NAND_ALE: bit 2 -> Address Latch
+ */
+
+static void omap_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+
+	switch (ctrl) {
+		case NAND_CTRL_CHANGE | NAND_CTRL_CLE:
+			info->nand.IO_ADDR_W = info->gpmcCsBaseAddr + GPMC_CS_NAND_COMMAND;
+			info->nand.IO_ADDR_R = info->gpmcCsBaseAddr + GPMC_CS_NAND_DATA;
+			break;
+		
+		case NAND_CTRL_CHANGE | NAND_CTRL_ALE:
+			info->nand.IO_ADDR_W = info->gpmcCsBaseAddr + GPMC_CS_NAND_ADDRESS;
+			info->nand.IO_ADDR_R = info->gpmcCsBaseAddr + GPMC_CS_NAND_DATA;
+			break;
+
+		case NAND_CTRL_CHANGE | NAND_NCE:
+			info->nand.IO_ADDR_W = info->gpmcCsBaseAddr + GPMC_CS_NAND_DATA;
+			info->nand.IO_ADDR_R = info->gpmcCsBaseAddr + GPMC_CS_NAND_DATA;
+			break;
+	}
+
+	if (cmd != NAND_CMD_NONE)
+		__raw_writeb( cmd, info->nand.IO_ADDR_W );
+}
+
+/*
+* omap_read_buf - read data from NAND controller into buffer
+* @mtd:        MTD device structure
+* @buf:        buffer to store date
+* @len:        number of bytes to read
+*
+*/
+static void omap_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+
+	u16 *p = (u16 *) buf;
+
+	len >>= 1;
+
+	while (len--)
+		*p++ = cpu_to_le16(readw(info->nand.IO_ADDR_R));
+}
+
+/*
+* omap_write_buf -  write buffer to NAND controller
+* @mtd:        MTD device structure
+* @buf:        data buffer
+* @len:        number of bytes to write
+*
+*/
+static void omap_write_buf(struct mtd_info *mtd, const u_char * buf, int len)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+	u16 *p = (u16 *) buf;
+
+	len >>= 1;
+
+	while (len--) {
+		writew(cpu_to_le16(*p++), info->nand.IO_ADDR_W);
+
+		while (GPMC_BUF_EMPTY==(readl(info->gpmcBaseAddr+GPMC_STATUS)&GPMC_BUF_FULL)) ;
+	}
+}
+/*
+** omap_verify_buf - Verify chip data against buffer
+** @mtd:        MTD device structure
+** @buf:        buffer containing the data to compare
+** @len:        number of bytes to compare
+*/
+static int omap_verify_buf(struct mtd_info *mtd, const u_char * buf, int len)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+	u16 *p = (u16 *) buf;
+
+	len >>= 1;
+
+	while (len--) {
+
+		if (*p++ != cpu_to_le16(readw(info->nand.IO_ADDR_R)))
+			return -EFAULT;
+	}
+
+	return 0;
+} /* End omap_verify_buf */
+
+static void omap_hwecc_init(struct mtd_info *mtd)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+	unsigned long val = 0x0;
+
+	/* Read from ECC Control Register */
+	val = __raw_readl(info->gpmcBaseAddr+GPMC_ECC_CONTROL);
+	/*       Clear all ECC  | Enable Reg1 */
+	val = ( (0x00000001<<8) | 0x00000001 );
+	__raw_writel(val,info->gpmcBaseAddr+GPMC_ECC_CONTROL);
+
+	/* Read from ECC Size Config Register */
+	val = __raw_readl(info->gpmcBaseAddr+GPMC_ECC_SIZE_CONFIG);
+	/*       ECCSIZE1=512   |  ECCSIZE0=8bytes | Select eccResultsize[0123] */
+	val = ((0x000000FF<<22) | (0x00000003<<12) | (0x0000000F));
+	__raw_writel(val,info->gpmcBaseAddr+GPMC_ECC_SIZE_CONFIG);
+
+
+} /* End omap_hwecc_init */
+
+/*
+ * This function will generate true ECC value, which can be used
+ * when correcting data read from NAND flash memory core
+ */
+static void gen_true_ecc(u8 *ecc_buf)
+{
+	u32 tmp = ecc_buf[0] | (ecc_buf[1] << 16) | 
+		((ecc_buf[2] & 0xF0) << 20) | ((ecc_buf[2] & 0x0F) << 8);
+
+	ecc_buf[0] = ~(P64o(tmp) | P64e(tmp) | P32o(tmp) | P32e(tmp) | 
+		       P16o(tmp) | P16e(tmp) | P8o(tmp) | P8e(tmp) );
+	ecc_buf[1] = ~(P1024o(tmp) | P1024e(tmp) | P512o(tmp) | P512e(tmp) | 
+			P256o(tmp) | P256e(tmp) | P128o(tmp) | P128e(tmp));
+	ecc_buf[2] = ~( P4o(tmp) | P4e(tmp) | P2o(tmp) | P2e(tmp) | P1o(tmp) |
+		       	P1e(tmp) | P2048o(tmp) | P2048e(tmp));
+} /* End gen_true_ecc */
+
+/*
+ * This function compares two ECC's and indicates if there is an error.
+ * If the error can be corrected it will be corrected to the buffer
+ */
+static int omap_compare_ecc(u8 *ecc_data1,   /* read from NAND memory */
+			    u8 *ecc_data2,   /* read from register */
+			    u8 *page_data)
+{
+	uint   i;
+	u8     tmp0_bit[8], tmp1_bit[8], tmp2_bit[8];
+	u8     comp0_bit[8], comp1_bit[8], comp2_bit[8];
+	u8     ecc_bit[24];
+	u8     ecc_sum = 0;
+	u8     find_bit = 0;
+	uint   find_byte = 0;
+	int    isEccFF;
+
+	isEccFF = ((*(u32 *)ecc_data1 & 0xFFFFFF) == 0xFFFFFF);
+
+	gen_true_ecc(ecc_data1);
+	gen_true_ecc(ecc_data2);
+
+	for (i = 0; i <= 2; i++) {
+		*(ecc_data1 + i) = ~(*(ecc_data1 + i));
+		*(ecc_data2 + i) = ~(*(ecc_data2 + i));
+	}
+
+	for (i = 0; i < 8; i++) {
+		tmp0_bit[i]      = *ecc_data1 % 2;
+		*ecc_data1       = *ecc_data1 / 2;
+	}
+
+	for (i = 0; i < 8; i++) {
+		tmp1_bit[i]      = *(ecc_data1 + 1) % 2;
+		*(ecc_data1 + 1) = *(ecc_data1 + 1) / 2;
+        }
+
+	for (i = 0; i < 8; i++) {
+		tmp2_bit[i]      = *(ecc_data1 + 2) % 2;
+		*(ecc_data1 + 2) = *(ecc_data1 + 2) / 2;
+	}
+
+	for (i = 0; i < 8; i++) {
+		comp0_bit[i]     = *ecc_data2 % 2;
+		*ecc_data2       = *ecc_data2 / 2;
+	}
+
+	for (i = 0; i < 8; i++) {
+		comp1_bit[i]     = *(ecc_data2 + 1) % 2;
+		*(ecc_data2 + 1) = *(ecc_data2 + 1) / 2;
+	}
+
+	for (i = 0; i < 8; i++) {
+		comp2_bit[i]     = *(ecc_data2 + 2) % 2;
+		*(ecc_data2 + 2) = *(ecc_data2 + 2) / 2;
+	}
+
+	for (i = 0; i< 6; i++ )
+		ecc_bit[i] = tmp2_bit[i + 2] ^ comp2_bit[i + 2];
+
+	for (i = 0; i < 8; i++)
+		ecc_bit[i + 6] = tmp0_bit[i] ^ comp0_bit[i];
+
+	for (i = 0; i < 8; i++)
+		ecc_bit[i + 14] = tmp1_bit[i] ^ comp1_bit[i];
+
+	ecc_bit[22] = tmp2_bit[0] ^ comp2_bit[0];
+	ecc_bit[23] = tmp2_bit[1] ^ comp2_bit[1];
+
+	for (i = 0; i < 24; i++)
+		ecc_sum += ecc_bit[i];
+
+	switch (ecc_sum) {
+	case 0:
+		/* Not reached because this function is not called if
+		   ECC values are equal */
+		return 0;
+
+	case 1:
+		/* Uncorrectable error */
+		DEBUG (MTD_DEBUG_LEVEL0, "ECC UNCORRECTED_ERROR 1\n");
+		return -1;
+
+	case 11:
+		/* UN-Correctable error */
+		DEBUG (MTD_DEBUG_LEVEL0, "ECC UNCORRECTED_ERROR B\n");
+		return -1;
+
+	case 12:
+		/* Correctable error */
+		find_byte = (ecc_bit[23] << 8) + 
+			    (ecc_bit[21] << 7) + 
+			    (ecc_bit[19] << 6) +
+			    (ecc_bit[17] << 5) +
+			    (ecc_bit[15] << 4) +
+			    (ecc_bit[13] << 3) +
+			    (ecc_bit[11] << 2) +
+			    (ecc_bit[9]  << 1) +
+			    ecc_bit[7];
+
+		find_bit = (ecc_bit[5] << 2) + (ecc_bit[3] << 1) + ecc_bit[1];
+
+		DEBUG (MTD_DEBUG_LEVEL0, "Correcting single bit ECC error at offset: %d, bit: %d\n", find_byte, find_bit);
+
+		page_data[find_byte] ^= (1 << find_bit);
+
+		return 0;
+	default:
+		if (isEccFF) {
+			if (ecc_data2[0] == 0 && ecc_data2[1] == 0 && ecc_data2[2] == 0)
+				return 0;
+		} 
+		DEBUG (MTD_DEBUG_LEVEL0, "UNCORRECTED_ERROR default\n");
+		return -1;
+	}
+} /* End omap_compare_ecc */
+
+static int omap_correct_data(struct mtd_info *mtd,u_char * dat,u_char * read_ecc,u_char * calc_ecc)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+	int blockCnt = 0, i = 0, ret = 0;
+
+	/* Ex NAND_ECC_HW12_2048 */
+	if ((info->nand.ecc.mode == NAND_ECC_HW) && (info->nand.ecc.size  == 2048))
+		blockCnt = 4;
+	else    
+		blockCnt = 1;
+
+	for (i = 0; i < blockCnt; i++) {
+		if (memcmp(read_ecc, calc_ecc, 3) != 0) {
+			ret = omap_compare_ecc(read_ecc, calc_ecc, dat);
+			if (ret < 0) return ret;
+		}
+		read_ecc += 3;
+		calc_ecc += 3;
+		dat      += 512;
+	}
+	return 0;
+} /* End omap_correct_data */
+
+
+/*
+** Generate non-inverted ECC bytes.
+**
+** Using noninverted ECC can be considered ugly since writing a blank
+** page ie. padding will clear the ECC bytes. This is no problem as long
+** nobody is trying to write data on the seemingly unused page.
+**
+** Reading an erased page will produce an ECC mismatch between
+** generated and read ECC bytes that has to be dealt with separately.
+*/
+static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+	unsigned long val = 0x0;
+	unsigned long reg, n;
+
+	/* Ex NAND_ECC_HW12_2048 */
+	if ((info->nand.ecc.mode == NAND_ECC_HW) && (info->nand.ecc.size  == 2048))
+		n = 4;
+	else    
+		n = 1;
+
+	/* Start Reading from HW ECC1_Result = 0x200 */
+	reg = (unsigned long)(info->gpmcBaseAddr + GPMC_ECC1_RESULT);  
+	while (n--) {
+		val = __raw_readl(reg);
+		*ecc_code++ = val;          /* P128e, ..., P1e */
+		*ecc_code++ = val >> 16;    /* P128o, ..., P1o */
+		/* P2048o, P1024o, P512o, P256o, P2048e, P1024e, P512e, P256e */
+		*ecc_code++ = ((val >> 8) & 0x0f) | ((val >> 20) & 0xf0);
+		reg += 4;
+	}
+	
+	return 0;
+	
+} /* omap_calculate_ecc */
+
+static void omap_enable_hwecc(struct mtd_info *mtd, int mode)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+	unsigned long val = __raw_readl(info->gpmcBaseAddr + GPMC_ECC_CONFIG);
+
+	switch (mode) {
+		case NAND_ECC_READ    :
+			__raw_writel(0x101,info->gpmcBaseAddr+GPMC_ECC_CONTROL);
+			/* ECC 16 bit col) | ( CS 0 )  | ECC Enable */
+			val = (1 << 7) | (0x0) | (0x1) ;
+			break;
+		case NAND_ECC_READSYN :
+			__raw_writel(0x100,info->gpmcBaseAddr+GPMC_ECC_CONTROL);
+			/* ECC 16 bit col) | ( CS 0 )  | ECC Enable */
+			val = (1 << 7) | (0x0) | (0x1) ;
+			break;
+		case NAND_ECC_WRITE   :
+			__raw_writel(0x101,info->gpmcBaseAddr+GPMC_ECC_CONTROL);
+			/* ECC 16 bit col) | ( CS 0 )  | ECC Enable */
+			val = (1 << 7) | (0x0) | (0x1) ;
+			break;
+		default:
+			DEBUG (MTD_DEBUG_LEVEL0, "Error: Unrecognized Mode[%d]!\n",mode);
+			BUG();
+			break;
+	}
+
+	__raw_writel(val,info->gpmcBaseAddr+GPMC_ECC_CONFIG);
+
+} /* End omap_enable_hwecc */
+
+static int omap_dev_ready(struct mtd_info *mtd)
+{
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);
+
+	unsigned int	val = __raw_readl(info->gpmcBaseAddr+GPMC_IRQ_STATUS);
+
+	if ((val & 0x100) == 0x100) {
+		/* Clear IRQ Interrupt */
+		val |= 0x100;
+		val &= ~(0x0);
+		__raw_writel(val,info->gpmcBaseAddr+GPMC_IRQ_STATUS);
+	} else {
+		unsigned int cnt = 0;
+		while (cnt++ < 0x1FF){
+			if  ((val & 0x100) == 0x100)
+				return 0;
+			val = __raw_readl(info->gpmcBaseAddr+GPMC_IRQ_STATUS);
+		}
+	}
+
+	return 1;
+} /* End omap_dev_ready */
+
+static int __devinit omap_nand_probe(struct platform_device *pdev)
+{
+	struct omap_nand_info		*info;
+	struct omap_nand_platform_data	*pdata;
+	int				err;
+	unsigned long val;
+
+
+	pdata = pdev->dev.platform_data;
+	if (pdata == NULL) {
+		dev_err(&pdev->dev, "platform data missing\n");
+		return -ENODEV;
+	}
+
+	info = kzalloc( sizeof(struct omap_nand_info), GFP_KERNEL);
+	if (!info) return -ENOMEM;
+
+	platform_set_drvdata(pdev, info);
+
+	spin_lock_init(&info->controller.lock);
+	init_waitqueue_head(&info->controller.wq);
+
+	info->pdev = pdev;
+	
+	info->gpmc_cs        = pdata->cs;
+	info->gpmcBaseAddr   = pdata->gpmcBaseAddr;
+	info->gpmcCsBaseAddr = pdata->gpmcCsBaseAddr;
+
+	info->mtd.priv  = &info->nand;
+	info->mtd.name  = pdev->dev.bus_id;
+	info->mtd.owner = THIS_MODULE;
+
+	err = gpmc_cs_request(info->gpmc_cs, NAND_IO_SIZE, &info->physBase);
+	if (err < 0) {
+		dev_err(&pdev->dev, "Cannot request GPMC CS\n");
+		goto out_free_info;
+	}
+
+	/* Enable RD PIN Monitoring Reg */
+	val  = gpmc_cs_read_reg(info->gpmc_cs,GPMC_CS_CONFIG1);
+	val |= WR_RD_PIN_MONITORING;
+	gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG1, val);
+
+	val  = gpmc_cs_read_reg(info->gpmc_cs,GPMC_CS_CONFIG7);
+	val &= ~(0xf << 8); 
+	val |=  (0xc & 0xf) << 8;
+	gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG7, val);
+
+	if (!request_mem_region(info->physBase, NAND_IO_SIZE, pdev->dev.driver->name)) {
+		err = -EBUSY;
+		goto out_free_cs;
+	}
+
+	info->nand.IO_ADDR_R = ioremap(info->physBase, NAND_IO_SIZE);
+	if (!info->nand.IO_ADDR_R) {
+		err = -ENOMEM;
+		goto out_release_mem_region;
+	}
+	info->nand.controller = &info->controller;
+
+	info->nand.IO_ADDR_W = info->nand.IO_ADDR_R;
+	info->nand.cmd_ctrl  = omap_hwcontrol;
+	
+	info->nand.read_buf  = omap_read_buf;
+	info->nand.write_buf = omap_write_buf;
+	info->nand.verify_buf = omap_verify_buf;
+	
+	info->nand.dev_ready  = omap_dev_ready;
+	info->nand.chip_delay = 0;
+
+	/* Options:                            */
+	info->nand.options   = NAND_BUSWIDTH_16;
+	info->nand.options  |= NAND_SKIP_BBTSCAN;
+
+	if (hw_ecc) {
+		/* init HW ECC */
+		omap_hwecc_init(&info->mtd);
+
+		info->nand.ecc.calculate = omap_calculate_ecc;
+		info->nand.ecc.hwctl     = omap_enable_hwecc;
+		info->nand.ecc.correct   = omap_correct_data;
+		info->nand.ecc.mode      = NAND_ECC_HW;
+		info->nand.ecc.bytes     = 12;
+		info->nand.ecc.size      = 2048;
+		info->nand.ecc.layout    = &omap_hw_eccoob;
+
+	} else {
+		info->nand.ecc.mode = NAND_ECC_SOFT;
+	}
+
+
+	/* DIP switches on some boards change between 8 and 16 bit
+	 * bus widths for flash.  Try the other width if the first try fails.
+	 */
+	if (nand_scan(&info->mtd, 1)) {
+		info->nand.options ^= NAND_BUSWIDTH_16;
+		if (nand_scan(&info->mtd, 1)) {
+			err = -ENXIO;
+			goto out_release_mem_region;
+		}
+	}
+
+#ifdef CONFIG_MTD_PARTITIONS
+	err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0);
+	if (err > 0)
+		add_mtd_partitions(&info->mtd, info->parts, err);
+	else if (err < 0 && pdata->parts)
+		add_mtd_partitions(&info->mtd, pdata->parts, pdata->nr_parts);
+	else
+#endif
+		add_mtd_device(&info->mtd);
+
+	omap_nandWP(&info->mtd,NAND_WP_OFF);
+
+	platform_set_drvdata(pdev, &info->mtd);
+
+	return 0;
+
+out_release_mem_region:
+	release_mem_region(info->physBase, NAND_IO_SIZE);
+out_free_cs:
+	gpmc_cs_free(info->gpmc_cs);
+out_free_info:
+	kfree(info);
+
+	return err;
+} /* End omap_nand_probe */
+
+static int omap_nand_remove(struct platform_device *pdev)
+{
+	struct mtd_info *mtd = platform_get_drvdata(pdev);
+	struct omap_nand_info *info = mtd->priv;
+
+	platform_set_drvdata(pdev, NULL);
+	/* Release NAND device, its internal structures and partitions */
+	nand_release(&info->mtd);
+	iounmap(info->nand.IO_ADDR_R);
+	kfree(&info->mtd);
+	return 0;
+}
+
+static struct platform_driver omap_nand_driver = {
+	.probe		= omap_nand_probe,
+	.remove		= omap_nand_remove,
+	.driver		= {
+		.name	= DRIVER_NAME,
+		.owner	= THIS_MODULE,
+	},
+};
+MODULE_ALIAS(DRIVER_NAME);
+
+static int __init omap_nand_init(void)
+{
+	printk(KERN_INFO "%s driver initializing\n",DRIVER_NAME);
+	return platform_driver_register(&omap_nand_driver);
+}
+
+static void __exit omap_nand_exit(void)
+{
+	platform_driver_unregister(&omap_nand_driver);
+}
+
+module_init(omap_nand_init);
+module_exit(omap_nand_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Shahrom SharifKashani <sshahrom@micron.com> (and others)");
+MODULE_DESCRIPTION("Glue layer for NAND flash on TI OMAP boards");
+
diff --git a/include/asm-arm/arch-omap/nand.h b/include/asm-arm/arch-omap/nand.h
new file mode 100644
index 0000000..051d7d9
--- /dev/null
+++ b/include/asm-arm/arch-omap/nand.h
@@ -0,0 +1,91 @@
+/*
+ * include/asm-arm/arch-omap/nand.h
+ *
+ * Copyright (C) 2006 Micron Technology Inc.
+ * Author: Shahrom Sharif-Kashani
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/mtd/partitions.h>
+
+struct omap_nand_platform_data {
+	int			cs;
+	int			gpioIRQ;
+	struct mtd_partition	*parts;
+	int			nr_parts;
+	int                     (*nand_setup)(void __iomem *);
+	int			dma_channel;
+	void __iomem            *gpmcCsBaseAddr;
+	void __iomem            *gpmcBaseAddr;
+};
+
+#define NAND_Ecc_P1e		(1 << 0)
+#define NAND_Ecc_P2e		(1 << 1)
+#define NAND_Ecc_P4e		(1 << 2)
+#define NAND_Ecc_P8e		(1 << 3)
+#define NAND_Ecc_P16e		(1 << 4)
+#define NAND_Ecc_P32e		(1 << 5)
+#define NAND_Ecc_P64e		(1 << 6)
+#define NAND_Ecc_P128e		(1 << 7)
+#define NAND_Ecc_P256e		(1 << 8)
+#define NAND_Ecc_P512e		(1 << 9)
+#define NAND_Ecc_P1024e		(1 << 10)
+#define NAND_Ecc_P2048e		(1 << 11)
+
+#define NAND_Ecc_P1o		(1 << 16)
+#define NAND_Ecc_P2o		(1 << 17)
+#define NAND_Ecc_P4o		(1 << 18)
+#define NAND_Ecc_P8o		(1 << 19)
+#define NAND_Ecc_P16o		(1 << 20)
+#define NAND_Ecc_P32o		(1 << 21)
+#define NAND_Ecc_P64o		(1 << 22)
+#define NAND_Ecc_P128o		(1 << 23)
+#define NAND_Ecc_P256o		(1 << 24)
+#define NAND_Ecc_P512o		(1 << 25)
+#define NAND_Ecc_P1024o		(1 << 26)
+#define NAND_Ecc_P2048o		(1 << 27)
+
+#define TF(value)	(value ? 1 : 0)
+
+#define P2048e(a)	(TF(a & NAND_Ecc_P2048e)	<< 0 )
+#define P2048o(a)	(TF(a & NAND_Ecc_P2048o)	<< 1 )
+#define P1e(a)		(TF(a & NAND_Ecc_P1e)		<< 2 )
+#define P1o(a)		(TF(a & NAND_Ecc_P1o)		<< 3 )
+#define P2e(a)		(TF(a & NAND_Ecc_P2e)		<< 4 )
+#define P2o(a)		(TF(a & NAND_Ecc_P2o)		<< 5 )
+#define P4e(a)		(TF(a & NAND_Ecc_P4e)		<< 6 )
+#define P4o(a)		(TF(a & NAND_Ecc_P4o)		<< 7 )
+
+#define P8e(a)		(TF(a & NAND_Ecc_P8e)		<< 0 )
+#define P8o(a)		(TF(a & NAND_Ecc_P8o)		<< 1 )
+#define P16e(a)		(TF(a & NAND_Ecc_P16e)		<< 2 )
+#define P16o(a)		(TF(a & NAND_Ecc_P16o)		<< 3 )
+#define P32e(a)		(TF(a & NAND_Ecc_P32e)		<< 4 )
+#define P32o(a)		(TF(a & NAND_Ecc_P32o)		<< 5 )
+#define P64e(a)		(TF(a & NAND_Ecc_P64e)		<< 6 )
+#define P64o(a)		(TF(a & NAND_Ecc_P64o)		<< 7 )
+
+#define P128e(a)	(TF(a & NAND_Ecc_P128e)		<< 0 )
+#define P128o(a)	(TF(a & NAND_Ecc_P128o)		<< 1 )
+#define P256e(a)	(TF(a & NAND_Ecc_P256e)		<< 2 )
+#define P256o(a)	(TF(a & NAND_Ecc_P256o)		<< 3 )
+#define P512e(a)	(TF(a & NAND_Ecc_P512e)		<< 4 )
+#define P512o(a)	(TF(a & NAND_Ecc_P512o)		<< 5 )
+#define P1024e(a)	(TF(a & NAND_Ecc_P1024e)	<< 6 )
+#define P1024o(a)	(TF(a & NAND_Ecc_P1024o)	<< 7 )
+
+#define P8e_s(a)	(TF(a & NAND_Ecc_P8e)		<< 0 )
+#define P8o_s(a)	(TF(a & NAND_Ecc_P8o)		<< 1 )
+#define P16e_s(a)	(TF(a & NAND_Ecc_P16e)		<< 2 )
+#define P16o_s(a)	(TF(a & NAND_Ecc_P16o)		<< 3 )
+#define P1e_s(a)	(TF(a & NAND_Ecc_P1e)		<< 4 )
+#define P1o_s(a)	(TF(a & NAND_Ecc_P1o)		<< 5 )
+#define P2e_s(a)	(TF(a & NAND_Ecc_P2e)		<< 6 )
+#define P2o_s(a)	(TF(a & NAND_Ecc_P2o)		<< 7 )
+
+#define P4e_s(a)	(TF(a & NAND_Ecc_P4e)		<< 0 )
+#define P4o_s(a)	(TF(a & NAND_Ecc_P4o)		<< 1 )
+

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/3] OMAP: Adding Support for 2K nand page support for omap2430
  2007-07-27 17:14 [PATCH 2/3] OMAP: Adding Support for 2K nand page support for omap2430 sshahrom
@ 2007-08-10 10:43 ` Tony Lindgren
  2007-08-27 16:34   ` sshahrom
  0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2007-08-10 10:43 UTC (permalink / raw)
  To: sshahrom; +Cc: linux-omap-open-source

Hi,

* sshahrom@micron.com <sshahrom@micron.com> [070727 10:18]:
> Hi,
> Continuing with rest of the patch series on linux.omap.com. 
> 
> 
> Signed-off-by: Shahrom Sharif-Kashani <sshahrom@micron.com>
> 
> 
> :000000 100644 0000000... 8ec2004... A	drivers/mtd/nand/omap2.c
> :000000 100644 0000000... 051d7d9... A	include/asm-arm/arch-omap/nand.h
> 
> diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
> new file mode 100644
> index 0000000..8ec2004
> --- /dev/null
> +++ b/drivers/mtd/nand/omap2.c

<snip>

Could this be merged with omap-nand-flash.c?

Regards,

Tony

^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [PATCH 2/3] OMAP: Adding Support for 2K nand page support for omap2430
  2007-08-10 10:43 ` Tony Lindgren
@ 2007-08-27 16:34   ` sshahrom
  2007-09-17 19:21     ` Tony Lindgren
  0 siblings, 1 reply; 5+ messages in thread
From: sshahrom @ 2007-08-27 16:34 UTC (permalink / raw)
  To: tony; +Cc: linux-omap-open-source

Hi;
Sorry, I just got back from vacation. The difference between omap-nand-flash.c and omap2.c was so much that I thought modify omap-nand-flash.c file would cause more confusion. But I am open to any suggestion.
Regards,
-Shahrom 

-----Original Message-----
From: Tony Lindgren [mailto:tony@atomide.com] 
Sent: Friday, August 10, 2007 3:43 AM
To: sshahrom
Cc: linux-omap-open-source@linux.omap.com
Subject: Re: [PATCH 2/3] OMAP: Adding Support for 2K nand page support foromap2430

Hi,

* sshahrom@micron.com <sshahrom@micron.com> [070727 10:18]:
> Hi,
> Continuing with rest of the patch series on linux.omap.com. 
> 
> 
> Signed-off-by: Shahrom Sharif-Kashani <sshahrom@micron.com>
> 
> 
> :000000 100644 0000000... 8ec2004... A	drivers/mtd/nand/omap2.c
> :000000 100644 0000000... 051d7d9... A	include/asm-arm/arch-omap/nand.h
> 
> diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c new 
> file mode 100644 index 0000000..8ec2004
> --- /dev/null
> +++ b/drivers/mtd/nand/omap2.c

<snip>

Could this be merged with omap-nand-flash.c?

Regards,

Tony

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/3] OMAP: Adding Support for 2K nand page support for omap2430
  2007-08-27 16:34   ` sshahrom
@ 2007-09-17 19:21     ` Tony Lindgren
  2007-09-18 22:03       ` OMAP: Adding Support for 2K nand page support foromap2430 sshahrom
  0 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2007-09-17 19:21 UTC (permalink / raw)
  To: sshahrom; +Cc: linux-omap-open-source

[-- Attachment #1: Type: text/plain, Size: 643 bytes --]

* sshahrom@micron.com <sshahrom@micron.com> [070827 09:34]:
> Hi;
> Sorry, I just got back from vacation. The difference between omap-nand-flash.c and omap2.c was so much that I thought modify omap-nand-flash.c file would cause more confusion. But I am open to any suggestion.

Can you please fix the following things so we can apply this:

- Please noCamelCase in linux code
- Some of the code should/could use gpmc.c code
- CodingStyle, see following output from scripts/checkpatch.pl

Mostly stuff that would be a showstopper merging it upstream in
MTD list anyways. You might want to run checkpatch.pl on all
your patches!

Regards,

Tony

[-- Attachment #2: checkpatch.pl-errors --]
[-- Type: text/plain, Size: 19043 bytes --]

ERROR: trailing whitespace
#21: FILE: drivers/mtd/nand/omap2.c:5:
+ * Copyright (c) 2004 Micron Technology Inc. $

CHECK: Use #include <linux/io.h> instead of <asm/io.h>
#40: FILE: drivers/mtd/nand/omap2.c:24:
+#include <asm/io.h>

CHECK: Use #include <linux/io.h> instead of <asm/io.h>
#47: FILE: drivers/mtd/nand/omap2.c:31:
+#include <asm/io.h>

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                    ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                      ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                        ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                          ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                            ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                              ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                                ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                                  ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                                     ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                                        ^

ERROR: need space after that ',' (ctx:VxV)
#77: FILE: drivers/mtd/nand/omap2.c:61:
+	.eccpos = {2,3,4,5,6,7,8,9,10,11,12,13},
                                           ^

WARNING: line over 80 characters
#96: FILE: drivers/mtd/nand/omap2.c:80:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

WARNING: line over 80 characters
#120: FILE: drivers/mtd/nand/omap2.c:104:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

ERROR: switch and case should be at the same indent
#122: FILE: drivers/mtd/nand/omap2.c:106:
+	switch (ctrl) {

+		case NAND_CTRL_CHANGE | NAND_CTRL_CLE:
[...]
+		case NAND_CTRL_CHANGE | NAND_CTRL_ALE:
[...]
+		case NAND_CTRL_CHANGE | NAND_NCE:


WARNING: line over 80 characters
#124: FILE: drivers/mtd/nand/omap2.c:108:
+			info->nand.IO_ADDR_W = info->gpmcCsBaseAddr + GPMC_CS_NAND_COMMAND;

WARNING: line over 80 characters
#125: FILE: drivers/mtd/nand/omap2.c:109:
+			info->nand.IO_ADDR_R = info->gpmcCsBaseAddr + GPMC_CS_NAND_DATA;

ERROR: trailing whitespace
#127: FILE: drivers/mtd/nand/omap2.c:111:
+^I	$

WARNING: line over 80 characters
#129: FILE: drivers/mtd/nand/omap2.c:113:
+			info->nand.IO_ADDR_W = info->gpmcCsBaseAddr + GPMC_CS_NAND_ADDRESS;

WARNING: line over 80 characters
#130: FILE: drivers/mtd/nand/omap2.c:114:
+			info->nand.IO_ADDR_R = info->gpmcCsBaseAddr + GPMC_CS_NAND_DATA;

WARNING: line over 80 characters
#134: FILE: drivers/mtd/nand/omap2.c:118:
+			info->nand.IO_ADDR_W = info->gpmcCsBaseAddr + GPMC_CS_NAND_DATA;

WARNING: line over 80 characters
#135: FILE: drivers/mtd/nand/omap2.c:119:
+			info->nand.IO_ADDR_R = info->gpmcCsBaseAddr + GPMC_CS_NAND_DATA;

ERROR: no space after that open parenthesis '('
#140: FILE: drivers/mtd/nand/omap2.c:124:
+		__raw_writeb( cmd, info->nand.IO_ADDR_W );

ERROR: no space before that close parenthesis ')'
#140: FILE: drivers/mtd/nand/omap2.c:124:
+		__raw_writeb( cmd, info->nand.IO_ADDR_W );

WARNING: line over 80 characters
#152: FILE: drivers/mtd/nand/omap2.c:136:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

WARNING: line over 80 characters
#171: FILE: drivers/mtd/nand/omap2.c:155:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

WARNING: line over 80 characters
#179: FILE: drivers/mtd/nand/omap2.c:163:
+		while (GPMC_BUF_EMPTY==(readl(info->gpmcBaseAddr+GPMC_STATUS)&GPMC_BUF_FULL)) ;

ERROR: need spaces around that '==' (ctx:VxV)
#179: FILE: drivers/mtd/nand/omap2.c:163:
+		while (GPMC_BUF_EMPTY==(readl(info->gpmcBaseAddr+GPMC_STATUS)&GPMC_BUF_FULL)) ;
                                     ^

WARNING: line over 80 characters
#190: FILE: drivers/mtd/nand/omap2.c:174:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

WARNING: line over 80 characters
#206: FILE: drivers/mtd/nand/omap2.c:190:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

ERROR: no space after that open parenthesis '('
#212: FILE: drivers/mtd/nand/omap2.c:196:
+	val = ( (0x00000001<<8) | 0x00000001 );

ERROR: no space before that close parenthesis ')'
#212: FILE: drivers/mtd/nand/omap2.c:196:
+	val = ( (0x00000001<<8) | 0x00000001 );

ERROR: need space after that ',' (ctx:VxV)
#213: FILE: drivers/mtd/nand/omap2.c:197:
+	__raw_writel(val,info->gpmcBaseAddr+GPMC_ECC_CONTROL);
                        ^

WARNING: line over 80 characters
#217: FILE: drivers/mtd/nand/omap2.c:201:
+	/*       ECCSIZE1=512   |  ECCSIZE0=8bytes | Select eccResultsize[0123] */

ERROR: need space after that ',' (ctx:VxV)
#219: FILE: drivers/mtd/nand/omap2.c:203:
+	__raw_writel(val,info->gpmcBaseAddr+GPMC_ECC_SIZE_CONFIG);
                        ^

ERROR: trailing whitespace
#230: FILE: drivers/mtd/nand/omap2.c:214:
+^Iu32 tmp = ecc_buf[0] | (ecc_buf[1] << 16) | $

ERROR: trailing whitespace
#233: FILE: drivers/mtd/nand/omap2.c:217:
+^Iecc_buf[0] = ~(P64o(tmp) | P64e(tmp) | P32o(tmp) | P32e(tmp) | $

ERROR: no space before that close parenthesis ')'
#234: FILE: drivers/mtd/nand/omap2.c:218:
+		       P16o(tmp) | P16e(tmp) | P8o(tmp) | P8e(tmp) );

ERROR: trailing whitespace
#235: FILE: drivers/mtd/nand/omap2.c:219:
+^Iecc_buf[1] = ~(P1024o(tmp) | P1024e(tmp) | P512o(tmp) | P512e(tmp) | $

ERROR: no space after that open parenthesis '('
#237: FILE: drivers/mtd/nand/omap2.c:221:
+	ecc_buf[2] = ~( P4o(tmp) | P4e(tmp) | P2o(tmp) | P2e(tmp) | P1o(tmp) |

ERROR: use tabs not spaces
#238: FILE: drivers/mtd/nand/omap2.c:222:
+^I	       	P1e(tmp) | P2048o(tmp) | P2048e(tmp));$

ERROR: use tabs not spaces
#276: FILE: drivers/mtd/nand/omap2.c:260:
+        }$

ERROR: need spaces around that '<' (ctx:VxW)
#298: FILE: drivers/mtd/nand/omap2.c:282:
+	for (i = 0; i< 6; i++ )
                     ^

ERROR: no space before that close parenthesis ')'
#298: FILE: drivers/mtd/nand/omap2.c:282:
+	for (i = 0; i< 6; i++ )

WARNING: no space between function name and open parenthesis '('
#321: FILE: drivers/mtd/nand/omap2.c:305:
+		DEBUG (MTD_DEBUG_LEVEL0, "ECC UNCORRECTED_ERROR 1\n");

WARNING: no space between function name and open parenthesis '('
#326: FILE: drivers/mtd/nand/omap2.c:310:
+		DEBUG (MTD_DEBUG_LEVEL0, "ECC UNCORRECTED_ERROR B\n");

ERROR: trailing whitespace
#331: FILE: drivers/mtd/nand/omap2.c:315:
+^I	find_byte = (ecc_bit[23] << 8) + $

ERROR: trailing whitespace
#332: FILE: drivers/mtd/nand/omap2.c:316:
+^I		    (ecc_bit[21] << 7) + $

WARNING: line over 80 characters
#343: FILE: drivers/mtd/nand/omap2.c:327:
+		DEBUG (MTD_DEBUG_LEVEL0, "Correcting single bit ECC error at offset: %d, bit: %d\n", find_byte, find_bit);

WARNING: no space between function name and open parenthesis '('
#343: FILE: drivers/mtd/nand/omap2.c:327:
+		DEBUG (MTD_DEBUG_LEVEL0, "Correcting single bit ECC error at offset: %d, bit: %d\n", find_byte, find_bit);

WARNING: line over 80 characters
#350: FILE: drivers/mtd/nand/omap2.c:334:
+			if (ecc_data2[0] == 0 && ecc_data2[1] == 0 && ecc_data2[2] == 0)

ERROR: trailing whitespace
#352: FILE: drivers/mtd/nand/omap2.c:336:
+^I	} $

WARNING: no space between function name and open parenthesis '('
#353: FILE: drivers/mtd/nand/omap2.c:337:
+		DEBUG (MTD_DEBUG_LEVEL0, "UNCORRECTED_ERROR default\n");

WARNING: line over 80 characters
#358: FILE: drivers/mtd/nand/omap2.c:342:
+static int omap_correct_data(struct mtd_info *mtd,u_char * dat,u_char * read_ecc,u_char * calc_ecc)

ERROR: need space after that ',' (ctx:VxV)
#358: FILE: drivers/mtd/nand/omap2.c:342:
+static int omap_correct_data(struct mtd_info *mtd,u_char * dat,u_char * read_ecc,u_char * calc_ecc)
                                                  ^

ERROR: need space after that ',' (ctx:VxV)
#358: FILE: drivers/mtd/nand/omap2.c:342:
+static int omap_correct_data(struct mtd_info *mtd,u_char * dat,u_char * read_ecc,u_char * calc_ecc)
                                                               ^

ERROR: need space after that ',' (ctx:VxV)
#358: FILE: drivers/mtd/nand/omap2.c:342:
+static int omap_correct_data(struct mtd_info *mtd,u_char * dat,u_char * read_ecc,u_char * calc_ecc)
                                                                                 ^

WARNING: line over 80 characters
#360: FILE: drivers/mtd/nand/omap2.c:344:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

WARNING: line over 80 characters
#364: FILE: drivers/mtd/nand/omap2.c:348:
+	if ((info->nand.ecc.mode == NAND_ECC_HW) && (info->nand.ecc.size  == 2048))

ERROR: trailing whitespace
#366: FILE: drivers/mtd/nand/omap2.c:350:
+^Ielse    $

WARNING: line over 80 characters
#392: FILE: drivers/mtd/nand/omap2.c:376:
+static int omap_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)

WARNING: line over 80 characters
#394: FILE: drivers/mtd/nand/omap2.c:378:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

WARNING: line over 80 characters
#399: FILE: drivers/mtd/nand/omap2.c:383:
+	if ((info->nand.ecc.mode == NAND_ECC_HW) && (info->nand.ecc.size  == 2048))

ERROR: trailing whitespace
#401: FILE: drivers/mtd/nand/omap2.c:385:
+^Ielse    $

ERROR: trailing whitespace
#405: FILE: drivers/mtd/nand/omap2.c:389:
+^Ireg = (unsigned long)(info->gpmcBaseAddr + GPMC_ECC1_RESULT);  $

ERROR: trailing whitespace
#414: FILE: drivers/mtd/nand/omap2.c:398:
+^I$

ERROR: trailing whitespace
#416: FILE: drivers/mtd/nand/omap2.c:400:
+^I$

WARNING: line over 80 characters
#421: FILE: drivers/mtd/nand/omap2.c:405:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

ERROR: switch and case should be at the same indent
#424: FILE: drivers/mtd/nand/omap2.c:408:
+	switch (mode) {

+		case NAND_ECC_READ    :
[...]
+		case NAND_ECC_READSYN :
[...]
+		case NAND_ECC_WRITE   :
[...]
+		default:


ERROR: need space after that ',' (ctx:VxV)
#426: FILE: drivers/mtd/nand/omap2.c:410:
+			__raw_writel(0x101,info->gpmcBaseAddr+GPMC_ECC_CONTROL);
                                          ^

ERROR: need space after that ',' (ctx:VxV)
#431: FILE: drivers/mtd/nand/omap2.c:415:
+			__raw_writel(0x100,info->gpmcBaseAddr+GPMC_ECC_CONTROL);
                                          ^

ERROR: need space after that ',' (ctx:VxV)
#436: FILE: drivers/mtd/nand/omap2.c:420:
+			__raw_writel(0x101,info->gpmcBaseAddr+GPMC_ECC_CONTROL);
                                          ^

WARNING: line over 80 characters
#441: FILE: drivers/mtd/nand/omap2.c:425:
+			DEBUG (MTD_DEBUG_LEVEL0, "Error: Unrecognized Mode[%d]!\n",mode);

WARNING: no space between function name and open parenthesis '('
#441: FILE: drivers/mtd/nand/omap2.c:425:
+			DEBUG (MTD_DEBUG_LEVEL0, "Error: Unrecognized Mode[%d]!\n",mode);

ERROR: need space after that ',' (ctx:VxV)
#441: FILE: drivers/mtd/nand/omap2.c:425:
+			DEBUG (MTD_DEBUG_LEVEL0, "Error: Unrecognized Mode[%d]!\n",mode);
                                                                                  ^

ERROR: need space after that ',' (ctx:VxV)
#446: FILE: drivers/mtd/nand/omap2.c:430:
+	__raw_writel(val,info->gpmcBaseAddr+GPMC_ECC_CONFIG);
                        ^

WARNING: line over 80 characters
#452: FILE: drivers/mtd/nand/omap2.c:436:
+	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, mtd);

ERROR: need space after that ',' (ctx:VxV)
#460: FILE: drivers/mtd/nand/omap2.c:444:
+		__raw_writel(val,info->gpmcBaseAddr+GPMC_IRQ_STATUS);
                                ^

ERROR: need a space before the open brace '{'
#463: FILE: drivers/mtd/nand/omap2.c:447:
+		while (cnt++ < 0x1FF){

ERROR: no space after that open parenthesis '('
#487: FILE: drivers/mtd/nand/omap2.c:471:
+	info = kzalloc( sizeof(struct omap_nand_info), GFP_KERNEL);

ERROR: trailing whitespace
#496: FILE: drivers/mtd/nand/omap2.c:480:
+^I$

ERROR: need space after that ',' (ctx:VxV)
#512: FILE: drivers/mtd/nand/omap2.c:496:
+	val  = gpmc_cs_read_reg(info->gpmc_cs,GPMC_CS_CONFIG1);
                                             ^

ERROR: need space after that ',' (ctx:VxV)
#516: FILE: drivers/mtd/nand/omap2.c:500:
+	val  = gpmc_cs_read_reg(info->gpmc_cs,GPMC_CS_CONFIG7);
                                             ^

ERROR: trailing whitespace
#517: FILE: drivers/mtd/nand/omap2.c:501:
+^Ival &= ~(0xf << 8); $

WARNING: line over 80 characters
#521: FILE: drivers/mtd/nand/omap2.c:505:
+	if (!request_mem_region(info->physBase, NAND_IO_SIZE, pdev->dev.driver->name)) {

ERROR: trailing whitespace
#535: FILE: drivers/mtd/nand/omap2.c:519:
+^I$

ERROR: trailing whitespace
#539: FILE: drivers/mtd/nand/omap2.c:523:
+^I$

ERROR: need space after that ',' (ctx:VxV)
#585: FILE: drivers/mtd/nand/omap2.c:569:
+	omap_nandWP(&info->mtd,NAND_WP_OFF);
                              ^

ERROR: need space after that ',' (ctx:VxV)
#626: FILE: drivers/mtd/nand/omap2.c:610:
+	printk(KERN_INFO "%s driver initializing\n",DRIVER_NAME);
                                                   ^

ERROR: no space before that close parenthesis ')'
#700: FILE: include/asm-arm/arch-omap/nand.h:53:
+#define P2048e(a)	(TF(a & NAND_Ecc_P2048e)	<< 0 )

ERROR: no space before that close parenthesis ')'
#701: FILE: include/asm-arm/arch-omap/nand.h:54:
+#define P2048o(a)	(TF(a & NAND_Ecc_P2048o)	<< 1 )

ERROR: no space before that close parenthesis ')'
#702: FILE: include/asm-arm/arch-omap/nand.h:55:
+#define P1e(a)		(TF(a & NAND_Ecc_P1e)		<< 2 )

ERROR: no space before that close parenthesis ')'
#703: FILE: include/asm-arm/arch-omap/nand.h:56:
+#define P1o(a)		(TF(a & NAND_Ecc_P1o)		<< 3 )

ERROR: no space before that close parenthesis ')'
#704: FILE: include/asm-arm/arch-omap/nand.h:57:
+#define P2e(a)		(TF(a & NAND_Ecc_P2e)		<< 4 )

ERROR: no space before that close parenthesis ')'
#705: FILE: include/asm-arm/arch-omap/nand.h:58:
+#define P2o(a)		(TF(a & NAND_Ecc_P2o)		<< 5 )

ERROR: no space before that close parenthesis ')'
#706: FILE: include/asm-arm/arch-omap/nand.h:59:
+#define P4e(a)		(TF(a & NAND_Ecc_P4e)		<< 6 )

ERROR: no space before that close parenthesis ')'
#707: FILE: include/asm-arm/arch-omap/nand.h:60:
+#define P4o(a)		(TF(a & NAND_Ecc_P4o)		<< 7 )

ERROR: no space before that close parenthesis ')'
#709: FILE: include/asm-arm/arch-omap/nand.h:62:
+#define P8e(a)		(TF(a & NAND_Ecc_P8e)		<< 0 )

ERROR: no space before that close parenthesis ')'
#710: FILE: include/asm-arm/arch-omap/nand.h:63:
+#define P8o(a)		(TF(a & NAND_Ecc_P8o)		<< 1 )

ERROR: no space before that close parenthesis ')'
#711: FILE: include/asm-arm/arch-omap/nand.h:64:
+#define P16e(a)		(TF(a & NAND_Ecc_P16e)		<< 2 )

ERROR: no space before that close parenthesis ')'
#712: FILE: include/asm-arm/arch-omap/nand.h:65:
+#define P16o(a)		(TF(a & NAND_Ecc_P16o)		<< 3 )

ERROR: no space before that close parenthesis ')'
#713: FILE: include/asm-arm/arch-omap/nand.h:66:
+#define P32e(a)		(TF(a & NAND_Ecc_P32e)		<< 4 )

ERROR: no space before that close parenthesis ')'
#714: FILE: include/asm-arm/arch-omap/nand.h:67:
+#define P32o(a)		(TF(a & NAND_Ecc_P32o)		<< 5 )

ERROR: no space before that close parenthesis ')'
#715: FILE: include/asm-arm/arch-omap/nand.h:68:
+#define P64e(a)		(TF(a & NAND_Ecc_P64e)		<< 6 )

ERROR: no space before that close parenthesis ')'
#716: FILE: include/asm-arm/arch-omap/nand.h:69:
+#define P64o(a)		(TF(a & NAND_Ecc_P64o)		<< 7 )

ERROR: no space before that close parenthesis ')'
#718: FILE: include/asm-arm/arch-omap/nand.h:71:
+#define P128e(a)	(TF(a & NAND_Ecc_P128e)		<< 0 )

ERROR: no space before that close parenthesis ')'
#719: FILE: include/asm-arm/arch-omap/nand.h:72:
+#define P128o(a)	(TF(a & NAND_Ecc_P128o)		<< 1 )

ERROR: no space before that close parenthesis ')'
#720: FILE: include/asm-arm/arch-omap/nand.h:73:
+#define P256e(a)	(TF(a & NAND_Ecc_P256e)		<< 2 )

ERROR: no space before that close parenthesis ')'
#721: FILE: include/asm-arm/arch-omap/nand.h:74:
+#define P256o(a)	(TF(a & NAND_Ecc_P256o)		<< 3 )

ERROR: no space before that close parenthesis ')'
#722: FILE: include/asm-arm/arch-omap/nand.h:75:
+#define P512e(a)	(TF(a & NAND_Ecc_P512e)		<< 4 )

ERROR: no space before that close parenthesis ')'
#723: FILE: include/asm-arm/arch-omap/nand.h:76:
+#define P512o(a)	(TF(a & NAND_Ecc_P512o)		<< 5 )

ERROR: no space before that close parenthesis ')'
#724: FILE: include/asm-arm/arch-omap/nand.h:77:
+#define P1024e(a)	(TF(a & NAND_Ecc_P1024e)	<< 6 )

ERROR: no space before that close parenthesis ')'
#725: FILE: include/asm-arm/arch-omap/nand.h:78:
+#define P1024o(a)	(TF(a & NAND_Ecc_P1024o)	<< 7 )

ERROR: no space before that close parenthesis ')'
#727: FILE: include/asm-arm/arch-omap/nand.h:80:
+#define P8e_s(a)	(TF(a & NAND_Ecc_P8e)		<< 0 )

ERROR: no space before that close parenthesis ')'
#728: FILE: include/asm-arm/arch-omap/nand.h:81:
+#define P8o_s(a)	(TF(a & NAND_Ecc_P8o)		<< 1 )

ERROR: no space before that close parenthesis ')'
#729: FILE: include/asm-arm/arch-omap/nand.h:82:
+#define P16e_s(a)	(TF(a & NAND_Ecc_P16e)		<< 2 )

ERROR: no space before that close parenthesis ')'
#730: FILE: include/asm-arm/arch-omap/nand.h:83:
+#define P16o_s(a)	(TF(a & NAND_Ecc_P16o)		<< 3 )

ERROR: no space before that close parenthesis ')'
#731: FILE: include/asm-arm/arch-omap/nand.h:84:
+#define P1e_s(a)	(TF(a & NAND_Ecc_P1e)		<< 4 )

ERROR: no space before that close parenthesis ')'
#732: FILE: include/asm-arm/arch-omap/nand.h:85:
+#define P1o_s(a)	(TF(a & NAND_Ecc_P1o)		<< 5 )

ERROR: no space before that close parenthesis ')'
#733: FILE: include/asm-arm/arch-omap/nand.h:86:
+#define P2e_s(a)	(TF(a & NAND_Ecc_P2e)		<< 6 )

ERROR: no space before that close parenthesis ')'
#734: FILE: include/asm-arm/arch-omap/nand.h:87:
+#define P2o_s(a)	(TF(a & NAND_Ecc_P2o)		<< 7 )

ERROR: no space before that close parenthesis ')'
#736: FILE: include/asm-arm/arch-omap/nand.h:89:
+#define P4e_s(a)	(TF(a & NAND_Ecc_P4e)		<< 0 )

ERROR: no space before that close parenthesis ')'
#737: FILE: include/asm-arm/arch-omap/nand.h:90:
+#define P4o_s(a)	(TF(a & NAND_Ecc_P4o)		<< 1 )

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]



^ permalink raw reply	[flat|nested] 5+ messages in thread

* OMAP: Adding Support for 2K nand page support foromap2430
  2007-09-17 19:21     ` Tony Lindgren
@ 2007-09-18 22:03       ` sshahrom
  0 siblings, 0 replies; 5+ messages in thread
From: sshahrom @ 2007-09-18 22:03 UTC (permalink / raw)
  To: tony; +Cc: linux-omap-open-source

Hi,
I will do that and resubmit. 
Thanks,
-Shahrom 

-----Original Message-----
From: Tony Lindgren [mailto:tony@atomide.com] 
Sent: Monday, September 17, 2007 12:21 PM
To: sshahrom
Cc: linux-omap-open-source@linux.omap.com
Subject: Re: [PATCH 2/3] OMAP: Adding Support for 2K nand page support foromap2430

* sshahrom@micron.com <sshahrom@micron.com> [070827 09:34]:
> Hi;
> Sorry, I just got back from vacation. The difference between omap-nand-flash.c and omap2.c was so much that I thought modify omap-nand-flash.c file would cause more confusion. But I am open to any suggestion.

Can you please fix the following things so we can apply this:

- Please noCamelCase in linux code
- Some of the code should/could use gpmc.c code
- CodingStyle, see following output from scripts/checkpatch.pl

Mostly stuff that would be a showstopper merging it upstream in MTD list anyways. You might want to run checkpatch.pl on all your patches!

Regards,

Tony

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2007-09-18 22:03 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-27 17:14 [PATCH 2/3] OMAP: Adding Support for 2K nand page support for omap2430 sshahrom
2007-08-10 10:43 ` Tony Lindgren
2007-08-27 16:34   ` sshahrom
2007-09-17 19:21     ` Tony Lindgren
2007-09-18 22:03       ` OMAP: Adding Support for 2K nand page support foromap2430 sshahrom

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox