• A
    Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dt · e887ae25
    Arnd Bergmann 提交于
    Merge "mvebu dt changes for v3.15 (incremental pull #3)" from Jason Cooper:
    
     - mvebu
        - merge armada 375, 380, 385 boards (mvebu/dt-3xx)
    
     - kirkwood
        - Add many Synology NAS boards
        - add board HP T5325
        - add L2 cache node
        - add system-controller node
        - add audio node
    
     - dove
        - add pinctrl and global-config register
    
    Depends:
     - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
        - removed dove PMU interrupt controller
    
    Conflicts:
     - mvebu/soc (arch/arm/boot/dts/Makefile)
        - add/add conflict.
        - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)
    
    * tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu:
      ARM: kirkwood: Add dts file describing HP T5325 thin client
      ARM: kirkwood: Add i2c alias so setting bus number
      ARM: kirkwood: Add audio node to kirkwood.dtsi
      ARM: mvebu: select dtbs from MACH_ARMADA_*
      ARM: dove: add global-config register node
      ARM: dove: add additional pinctrl registers
      ARM: mvebu: Instantiate system controller in kirkwood.dtsi
      ARM: kirkwood: Instantiate L2 cache from DT.
      ARM: mvebu: use macros for interrupt flags on Armada 375/38x
      ARM: mvebu: use GIC_{SPI,PPI} in Armada 375/38x DTs
      ARM: mvebu: use C preprocessor include for Armada 375/38x DTs
      ARM: Kirkwood: Add support for many Synology NAS devices
      DT: i2c: Trivial: Add sii,s35390a
      DT: Vendor prefixes: Add ricoh, qnap, sii and synology
      ARM: dove: dt: revert PMU interrupt controller node
      ARM: mvebu: add Device Tree for the Armada 385 DB board
      ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs
      ARM: mvebu: add Device Tree for the Armada 375 DB board
      ARM: mvebu: add Device Tree description of the Armada 375 SoC
      ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260
    
    Conflicts:
    	Documentation/devicetree/bindings/vendor-prefixes.txt
    	arch/arm/boot/dts/Makefile
    Signed-off-by: NArnd Bergmann <arnd@arndb.de>
    e887ae25
vendor-prefixes.txt 3.0 KB