1. 11 9月, 2011 4 次提交
    • B
      mtd: nand: rename NAND_USE_FLASH_BBT · bb9ebd4e
      Brian Norris 提交于
      Recall the recently added prefix requirements:
       * "NAND_" for flags in nand.h, used in nand_chip.options
       * "NAND_BBT_" for flags in bbm.h, used in nand_chip.bbt_options
              or in nand_bbt_descr.options
      
      Thus, I am changing NAND_USE_FLASH_BBT to NAND_BBT_USE_FLASH.
      
      Again, this flag is found in bbm.h and so should NOT be used in the
      "nand_chip.options" field.
      Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      bb9ebd4e
    • B
      mtd: nand: consolidate redundant flash-based BBT flags · a40f7341
      Brian Norris 提交于
      This patch works with the following three flags from two headers (nand.h
      and bbm.h):
        (1) NAND_USE_FLASH_BBT (nand.h)
        (2) NAND_USE_FLASH_BBT_NO_OOB (nand.h)
        (3) NAND_BBT_NO_OOB (bbm.h)
      
      These flags are all related and interdependent, yet they were in
      different headers. Flag (2) is simply the combination of (1) and (3) and
      can be eliminated.
      
      This patch accomplishes the following:
        * eliminate NAND_USE_FLASH_BBT_NO_OOB (i.e., flag (2))
        * move NAND_USE_FLASH_BBT (i.e., flag (1)) to bbm.h
      
      It's important to note that because (1) and (3) are now both found in
      bbm.h, they should NOT be used in the "nand_chip.options" field.
      
      I removed a small section from the mtdnand DocBook because it referes to
      NAND_USE_FLASH_BBT in nand.h, which has been moved to bbm.h.
      Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      a40f7341
    • B
      mtd: nand: separate chip options / bbt_options · 5fb1549d
      Brian Norris 提交于
      This patch handles the problems we've been having with using conflicting
      flags from nand.h and bbm.h in the same nand_chip.options field. We
      should try to separate these two spaces a little more clearly, and so I
      have added a bbt_options field to nand_chip.
      
      Important notes about nand_chip fields:
      * bbt_options field should contain ONLY flags from bbm.h. They should be
        able to pass safely to a nand_bbt_descr data structure.
          - BBT option flags start with the "NAND_BBT_" prefix.
      * options field should contian ONLY flags from nand.h. Ideally, they
        should not be involved in any BBT related options.
          - NAND chip option flags start with the "NAND_" prefix.
      * Every flag should have a nice comment explaining what the flag is. While
        this is not yet the case on all existing flags, please be sure to write
        one for new flags. Even better, you can help document the code better
        yourself!
      
      Please try to follow these conventions to make everyone's lives easier.
      
      Among the flags that are being moved to the new bbt_options field
      throughout various drivers, etc. are:
       * NAND_BBT_SCANLASTPAGE
       * NAND_BBT_SCAN2NDPAGE
      and there will be more to come.
      Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      5fb1549d
    • B
      mtd: nand: remove NAND_BBT_SCANBYTE1AND6 option · a0dc5529
      Brian Norris 提交于
      This patch reverts most of:
          commit 58373ff0
          mtd: nand: more BB Detection refactoring and dynamic scan options
      
      According to the discussion at:
          http://lists.infradead.org/pipermail/linux-mtd/2011-May/035696.html
      the NAND_BBT_SCANBYTE1AND6 flag, although technically valid, can break
      some existing ECC layouts that use the 6th byte in the OOB for ECC data.
      Furthermore, we apparently do not need to scan both bytes 1 and 6 in
      the OOB region of the devices under consideration; instead, we only need
      to scan one or the other.
      
      Thus, the NAND_BBT_SCANBYTE1AND6 flag is at best unnecessary and at
      worst a regression.
      Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
      Signed-off-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      a0dc5529
  2. 15 8月, 2011 5 次提交
  3. 14 8月, 2011 27 次提交
  4. 13 8月, 2011 4 次提交
    • L
      Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 · 73e0881d
      Linus Torvalds 提交于
      * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
        dt: add empty of_get_property for non-dt
      73e0881d
    • L
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · e211bc8d
      Linus Torvalds 提交于
      * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (30 commits)
        USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device
        USB: Serial: Add device ID for Sierra Wireless MC8305
        USB: Serial: Added device ID for Qualcomm Modem in Sagemcom's HiLo3G
        usb/host/pci-quirks.c: correct annotation of `ehci_dmi_nohandoff_table'
        USB: option driver: add PID for Vodafone-Huawei K4511
        USB: option driver: add PID for Vodafone-Huawei K4510
        USB: option driver: add PID for Vodafone-Huawei K3771
        USB: option driver: add PID for Vodafone-Huawei K3770
        usb: serial: ftdi_sio.c: For the FT232H FTDI_SIO_SET_BAUDRATE_REQUEST, index needs to be shifted too
        usb/isp1760: Added missing call to usb_hcd_check_unlink_urb() during unlink
        USB: EHCI: Fix test mode sequence
        USB: ftdi_sio: fix minor typo in get_ftdi_divisor
        USB: at91_udc: include linux/prefetch.h explicitly
        USB: usb-storage: unusual_devs entry for ARM V2M motherboard.
        usb/ehci-mxc: add missing inclusion of mach/hardware.h
        USB: assign instead of equal in usbtmc.c
        usb: renesas_usbhs: fixup usbhsg_for_each_uep 1st pos
        usb: renesas_usbhs: fix DMA build by including dma-mapping.h
        usb: gadget: net2272 - Correct includes
        usb: musb: fix oops on musb_gadget_pullup
        ...
      e211bc8d
    • L
      Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 8c70aac0
      Linus Torvalds 提交于
      * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
        zcache: Fix build error when sysfs is not defined
        zcache: Use div_u64 for 64-bit division
        staging:rts_pstor: fix thread synchronization flow
        drivers:staging:solo6x10:add the missed slab.h
        staging: zcache: include module.h for MODULE_LICENSE
        drivers/staging/hv/blkvsc_drv.c: eliminate NULL pointer dereference
        Staging: Add clk API note to nvec/TODO
        drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c: adjust array index
        staging: more missing slab.h inclusions
        drivers/staging/solo6x10/p2m.c needs slab.h
        drivers/staging/solo6x10/core.c needs slab.h
        drivers/staging/dt3155v4l/dt3155v4l.c needs slab.h
        drivers/staging/speakup/devsynth.c: fix "buffer size is not provably correct" error
        Staging: iio: add some unlocks to raw_read() functions
        staging: ft1000_proc needs asm/io.h for inw/outw on sparc
        staging: rtl8192u: declare MODULE_FIRMWARE
        gma500: Fix clashes with DRM updates
        staging: zcache: module is GPL
        staging: fix zcache building
      8c70aac0
    • L
      Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-tip · 06e727d2
      Linus Torvalds 提交于
      * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-tip:
        x86-64: Rework vsyscall emulation and add vsyscall= parameter
        x86-64: Wire up getcpu syscall
        x86: Remove unnecessary compile flag tweaks for vsyscall code
        x86-64: Add vsyscall:emulate_vsyscall trace event
        x86-64: Add user_64bit_mode paravirt op
        x86-64, xen: Enable the vvar mapping
        x86-64: Work around gold bug 13023
        x86-64: Move the "user" vsyscall segment out of the data segment.
        x86-64: Pad vDSO to a page boundary
      06e727d2