From edc3060473782bdc429278ab01d6ff9693d42b33 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 15 Jul 2006 13:05:24 +0100 Subject: [PATCH] --- yaml --- r: 33988 b: refs/heads/master c: 6a5a297cf78e64ed68577f3e3480bc10abf0124b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/sharpsl.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cebba0d2d838..c92abd47818b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b0036eefd7a96f23244b969417684c8627f5ad6 +refs/heads/master: 6a5a297cf78e64ed68577f3e3480bc10abf0124b diff --git a/trunk/drivers/mtd/nand/sharpsl.c b/trunk/drivers/mtd/nand/sharpsl.c index fbeedc3184e9..51c7288ab49a 100644 --- a/trunk/drivers/mtd/nand/sharpsl.c +++ b/trunk/drivers/mtd/nand/sharpsl.c @@ -78,7 +78,7 @@ static struct mtd_partition sharpsl_nand_default_partition_info[] = { /* * hardware specific access to control-lines * ctrl: - * NAND_CNE: bit 0 -> bit 0 & 4 + * NAND_CNE: bit 0 -> ! bit 0 & 4 * NAND_CLE: bit 1 -> bit 1 * NAND_ALE: bit 2 -> bit 2 * @@ -92,7 +92,10 @@ static void sharpsl_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned char bits = ctrl & 0x07; bits |= (ctrl & 0x01) << 4; - writeb((readb(FLASHCTL) & 0x17) | bits, FLASHCTL); + + bits ^= 0x11; + + writeb((readb(FLASHCTL) & ~0x17) | bits, FLASHCTL); } if (cmd != NAND_CMD_NONE)