Merge tag 'arm-soc/for-4.1/devicetree-part-2' of http://github.com/broadcom/stblinux...
authorArnd Bergmann <arnd@arndb.de>
Mon, 16 Mar 2015 14:35:25 +0000 (15:35 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 16 Mar 2015 14:35:25 +0000 (15:35 +0100)
commit2effbad526869faa7fd61136819a548e0d1966f1
tree17000d75bf08cbcb495cf29fe818e856446abe90
parent841990b6b3e2cfc0b51a5efb4c2fed6693cfafee
parentcd590b50a9367b52520f6866b27f72317bb1a07e
Merge tag 'arm-soc/for-4.1/devicetree-part-2' of github.com/broadcom/stblinux into next/dt

Pull "This pull request contains the following changes from Ray for Cygnus SoCs: from Florian Fainelli:

- enable IOMUX, required for pinmux/pinctrl
- enable GPIO, required for the GPIO driver
- enable GPIO hook detection for BCM911360-based phone designs
- enable PCIe controller for the bcm958300k designs

* tag 'arm-soc/for-4.1/devicetree-part-2' of http://github.com/broadcom/stblinux:
  ARM: dts: enable PCIe support for Cygnus
  ARM: dts: cygnus: enable GPIO based hook detection
  ARM: dts: enable GPIO for Broadcom Cygnus
  ARM: dts: enable IOMUX for Broadcom Cygnus