summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2012-07-13 09:28:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-21 09:32:42 -0700
commite722bf58d3647ff16a90ca9c27bb1809da36e389 (patch)
tree97ee30f33c2695af7effa4c2806bf11619228786 /include
parentefe463f10b783cc62f6bf8103148a66adf15e038 (diff)
mtd: nand: allow NAND_NO_SUBPAGE_WRITE to be set from driver
commit bf7a01bf7987b63b121d572b240c132ec44129c4 upstream. The NAND_CHIPOPTIONS_MSK has limited utility and is causing real bugs. It silently masks off at least one flag that might be set by the driver (NAND_NO_SUBPAGE_WRITE). This breaks the GPMI NAND driver and possibly others. Really, as long as driver writers exercise a small amount of care with NAND_* options, this mask is not necessary at all; it was only here to prevent certain options from accidentally being set by the driver. But the original thought turns out to be a bad idea occasionally. Thus, kill it. Note, this patch fixes some major gpmi-nand breakage. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Tested-by: Huang Shijie <shijie8@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> index a11253a..c429abd 100644
Diffstat (limited to 'include')
-rw-r--r--include/linux/mtd/nand.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 57977c640529..e5cf2c8407ce 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -212,9 +212,6 @@ typedef enum {
#define NAND_SUBPAGE_READ(chip) ((chip->ecc.mode == NAND_ECC_SOFT) \
&& (chip->page_shift > 9))
-/* Mask to zero out the chip options, which come from the id table */
-#define NAND_CHIPOPTIONS_MSK 0x0000ffff
-
/* Non chip related options */
/* This option skips the bbt scan during initialization. */
#define NAND_SKIP_BBTSCAN 0x00010000