Merge tag 'imx-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Merge "ARM: imx: device tree changes for 3.16" from Shawn Guo:

i.MX device tree changes for 3.16:
 - New board support: imx35-pdk, imx51-digi-connectcore, imx6dl-phytec,
   imx6dl-riotboard, and vf610-colibri.
 - Improve device tree support for imx51-babbage and eukrea-cpuimx51 to
   get the same level support as board files, so that we can kill the
   board files.
 - Quite some updates on imx27-phytec-phycore board support from
   Alexander Shiyan
 - Enable USB, sound and touchscreen on the eukrea imx25/35/51 boards,
   from Denis Carikli
 - Quite a lot of patches from Fabio Estevam, updating Freescale
   imx25-pdk and imx27-pdk board support
 - Correct USB device configuration for imx25/35
 - Fixes i2c4 device node in imx6dl.dtsi regarding to compatible string
   and clock data
 - Enable HDMI, TVE, LVDS display support on a bunch of imx5/6 boards
 - Update PCIe to the new binding and enable PCIe support on
   imx6qdl-sabresd board
 - A couple of imx6q-dmo-edmqmx6 updates from Lucas Stach, adding pfuze
   irq gpio and SPI flash
 - Enable CODA7541 VPU for i.MX53
 - A series of updates on imx6qdl-phytec boards from Philipp Zabel
 - Small cleanups and fixes on board imx28-duckbill - Michael Heimpold
 - Add stdout-path property to i.MX boards
 - Karo TX25 board updates from Sascha Hauer
 - Enable pwm and sdhc devices for board vf610-twr

* tag 'imx-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (105 commits)
  ARM: dts: imx35-pdk: Fix memory region description
  ARM: dts: imx51-eukrea-mbimxsd51-baseboard: Add CAN support
  ARM: dts: imx6: add new board RIoTboard
  ARM: dts: imx6: i2c4 cleanup
  ARM: dts: imx6: edmqmx6: add vcc and vio power supplies to stmpe
  ARM: dts: Karo TX25: use hardware ecc
  ARM: dts: Karo TX25: Add phy reset gpio and supply for FEC
  ARM: dts: Karo TX25: Add pinctrl nodes
  ARM: dts: i.MX25: Add IRAM node
  ARM: dts: i.MX25: Add mmc aliases
  ARM: dts: i.MX51 babbage: Fix FEC pad ctrl settings
  ARM: dts: imx6qdl-sabresd: Add USDHC4 support
  ARM: imx: add HDMI support for SolidRun HummingBoard and Cubox-i
  ARM: dts: imx6: edmqmx6: add SPI bus and flash
  ARM: dts: imx6: edmqmx6: add pinctrl for pfuze irq gpio
  ARM: dts: imx6q-udoo: Add HDMI support
  ARM: dts: Add stdout-path property to i.MX boards
  ARM: dts: imx: Fix LVDS mapping for Ventana GW52xx
  ARM: dts: imx: add LVDS backlight for Ventana
  ARM: dts: imx6qdl-sabresd: remove power-on gpio from pcie
  ...

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

1 files changed, 19 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts b/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
new file mode 100644
index 000000000000..08e97801494e
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6dl-phytec-pfla02.dtsi"
+#include "imx6qdl-phytec-pbab01.dtsi"
+
+/ {
+	model = "Phytec phyFLEX-i.MX6 DualLite/Solo Carrier-Board";
+	compatible = "phytec,imx6dl-pbab01", "phytec,imx6dl-pfla02", "fsl,imx6dl";
+};