diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-03-31 10:51:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-31 10:51:42 +0200 |
| commit | b69bad75a840c0c51b1898320dc8e8b829e5322a (patch) | |
| tree | 610bfc614c80c5141f2a8ad1c7c940436eb6b7e7 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'gemini-multiplat-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/soc (diff) | |
| parent | ARM: brcmstb: Add entry for 7260 (diff) | |
| download | wireguard-linux-b69bad75a840c0c51b1898320dc8e8b829e5322a.tar.xz wireguard-linux-b69bad75a840c0c51b1898320dc8e8b829e5322a.zip | |
Merge tag 'arm-soc/for-4.12/soc' of http://github.com/Broadcom/stblinux into next/soc
Pull "Broadcom soc changes for 4.12" from Florian Fainelli:
This pull request contains Broadcom ARM-based SoC Kconfig/platform changes for
4.12, please pull the following:
- Al enables ZONE_DMA for BRCMSTB platforms since a bunch of on-chip
peripherals such as USB (OHCI and EHCI) and SDHCI cannot support physical
addresses > 32-bit. This is only required when ARM_LPAE is enabled
- Danesh enables ARCH_HAS_HOLES_MEMORYMODEL in order for the kernel to provide
a pfn_valid() implementation despite BRCMSTB enabling the SPARSEMEM model by
default.
- Florian adds support for a new 28nm generation chip: 7260 by updating the
runtime detection UART debuggin stub used for DEBUG_LL.
* tag 'arm-soc/for-4.12/soc' of http://github.com/Broadcom/stblinux:
ARM: brcmstb: Add entry for 7260
ARM: brcmstb: Enable ARCH_HAS_HOLES_MEMORYMODEL
ARM: brcmstb: Enable ZONE_DMA for non 64-bit capable peripherals
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions