diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:54:31 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:54:31 +0200 |
commit | c9531b4f1535f88fd82e45d1ffbfa61dbee26fb6 (patch) | |
tree | 236d15d1d1baad66a338ab4db659c8bd07359a5e /init | |
parent | 4fd8a5a5ac6bc042d9de8847e6b8e9182b9c566c (diff) | |
parent | b35d2e561ea711626749fcb511637f0e4604ff18 (diff) |
Merge tag 'arm-soc/for-4.2/soc-part2' of http://github.com/broadcom/stblinux into next/soc
Merge "changes for Broadcom SoCs":
- Dan fixes an error path in the BCM63xx SMP code
- Ray adds the relevant Kconfig selects to enable the Broadcom NAND driver on Cygnus
- Kevin provides a change to the Broadcom GISB arbiter driver to make it work with
MIPS-based big-endian STB SoCs (this was a long-standing change that had dependencies on
code in drivers/of/*)
- Gregory enables the use of GPIOLIB for brcmstb SoCs and bumps the number of GPIOs for
these platforms
* tag 'arm-soc/for-4.2/soc-part2' of http://github.com/broadcom/stblinux:
ARM: brcmstb: Add default gpio number
ARM: brcmstb: Select ARCH_WANT_OPTIONAL_GPIOLIB
bus: brcmstb_gisb: Honor the "big-endian" and "native-endian" DT properties
ARM: BCM: Enable NAND support for iProc SoCs
ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu()
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions