From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 31 Mar 2017 08:51:42 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.12/soc' of http://github.com/Broadcom/stblinux into next/soc
X-Git-Tag: v4.14-rc1~953^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b69bad75a840c0c51b1898320dc8e8b829e5322a;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'arm-soc/for-4.12/soc' of 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
---

b69bad75a840c0c51b1898320dc8e8b829e5322a