Merge tag 'zynq-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/dt
authorOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 19:26:28 +0000 (11:26 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 19:26:28 +0000 (11:26 -0800)
commit69c8e667ff1a5702d7908db430ac091bd14a1cdb
tree49be8322778846e8e62ae5ae0f2991cb9b4c7225
parent3a8659772c1acf88448b3849064c157fecd1ce5d
parent400b6a0cbef55d1ae32808eaa1ef1c28820bf6ac
Merge tag 'zynq-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx into next/dt

arm: Xilinx Zynq dt patches for v4.5

- Various small DT changes, GPIO, slcr, cpu label

* tag 'zynq-dt-for-4.5' of https://github.com/Xilinx/linux-xlnx:
  ARM: dt: zynq: Add labels to cpu nodes to allow overriding OPPs.
  ARM: dts: zynq: describe SLCR as simple-mfd rather than simple-bus
  ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property
  ARM: zynq: DT: Add interrupt-controller property to GPIO

Signed-off-by: Olof Johansson <olof@lixom.net>