diff options
| author | Olof Johansson <olof@lixom.net> | 2019-12-06 08:29:54 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-12-06 08:29:56 -0800 |
| commit | 30f55eae47e4ad1b64d692865e6a4277447a33df (patch) | |
| tree | 6313182cb4cc88bd993549dc084f65e4190044d1 /arch/alpha/include/asm/asm-offsets.h | |
| parent | 916a9140627898f1f3feb220b8e77001c0d876bf (diff) | |
| parent | be8af7a9e3cce3cc4b7abbc8211dd06f8e72b976 (diff) | |
| download | lwn-30f55eae47e4ad1b64d692865e6a4277447a33df.tar.gz lwn-30f55eae47e4ad1b64d692865e6a4277447a33df.zip | |
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 'arch/alpha/include/asm/asm-offsets.h')
0 files changed, 0 insertions, 0 deletions