Merge tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 18:59:18 +0000 (11:59 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 18:59:28 +0000 (11:59 -0700)
commit09be3f5ee0892581fcc20204af52c3a354734576
treeede2ab53800e2aed0f1164bf02f9da6255efbaad
parent6e77adb23fbfb48746a084c8f76d33e811f359a2
parent55b0ef4e1d90b3d05a24f6897da1739ef9b13f75
Merge tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

i.MX6 device tree changes for 3.15, take 2 from Shawn Guo:
 - Add USB, GPMI and SATA support for imx6q-phytec board
 - Update imx6sl-evk board support regarding PFUZE100, audio and
   LED etc.
 - Minor updates on a few imx6qdl boards

* tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: imx6q-phytec: Added SATA Support
  ARM: dts: imx6q-phytec: Added GPMI-NAND Support
  ARM: dts: imx6q-phytec: Added USB_HOST Support
  ARM: dts: imx6q-phytec: Added USB_OTG Support
  ARM: dts: imx6sl-evk: Keep VGEN1 regulator always enabled
  ARM: dts: imx6qdl-sabreauto: Support debug LED
  ARM: dts: imx6q: add 852MHz setpoint for CPU freq
  ARM: dts: imx6qdl-wandboard: use GPIO_6 for FEC interrupt
  ARM: dts: imx6sl-evk: Add debug LED support
  ARM: dts: imx6qdl-sabreauto: Add PFUZE100 support
  ARM: dts: imx6sl-evk: Add audio support
  ARM: dts: imx6sl-evk: Add PFUZE100 support
  ARM: dts: imx6qdl-sabresd: correct gpio key's active state

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