1. 02 Jun, 2014 3 commits
    • Wolfram Sang's avatar
      i2c: nuc900: remove driver · 7da62cb1
      Wolfram Sang authored
      Arnd said in another patch:
      
      "As far as I can tell, this driver must have produced this
      error for as long as it has been merged into the mainline kernel, but
      it was never part of the normal build tests:
      
      drivers/i2c/busses/i2c-nuc900.c: In function 'nuc900_i2c_probe':
      drivers/i2c/busses/i2c-nuc900.c:601:17: error: request for member
      'apbfreq' in something not a structure or union
        ret = (i2c->clk.apbfreq)/(pdata->bus_freq * 5) - 1;
                       ^
      This is an attempt to get the driver to build and possibly
      work correctly, although I do wonder whether we should just
      remove it, as it has clearly never worked."
      
      I agree with removing it since nobody showed interest in Arnd's fixup
      patch.
      Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      Cc: Wan ZongShun <mcuos.com@gmail.org>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      7da62cb1
    • Fugang Duan's avatar
      i2c: imx: update i2c clock divider for each transaction · 9b2a6da3
      Fugang Duan authored
      Since IMX serial SOCs support low bus freq mode, some clocks freq
      may change to save power. I2C needs to check the clock source and
      update the divider.
      
      For example:
      i.MX6SL I2C clk is from IPG_PERCLK which is sourced from IPG_CLK.
      Under normal operation, IPG_CLK is 66MHz, ipg_perclk is at 22MHz.
      In low bus freq mode, IPG_CLK is at 12MHz and IPG_PERCLK is down
      to 4MHz. So the I2C driver must update the divider register for
      each transaction when the current IPG_PERCLK is not equal to the
      clock of previous transaction.
      Signed-off-by: default avatarFugang Duan  <B38611@freescale.com>
      [wsa: removed an outdated comment and simplified debug output]
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      9b2a6da3
    • Fugang Duan's avatar
      i2c: imx: fix the i2c bus hang issue when do repeat restart · 054b62d9
      Fugang Duan authored
      Test i2c device Maxim max44009, datasheet is located at:
      http://www.maximintegrated.com/datasheet/index.mvp/id/7175
      
      The max44009 support repeat operation like:
      read -> repeat restart -> read/write
      
      The current i2c imx host controller driver don't support this
      operation that causes i2c bus hang due to "MTX" is cleared in
      .i2c_imx_read(). If "read" is the last message there have no problem,
      so the current driver supports all SMbus operation like:
      write -> repeat restart -> read/write
      
      IMX i2c controller for master receiver has some limitation:
      - If it is the last byte for one operation, it must generate STOP
        signal before read I2DR to prevent controller from generating another
        clock cycle.
      - If it is the last byte in the read, and then do repeat restart, it must
        set "MTX" before read I2DR to prevent controller from generating another
        extra clock cycle.
      
      The patch is to fix the issue.
      Signed-off-by: default avatarFugang Duan <B38611@freescale.com>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      054b62d9
  2. 01 Jun, 2014 13 commits
  3. 22 May, 2014 19 commits
  4. 21 May, 2014 5 commits
    • Linus Torvalds's avatar
      Linux 3.15-rc6 · 4b660a7f
      Linus Torvalds authored
      4b660a7f
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 6538d625
      Linus Torvalds authored
      Pull two powerpc fixes from Ben Herrenschmidt:
       "Here are a couple of fixes for 3.15.  One from Anton fixes a nasty
        regression I introduced when trying to fix a loss of irq_work whose
        consequences is that we can completely lose timer interrupts on a
        CPU... not pretty.
      
        The other one is a change to our PCIe reset hook to use a firmware
        call instead of direct config space accesses to trigger a fundamental
        reset on the root port.  This is necessary so that the FW gets a
        chance to disable the link down error monitoring, which would
        otherwise trip and cause subsequent fatal EEH error"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: irq work racing with timer interrupt can result in timer interrupt hang
        powerpc/powernv: Reset root port in firmware
      6538d625
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 11da37b2
      Linus Torvalds authored
      Pull two btrfs fixes from Chris Mason:
       "This has two fixes that we've been testing for 3.16, but since both
        are safe and fix real bugs, it makes sense to send for 3.15 instead"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: send, fix incorrect ref access when using extrefs
        Btrfs: fix EIO on reading file after ioctl clone works on it
      11da37b2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 30625569
      Linus Torvalds authored
      Pull two ceph fixes from Sage Weil:
       "The first patch fixes a problem when we have a page count of 0 for
        sendpage which is triggered by zfs.  The second fixes a bug in CRUSH
        that was resolved in the userland code a while back but fell through
        the cracks on the kernel side"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        crush: decode and initialize chooseleaf_vary_r
        libceph: fix corruption when using page_count 0 page in rbd
      30625569
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-3.15-rc6' of git://oss.sgi.com/xfs/xfs · 5e9d9fc4
      Linus Torvalds authored
      Pull xfs fixes from Dave Chinner:
       "Code inspection of the XFS error number sign translations found a
        bunch of issues, including returning incorrectly signed errors for
        some data integrity operations.
      
        These leak to userspace and result in applications not getting the
        errors correctly reported.  Hence they need fixing sooner rather than
        later.
      
        A couple of the bugs are in data integrity operations, a couple more
        are in the new COLLAPSE_RANGE code.  One of these came in through a
        recent ext4 merge and so I had to update the base tree to 3.15-rc5
        before fixing the issues"
      
      * tag 'xfs-for-linus-3.15-rc6' of git://oss.sgi.com/xfs/xfs:
        xfs: list_lru_init returns a negative error
        xfs: negate xfs_icsb_init_counters error value
        xfs: negate mount workqueue init error value
        xfs: fix wrong err sign on xfs_set_acl()
        xfs: fix wrong errno from xfs_initxattrs
        xfs: correct error sign on COLLAPSE_RANGE errors
        xfs: xfs_commit_metadata returns wrong errno
        xfs: fix incorrect error sign in xfs_file_aio_read
        xfs: xfs_dir_fsync() returns positive errno
      5e9d9fc4