summary refs log tree commit diff
path: root/samples
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-12-06 08:29:54 -0800
committerOlof Johansson <olof@lixom.net>2019-12-06 08:29:56 -0800
commit30f55eae47e4ad1b64d692865e6a4277447a33df (patch)
tree6313182cb4cc88bd993549dc084f65e4190044d1 /samples
parent916a9140627898f1f3feb220b8e77001c0d876bf (diff)
parentbe8af7a9e3cce3cc4b7abbc8211dd06f8e72b976 (diff)
downloadlinux-30f55eae47e4ad1b64d692865e6a4277447a33df.tar.gz
Merge tag 'arm-soc/for-5.5/devicetree-part2' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains the second batch of changes for Broadcom
ARM-based SoCs, please pull the following:

- Nicolas declares a CMA area within the first 1GB of DRAM in order for
  it to be guaranteed to reside there, otherwise ARM64's memory
  initialization will pick up a CMA area within ZONE_DMA32

- Stefan adds the Device Tree node for the built-in Ethernet controller
  (GENET) on the Raspberry Pi 4 model B board

* tag 'arm-soc/for-5.5/devicetree-part2' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm2711-rpi-4: Enable GENET support
  ARM: dts: bcm2711: force CMA into first GB of memory

Link: https://lore.kernel.org/r/20191118182931.11884-1-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions