diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 00:56:38 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 00:56:38 +0300 |
commit | 312ce1d19155a20c6d829b6e9fc028d4b0238c2b (patch) | |
tree | c1f57cc3f4fcaa191038b2faf251052cd49f9e7a /net/lapb/lapb_subr.c | |
parent | 1ea7c8b6fb23f5a8afec7c7ddc5776550331a2bf (diff) | |
parent | 3db62afd11738f896ef83132022a40be74961860 (diff) | |
download | linux-312ce1d19155a20c6d829b6e9fc028d4b0238c2b.tar.xz |
Merge tag 'arm-soc/for-4.7/devicetree' of http://github.com/Broadcom/stblinux into next/dt
Merge "Broadcom ARM-based SoC Device Tree changes" from Florian Fainelli:
- Rafal adds proper VCC GPIO to be fed to the USB host controllers for known
BCM5301x devices needing that, he also enables earlycon, and enables the
SPI-NOR flashes on relevant devices
- Eric adds the VideoCore 4 Device Tree nodes to the BCM283x Device Tree and
provides a DRM patch to kick out the simplefb framebuffer to avoid conflicts
- Stephan adds proper CPU nodes for the ARM processor on the BCM2835 SoC Device
Tree
- Martin provides a binding fix for the DMA channel interrupt numbers and
description
* tag 'arm-soc/for-4.7/devicetree' of http://github.com/Broadcom/stblinux:
ARM: BCM5301X: Add DT entry for SPI controller and NOR flash
dt/bindings: bcm2835: correct description for DMA-int
ARM: bcm2835: add CPU node for ARM core
ARM: bcm2835: Add VC4 to the device tree.
drm/vc4: Kick out the simplefb framebuffer before we set up KMS.
ARM: BCM5301X: Enable earlycon on tested devices
ARM: BCM5301X: Set vcc-gpio for USB controllers of few devices
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions