From: Olof Johansson Date: Sun, 9 Mar 2014 19:01:52 +0000 (-0700) Subject: Merge tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into... X-Git-Tag: dt-3.15~26 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c972aed76742d8dec310a3767d008b8421f4fba3;p=karo-tx-linux.git Merge tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt i.MX device tree changes for 3.15, take 2 from Shawn Guo: - Cleanup and device additions for imx27-phytec-phycard boards - eDMA and audio support for vf610-twr board - Minor updates and fixes for a couple of imx28 and imx5 boards * tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: dts: vf610: i2c: Add eDMA support ARM: dts: imx27-phytec-phycore-som: Add USBOTG node ARM: dts: imx27-phytec-phycore-rdk: Add USBH2 node ARM: dts: i.MX27: Add USB nodes ARM: dts: vf610-twr: Add ADC support ARM: dts: mxs: Fix the RTC compatible prop on M28EVK ARM: dts: vf610-twr: Add simple-card support. ARM: dts: vf610-twr: Enable SGTL5000 codec. ARM: dts: vf610-twr: Enable SAI ALSA SoC DAI device ARM: dts: vf610: Add edma mux Tx and Rx support for SAI node. ARM: dts: vf610: lpuart: Add eDMA support ARM: dts: vf610: Add eDMA node ARM: dts: imx27-phytec-phycore: Add diagnostic PMIC LEDs ARM: dts: imx27-phytec-phycard-s-som: Rename file to .dtsi ARM: dts: i.MX51 babbage: Support diagnostic LED ARM: dts: imx28-tx28: Remove 'enable-active-low' property ARM: dts: mx53: Remove 'enable-active-low' property ARM: dts: imx27-phytec-phycard-s-rdk: Add pinctrl definitions for SDHC2 ARM: dts: imx27-phytec-phycard-s-som: Add NFC node ARM: dts: imx27-phytec-phycard-s-som: Sort entries Signed-off-by: Olof Johansson --- c972aed76742d8dec310a3767d008b8421f4fba3