From: Olof Johansson <olof@lixom.net>
Date: Thu, 20 Feb 2014 08:51:18 +0000 (-0800)
Subject: Merge tag 'imx-dt-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=11dd54384bb2ea74a5f990b18f1bb7cd8d42fd56;p=deliverable%2Flinux.git

Merge tag 'imx-dt-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

Merge "i.MX device tree changes for 3.15" from Shawn Guo:

 - New SoC device tree support for imx35 and imx50
 - A good number of new board support: imx25-eukrea, imx28-duckbill,
   imx28-eukrea, Eukrea cpuimx35, imx50-evk, imx51-eukrea, imx53-voipac,
   MCIMX53-START-R and Ka-Ro TX53.
 - Quite some updates and tweaking on imx27 phycore and apf27dev boards
 - Add pinfunc headers for imx25, imx27 and imx50
 - Make pinctrl nodes board specific to avoid floating board specific
   device tree blob with so many unused pinctrl data
 - Use generic node name for fixed regulator
 - Use clock defines in imx5 DTS files
 - Use macros for interrupt and gpio flags
 - A plenty of random updates on various SoC and board device tree
   sources, adding pinctrl settings, device nodes, properties, aliases.

* tag 'imx-dt-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6: (89 commits)
  ARM: dts: imx28-m28cu3: Remove 'reset-active-high'
  ARM: dts: imx5: use imx51-ssi
  ARM: dts: imx51: Add mmc aliases
  ARM: dts: imx53: Add mmc aliases
  ARM: dts: imx53: add support for Ka-Ro TX53 modules
  ARM: dts: Add support for the cpuimx35 board from Eukrea and its baseboard.
  ARM: dts: imx28-apf28dev: add user button
  ARM: dts: i.MX51: Switch to use standard definitions for input subsystem
  ARM: dts: i.MX53: add support for MCIMX53-START-R
  ARM: dts: i.MX53: move common QSB nodes to new file
  ARM: dts: imx53-evk: Remove board support
  ARM: dts: vf610: use the interrupt macros
  ARM: dts: imx53: Add gpio and input dt includes.
  ARM: dts: i.MX27: Add SSI nodes
  ARM: dts: mxs: add mxs phy controller id
  ARM: dts: imx27-phytec-phycore-rdk: Add pinctrl definitions for WEIM
  ARM: dts: imx27-phytec-phycore-rdk: Add pingrp for SDHC
  ARM: dts: imx27-phytec-phycore-som: Add spi-cs-high property to PMIC
  ARM: dts: imx27-phytec-phycore-rdk: Enable 1-Wire module
  ARM: dts: imx27-phytec-phycore-som: Add NFC pin group
  ...
---

11dd54384bb2ea74a5f990b18f1bb7cd8d42fd56
diff --cc arch/arm/boot/dts/Makefile
index d1599a73e111,77f653648e61..0b805c873eec
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -151,18 -153,14 +154,21 @@@ dtb-$(CONFIG_ARCH_MXC) += 
  	imx53-m53evk.dtb \
  	imx53-mba53.dtb \
  	imx53-qsb.dtb \
+ 	imx53-qsrb.dtb \
  	imx53-smd.dtb \
+ 	imx53-tx53-x03x.dtb \
+ 	imx53-tx53-x13x.dtb \
+ 	imx53-voipac-bsb.dtb \
  	imx6dl-cubox-i.dtb \
 +	imx6dl-dfi-fs700-m60.dtb \
 +	imx6dl-gw51xx.dtb \
 +	imx6dl-gw52xx.dtb \
 +	imx6dl-gw53xx.dtb \
 +	imx6dl-gw54xx.dtb \
  	imx6dl-hummingboard.dtb \
 +	imx6dl-nitrogen6x.dtb \
  	imx6dl-sabreauto.dtb \
 +	imx6dl-sabrelite.dtb \
  	imx6dl-sabresd.dtb \
  	imx6dl-wandboard.dtb \
  	imx6q-arm2.dtb \