1. 20 May, 2014 1 commit
    • Olof Johansson's avatar
      Merge tag 'mvebu-dt-3.16' of git://git.infradead.org/linux-mvebu into next/dt · 61e810d3
      Olof Johansson authored
      Merge "ARM: mvebu: DT changes for v3.16" from Jason Cooper:
      
      mvebu DT changes for v3.16
      
       - kirkwood
          - rework nsa3x0 board to add nsa320
          - large cleanup to facilitate use in barebox
          - guruplug phy updates
          - audio updates for t5325
      
       - mvebu
          - use clocks vice clock-frequency for uart nodes
      
          - armada 375/380/385
             - add watchdog node
             - add coherency fabric
             - add smp support
             - add sdhci
             - add ahci
             - add thermal sensor
      
          - armada 370/XP
             - and pmsu
      
      * tag 'mvebu-dt-3.16' of git://git.infradead.org/linux-mvebu: (35 commits)
        ARM: Kirkwood: t5325: Use simple card to instantiate audio
        ARM: Kirkwood: DT: Add missing #sound-dai-cells property
        ARM: Kirkwood: Add node for audio codec
        ARM: dts: kirkwood: set Guruplug phy-connection-type to rgmii-id
        ARM: dts: kirkwood: set Guruplug ethernet PHY compatible
        ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282
        ARM: dts: kirkwood: set default pinctrl for I2C0
        ARM: dts: kirkwood: set default pinctrl for NAND
        ARM: dts: kirkwood: set default pinctrl for SPI0
        ARM: dts: kirkwood: set default pinctrl for UART0/1
        ARM: dts: kirkwood: set default pinctrl for GBE1
        ARM: dts: kirkwood: consolidate common pinctrl settings
        ARM: dts: kirkwood: add pinctrl node to common SoC include
        ARM: dts: kirkwood: rename pin-controller nodes
        ARM: dts: kirkwood: remove clock-frequency properties from UART nodes
        ARM: dts: kirkwood: add stdout-path property to all boards
        ARM: dts: kirkwood: add node labels
        ARM: mvebu: Enable the thermal sensor in Armada 380/385 SoC
        ARM: mvebu: Enable the thermal sensor in Armada 375 SoC
        ARM: mvebu: don't use clocks property in UART node for Netgear RN2120
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      61e810d3
  2. 16 May, 2014 1 commit
    • Olof Johansson's avatar
      Merge tag 'socfpga-dt-updates-for-3.16_v3' of... · 2bfac3a5
      Olof Johansson authored
      Merge tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next into next/dt
      
      Merge "dts: socfpga: general updates for the socfpga platform" from Dinh
      Nguyen:
      
      Mostly DTS additions to the SOCFPGA platform from Steffan Trumtrar, and a
      couple of device tree documentation updates/typo fix.
      
      This one does not the GPIO binding patch, as that is pending further
      discussion. Also, v3 fixes a rebase artifact and compile tested.
      
      * tag 'socfpga-dt-updates-for-3.16_v3' of git://git.rocketboards.org/linux-socfpga-next:
        ARM: socfpga: dts: Add div-reg to the main_pll clocks
        ARM: socfpga: dts: add reset-controller
        Documentation: dt: reset: move socfpga-reset
        Documentation: dt: socfpga: add reset-cells property
        ARM: socfpga: dts: Add DTS entries for USB
        ARM: socfpga: dts: Remove hard coded clock-frequency property
        ARM: socfpga: dts: add eeprom and rtc on i2c0
        ARM: socfpga: dts: convert to preprocessor includes
        ARM: socfpga: dts: add rtc on i2c0 to socrates
        ARM: socfpga: dts: add support for EBV SOCrates
        ARM: socfpga: dts: add can0+1
        ARM: socfpga: dts: add i2c busses
        ARM: socfpga: dts: add remaining interrupts for pdma
        ARM: socfpga: dts: fix pdma interrupt
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      2bfac3a5
  3. 06 May, 2014 15 commits
  4. 05 May, 2014 20 commits
  5. 04 May, 2014 3 commits
    • Linus Torvalds's avatar
      Merge tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux · 164c0997
      Linus Torvalds authored
      Pull file locking change from Jeff Layton:
       "Only an email address change to the MAINTAINERS file"
      
      * tag 'locks-v3.15-3' of git://git.samba.org/jlayton/linux:
        MAINTAINERS: email address change for Jeff Layton
      164c0997
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 8a9f5ecd
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       "These are mostly arm64 fixes with an additional arm(64) platform fix
        for the initialisation of vexpress clocks (the latter only affecting
        arm64; the arch/arm64 code is SoC agnostic and does not rely on early
        SoC-specific calls)
      
         - vexpress platform clocks initialisation moved earlier following the
           arm64 move of of_clk_init() call in a previous commit
         - Default DMA ops changed to non-coherent to preserve compatibility
           with 32-bit ARM DT files.  The "dma-coherent" property can be used
           to explicitly mark a device coherent.  The Applied Micro DT file
           has been updated to avoid DMA cache maintenance for the X-Gene SATA
           controller (the only arm64 related driver with such assumption in
           -rc mainline)
         - Fixmap correction for earlyprintk
         - kern_addr_valid() fix for huge pages"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        vexpress: Initialise the sysregs before setting up the clocks
        arm64: Mark the Applied Micro X-Gene SATA controller as DMA coherent
        arm64: Use bus notifiers to set per-device coherent DMA ops
        arm64: Make default dma_ops to be noncoherent
        arm64: fixmap: fix missing sub-page offset for earlyprintk
        arm64: Fix for the arm64 kern_addr_valid() function
      8a9f5ecd
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · e3fb7d4c
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is two patches both fixing bugs in drivers (virtio-scsi and
        mpt2sas) causing an oops in certain circumstances"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] virtio-scsi: Skip setting affinity on uninitialized vq
        [SCSI] mpt2sas: Don't disable device twice at suspend.
      e3fb7d4c