Merge tag 'arm-soc/for-5.6/devicetree-part2' of https://github.com/Broadcom/stblinux...
authorOlof Johansson <olof@lixom.net>
Sat, 18 Jan 2020 01:08:01 +0000 (17:08 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 18 Jan 2020 01:08:03 +0000 (17:08 -0800)
This pull request contains Broadcom ARM-based SoC changes for 5.6,
please pull the following:

- Nicolas unifies the CMA reserved region declaration between all
  BCM283x/BCM2711 chips in order for firmwares to easily adjust those
  based on the use case needs

- Nicolas adds the Broadcom STB PCIe Root Complex Device Tree node for
  the Raspberry Pi 4. The driver will go through the PCIe maintainers
  pull request for 5.6.

* tag 'arm-soc/for-5.6/devicetree-part2' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm2711: Enable PCIe controller
  ARM: dts: bcm283x: Unify CMA configuration

Link: https://lore.kernel.org/r/20200117222705.25391-2-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge