]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'arm-soc/for-4.12/devicetree-arm64' of http://github.com/Broadcom/stblinux...
authorArnd Bergmann <arnd@arndb.de>
Fri, 31 Mar 2017 09:52:16 +0000 (11:52 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 31 Mar 2017 09:52:16 +0000 (11:52 +0200)
Pull "Broadcom devicetree-arm64 changes for 4.12" from Florian Fainelli:

This pull request contains Broadcom ARM64-based SoCs Device Tree updates for
4.12, please pull the following:

- Rob enables the cryptographic block on Northstar 2 (SPU) by adding the proper
  Device Tree nodes

- Jon replaces all occurences of: status = "ok" with status = "okay" to better
  conform to the Device Tree specification

* tag 'arm-soc/for-4.12/devicetree-arm64' of http://github.com/Broadcom/stblinux:
  arm64: dts: NS2: convert "ok" to "okay"
  arm64: dts: NS2: Add Broadcom SPU driver DT entry


Trivial merge