diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 11:19:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 11:19:38 -0700 |
| commit | 32fd3d4ac93261616564fbb544738b260f89bc7e (patch) | |
| tree | 9325c092eba3def020fe6c6a80c70600428e0822 | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
| parent | mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict (diff) | |
| download | linux-dev-32fd3d4ac93261616564fbb544738b260f89bc7e.tar.xz linux-dev-32fd3d4ac93261616564fbb544738b260f89bc7e.zip | |
Merge tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"Two trivial updates. I meant to send these much earlier, but I've
been preoccupied.
- Add MAINTAINERS entry for diskonchip g3 driver
- Fix an overlooked conflict in bitfield value assignments
The latter update is a bit overdue, but there's no reason to wait any
longer"
* tag 'for-linus-20150724' of git://git.infradead.org/linux-mtd:
mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
MAINTAINERS: mtd: docg3: add docg3 maintainer
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2eb627252239..9289ecb57b68 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6838,6 +6838,12 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/usb/msi2500/ +MSYSTEMS DISKONCHIP G3 MTD DRIVER +M: Robert Jarzmik <robert.jarzmik@free.fr> +L: linux-mtd@lists.infradead.org +S: Maintained +F: drivers/mtd/devices/docg3* + MT9M032 APTINA SENSOR DRIVER M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> L: linux-media@vger.kernel.org diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index f25e2bdd188c..272f42952f34 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -178,17 +178,17 @@ typedef enum { /* Chip may not exist, so silence any errors in scan */ #define NAND_SCAN_SILENT_NODEV 0x00040000 /* - * This option could be defined by controller drivers to protect against - * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers - */ -#define NAND_USE_BOUNCE_BUFFER 0x00080000 -/* * Autodetect nand buswidth with readid/onfi. * This suppose the driver will configure the hardware in 8 bits mode * when calling nand_scan_ident, and update its configuration * before calling nand_scan_tail. */ #define NAND_BUSWIDTH_AUTO 0x00080000 +/* + * This option could be defined by controller drivers to protect against + * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers + */ +#define NAND_USE_BOUNCE_BUFFER 0x00100000 /* Options set by nand scan */ /* Nand scan has allocated controller struct */ |