]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
Merge tag 'arm-soc/for-4.11/devicetree-arm64' of http://github.com/Broadcom/stblinux...
authorOlof Johansson <olof@lixom.net>
Thu, 19 Jan 2017 00:30:43 +0000 (16:30 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 19 Jan 2017 00:30:43 +0000 (16:30 -0800)
commit560741d7d97ed9ad428f241462ab1f8c0cea376b
tree56c46c2a0044b225b70bea315f4652c49ec9c6c1
parent992ffc3eb10df4fcc6758b96b1a058a16d7d4b3a
parent096fe8726e5df2975ed29e1ecd881fa54c80878b
Merge tag 'arm-soc/for-4.11/devicetree-arm64' of http://github.com/Broadcom/stblinux into next/dt64

This pull request contains Broadcom ARM64-based SoC Device Tree changes for
4.11, please pull the following changes:

- Jon adds Device Tree nodes for the GICv2m and PAXB/PAXC PCIe interfaces on
  the Northstar 2 SoCs, he also enables PAXC on the Northstar 2 SVK reference
  board. He also updates the reserved memory entry for the Nitro firmware,
  required to get the on-chip NICs to work. Finally he adds support for the
  BCM958712DxXMC reference board which is a subset of existing boards.

* tag 'arm-soc/for-4.11/devicetree-arm64' of http://github.com/Broadcom/stblinux:
  arm64: dts: NS2: add support for XMC form factor
  arm64: dts: NS2: reserve memory for Nitro firmware
  arm64: dts: NS2: enable PAXC on NS2 SVK
  arm64: dts: NS2: enable GICv2m for PAXB/PAXC interfaces

Signed-off-by: Olof Johansson <olof@lixom.net>