]> asedeno.scripts.mit.edu Git - linux.git/commit
Merge tag 'arm-soc/for-5.6/soc' of https://github.com/Broadcom/stblinux into arm/soc
authorOlof Johansson <olof@lixom.net>
Sat, 11 Jan 2020 06:15:53 +0000 (22:15 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 11 Jan 2020 06:15:54 +0000 (22:15 -0800)
commit3a4252daee7e6d760e8a53f7e8b27b4cf528c329
tree5605100487233998fd20c6f73ea484189998eaa4
parentd5279a57c4083d760aba071cef84e241ee631aa9
parentc586f47f55d8239466824f917582c7d7d9e546ed
Merge tag 'arm-soc/for-5.6/soc' of https://github.com/Broadcom/stblinux into arm/soc

This pull request contains Broadcom ARM-based SoCs Kconfig/machine
changes for 5.6, please pull the following:

- Justin adds an entry for BCM7216's debug UART to support DEBUG_LL
- Florian adds a select ARM_AMBA to support the ARM PL011 UART/console
  which is required on BCM7211

* tag 'arm-soc/for-5.6/soc' of https://github.com/Broadcom/stblinux:
  ARM: bcm: Select ARM_AMBA for ARCH_BRCMSTB
  ARM: brcmstb: Add debug UART entry for 7216

Link: https://lore.kernel.org/r/20200108191114.15987-3-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>