• Arnd Bergmann's avatar
    Merge tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu into next/dt · 64d865f4
    Arnd Bergmann authored
    Merge "mvebu dt changes for v3.15 (incremental #4)" from Jason Cooper:
    
     - dove
        - add system controller node
        - drop pinctrl PMU reg property _before_ it hits mainline and becomes ABI
    
     - mvebu
        - XP/370
           - change default PCIe apertures
           - switch GP and DB boards internal registers to 0xf1000000
           - correct RAM size on Matrix board
        - 385
           - correct phy connection type for DB board
           - add RD board
    
    * tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu:
      ARM: dove: drop pinctrl PMU reg property
      ARM: mvebu: add Device Tree for the Armada 385 RD board
      ARM: mvebu: use the correct phy connection mode on Armada 385 DB
      ARM: mvebu: the Armada XP Matrix board has 4 GB
      ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000
      ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000
      ARM: mvebu: change the default PCIe apertures for Armada 370/XP
      ARM: dove: add system controller node
    
    Conflicts:
    	arch/arm/boot/dts/Makefile
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    64d865f4
Makefile 10.8 KB