Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd · d6666be6
    Linus Torvalds authored
    Pull MTD updates from Brian Norris:
     "Summary:
       - Add device tree support for DoC3
    
       - SPI NOR:
            Refactoring, for better layering between spi-nor.c and its
            driver users (e.g., m25p80.c)
    
            New flash device support
    
            Support 6-byte ID strings
    
       - NAND:
            New NAND driver for Allwinner SoC's (sunxi)
    
            GPMI NAND: add support for raw (no ECC) access, for testing
            purposes
    
            Add ATO manufacturer ID
    
            A few odd driver fixes
    
       - MTD tests:
            Allow testers to compensate for OOB bitflips in oobtest
    
            Fix a torturetest regression
    
       - nandsim: Support longer ID byte strings
    
      And more"
    
    * tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd: (63 commits)
      mtd: tests: abort torturetest on erase errors
      mtd: physmap_of: fix potential NULL dereference
      mtd: spi-nor: allow NULL as chip name and try to auto detect it
      mtd: nand: gpmi: add raw oob access functions
      mtd: nand: gpmi: add proper raw access support
      mtd: nand: gpmi: add gpmi_copy_bits function
      mtd: spi-nor: factor out write_enable() for erase commands
      mtd: spi-nor: add support for s25fl128s
      mtd: spi-nor: remove the jedec_id/ext_id
      mtd: spi-nor: add id/id_len for flash_info{}
      mtd: nand: correct the comment of function nand_block_isreserved()
      jffs2: Drop bogus if in comment
      mtd: atmel_nand: replace memcpy32_toio/memcpy32_fromio with memcpy
      mtd: cafe_nand: drop duplicate .write_page implementation
      mtd: m25p80: Add support for serial flash Spansion S25FL132K
      MTD: m25p80: fix inconsistency in m25p_ids compared to spi_nor_ids
      mtd: spi-nor: improve wait-till-ready timeout loop
      mtd: delete unnecessary checks before two function calls
      mtd: nand: omap: Fix NAND enumeration on 3430 LDP
      mtd: nand: add ATO manufacturer info
      ...
    d6666be6