X-Account-Key: account2 X-Mozilla-Keys: Received: from mx05.mfg.onr.siteprotect.com (unknown [192.168.33.227]) by mf26.mfg.onr.chicago.hostway (Postfix) with ESMTP id 8C063EFC5D4 for ; Wed, 13 May 2009 22:00:17 -0500 (CDT) Received: from mpls-qmqp-04.inet.qwest.net (mpls-qmqp-04.inet.qwest.net [63.231.195.115]) by mx05.mfg.onr.siteprotect.com (Postfix) with ESMTP id 8495655C078 for ; Wed, 13 May 2009 22:00:17 -0500 (CDT) Received: from localhost (unknown [67.42.45.38]) by mpls-qmqp-04.inet.qwest.net (Postfix) with ESMTP id 117B622DC99; Thu, 14 May 2009 03:00:15 +0000 (UTC) Received: by localhost (Postfix, from userid 1002) id 81976588165; Wed, 13 May 2009 20:00:09 -0700 (MST) From: Troy Kisky To: linux-mtd@lists.infradead.org Cc: david-b@pacbell.net, Troy Kisky Subject: [PATCH 3/5] mtd: nand: atmel: use default ecc layout Date: Wed, 13 May 2009 20:00:06 -0700 Message-Id: <1242270008-1552-3-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1242270008-1552-2-git-send-email-troy.kisky@boundarydevices.com> References: <> <1242270008-1552-1-git-send-email-troy.kisky@boundarydevices.com> <1242270008-1552-2-git-send-email-troy.kisky@boundarydevices.com> Mail-Filter-Gateway: Found to be Virus Free X-Mail-Filter-Gateway-SpamDetectionEngine: NOT SPAM, MailFilterGateway Engine (Not Cached, Score=-1, Score Required 3, autolearn=disabled, CTASD_SPAM_UNKNOWN -1.00) X-Mail-Filter-Gateway-From: tkisky@boundarydevices.com X-Mail-Filter-Gateway-To: troy.kisky@boundarydevices.com X-Spam-Status: No atmel should not need to override default Signed-off-by: Troy Kisky --- drivers/mtd/nand/atmel_nand.c | 34 ---------------------------------- 1 files changed, 0 insertions(+), 34 deletions(-) diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 7b52637..8537e86 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -55,32 +55,6 @@ #include "atmel_nand_ecc.h" /* Hardware ECC registers */ -/* oob layout for large page size - * bad block info is on bytes 0 and 1 - * the bytes have to be consecutives to avoid - * several NAND_CMD_RNDOUT during read - */ -static const struct nand_ecclayout atmel_oobinfo_large __initdata = { - .eccbytes = 4, - .eccpos = {60, 61, 62, 63}, - .oobfree = { - {2, 58} - }, -}; - -/* oob layout for small page size - * bad block info is on bytes 4 and 5 - * the bytes have to be consecutives to avoid - * several NAND_CMD_RNDOUT during read - */ -static const struct nand_ecclayout atmel_oobinfo_small __initdata = { - .eccbytes = 4, - .eccpos = {0, 1, 2, 3}, - .oobfree = { - {6, 10} - }, -}; - struct atmel_nand_host { struct nand_chip nand_chip; struct mtd_info mtd; @@ -477,23 +451,15 @@ static int __init atmel_nand_probe(struct platform_device *pdev) /* set ECC page size and oob layout */ switch (mtd->writesize) { case 512: - memcpy(&nand_chip->ecc.layout, &atmel_oobinfo_small, - sizeof(nand_chip->ecc.layout)); ecc_writel(host->ecc, MR, ATMEL_ECC_PAGESIZE_528); break; case 1024: - memcpy(&nand_chip->ecc.layout, &atmel_oobinfo_large, - sizeof(nand_chip->ecc.layout)); ecc_writel(host->ecc, MR, ATMEL_ECC_PAGESIZE_1056); break; case 2048: - memcpy(&nand_chip->ecc.layout, &atmel_oobinfo_large, - sizeof(nand_chip->ecc.layout)); ecc_writel(host->ecc, MR, ATMEL_ECC_PAGESIZE_2112); break; case 4096: - memcpy(&nand_chip->ecc.layout, &atmel_oobinfo_large, - sizeof(nand_chip->ecc.layout)); ecc_writel(host->ecc, MR, ATMEL_ECC_PAGESIZE_4224); break; default: -- 1.5.4.3