diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-17 17:08:01 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-17 17:08:03 -0800 |
| commit | faaa9f6e8ab9a2da03cb215e7311e824e96b8bf7 (patch) | |
| tree | 13fd660099bb1bb5ad5b93d28adcd49b8a1413f5 /scripts/bpf_helpers_doc.py | |
| parent | b0e55fef624e511e060fa05e4ca96cae6d902f04 (diff) | |
| parent | d5c8dc0d4c880fbde5293cc186b1ab23466254c4 (diff) | |
Merge tag 'arm-soc/for-5.6/devicetree-part2' of https://github.com/Broadcom/stblinux into arm/dt
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>
Diffstat (limited to 'scripts/bpf_helpers_doc.py')
0 files changed, 0 insertions, 0 deletions