diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 22:27:58 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 22:27:58 (GMT) |
| commit | 55da9c0852d36a7b2792f6d21366f750bfbb046f (patch) | |
| tree | 161f7a6bb9d90108d95acca0aa30800a4c6df08d /drivers/net/ethernet/hp | |
| parent | 29de0e39aab9b5fff5ef9202c2f4daa4d8c70e78 (diff) | |
| parent | f008decc4797979bc1d3b8efd18bd5df1e53e9f0 (diff) | |
| download | linux-55da9c0852d36a7b2792f6d21366f750bfbb046f.tar.xz | |
Merge tag 'arm-soc/for-4.6/devicetree-arm64' of http://github.com/Broadcom/stblinux into next/dt64
Merge "Broadcom devicetree-arm64 changes for 4.6" from Florian Fainelli:
This pull request contains Broadcom ARM64-based SoCs device tree changes:
- Anup adds additional nodes to the Broadcom Northstart 2 Device Trees: SDHCI
(iProc-compatible), ARM SP804 timers, ARM SP805 watchdog
- Anup also adds a binding documentation for the ARM SP805 watchdog since there
was not one in tree before
- Ray adds PCIE root complex nodes to the Northstar 2 Device Tree nodes, using
the iProc-compatible binding
- Jayachandran C. adds binding documentation for the Broadcom Vulcan processors and
reference platforms
* tag 'arm-soc/for-4.6/devicetree-arm64' of http://github.com/Broadcom/stblinux:
dt-bindings: Add documentation for Broadcom Vulcan
arm64: dts: Add PCIe0 and PCIe4 DT nodes for NS2
arm64: dts: Add ARM SP805 watchdog DT node for NS2
dt-bindings: watchdog: Add ARM SP805 DT bindings
arm64: dts: Add ARM SP804 timer DT nodes for NS2
arm64: dts: Add SDHCI DT node for NS2
Diffstat (limited to 'drivers/net/ethernet/hp')
0 files changed, 0 insertions, 0 deletions