Merge tag 'arm-soc/for-4.2/dts-part3' of https://github.com/Broadcom/stblinux into...
authorKevin Hilman <khilman@linaro.org>
Wed, 10 Jun 2015 23:07:41 +0000 (16:07 -0700)
committerKevin Hilman <khilman@linaro.org>
Wed, 10 Jun 2015 23:07:41 +0000 (16:07 -0700)
commit62d4585fb1703cb4fc4f68e4beb8fe09e92cfecf
tree3473a8ee4df38aab4d01f09af2fe557025acfbf4
parent338a6aaabc02fa63b70441dd0e1b70aea64673c6
parent26343bdacfcdbf6ee3303d6078a015b908f90193
Merge tag 'arm-soc/for-4.2/dts-part3' of https://github.com/Broadcom/stblinux into next/dt

This pull request contains Broadcom BCM5301x related changes:

- Hauke adds the interrupt mapping for the BCM5301x PCIe controller

- Haule adds support for NAND flash using the standard Broadcom NAND controller
  iProc specific binding on BCM4708/5301x

- Rafal adds support for the Asus RT-AC87U router

* tag 'arm-soc/for-4.2/dts-part3' of https://github.com/Broadcom/stblinux:
  ARM: BCM5301X: Add DT for Asus RT-AC87U
  ARM: BCM5301X: add IRQ numbers for PCIe controller
  ARM: BCM5301X: add NAND flash chip description
arch/arm/boot/dts/Makefile