Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32fd3d4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 33b40178 5f867db6

MAINTAINERS

+6 −0
Original line number Original line Diff line number Diff line
@@ -6838,6 +6838,12 @@ T: git git://linuxtv.org/anttip/media_tree.git 
S:	Maintained

S:	Maintained

F:	drivers/media/usb/msi2500/

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

MT9M032 APTINA SENSOR DRIVER

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

L:	linux-media@vger.kernel.org

L:	linux-media@vger.kernel.org

include/linux/mtd/nand.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -177,11 +177,6 @@ typedef enum { 
#define NAND_OWN_BUFFERS	0x00020000

#define NAND_OWN_BUFFERS	0x00020000

/* Chip may not exist, so silence any errors in scan */

/* Chip may not exist, so silence any errors in scan */

#define NAND_SCAN_SILENT_NODEV	0x00040000

#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.

 * Autodetect nand buswidth with readid/onfi.

 * This suppose the driver will configure the hardware in 8 bits mode

 * This suppose the driver will configure the hardware in 8 bits mode
@@ -189,6 +184,11 @@ typedef enum { 
 * before calling nand_scan_tail.

 * before calling nand_scan_tail.

 */

 */

#define NAND_BUSWIDTH_AUTO      0x00080000

#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 */

/* Options set by nand scan */

/* Nand scan has allocated controller struct */

/* Nand scan has allocated controller struct */