From: Olof Johansson <olof@lixom.net>
Date: Thu, 13 Sep 2012 06:17:11 +0000 (-0700)
Subject: Merge tag 'imx-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cecb9a1e4dda8a8cb74227b79091edcd62e04674;p=deliverable%2Flinux.git

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

- All imx53 board files are removed by the equal device tree support
- The efikamx board files are removed to ease device tree migration
- Remove dummy pinctrl state by setting up pinctrl in device tree

* tag 'imx-dt-3.7' of git://git.linaro.org/people/shawnguo/linux-2.6: (28 commits)
  ARM: imx6q-sabrelite: Rename 'pinctrl_gpio_hog'
  ARM: imx51: decouple device tree boot from board files
  ARM: imx51: build in pinctrl support
  ARM: dts: imx51-babbage: add pinctrl settings
  ARM: imx53: remove unneeded files and functions
  ARM: imx53: support device tree boot only
  ARM: imx53: decouple device tree boot from board files
  ARM: imx53: build in pinctrl support
  ARM: dts: imx53-smd: add pinctrl settings
  ARM: dts: imx53-evk: add pinctrl settings
  ARM: dts: imx53-ard: add pinctrl settings
  ARM: dts: imx53-qsb: add pinctrl settings
  ARM: imx6q: remove dummy pinctrl state
  ARM: dts: imx6q-sabresd: add pinctrl settings
  ARM: dts: imx6q-arm2: add pinctrl for uart and enet
  ARM: dts: imx6q-sabrelite: add pinctrl for usdhc and enet
  ARM: dts: imx6q: sort iomuxc sub-nodes in name
  ARM: dts: imx6q: name iomuxc sub-nodes following pin function
  ARM: dts: imx6q: improve indentation for fsl,pins
  ARM: efikamx: remove Genesi Efika MX platform files from the tree
  ...

Resolved trivial context conflict in arch/arm/boot/dts/imx51-babbage.dts
---

cecb9a1e4dda8a8cb74227b79091edcd62e04674
diff --cc arch/arm/boot/dts/imx51-babbage.dts
index 59d9789e5508,6f4c80e26c57..cbd2b1c7487b
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@@ -25,8 -25,10 +25,10 @@@
  		aips@70000000 { /* aips-1 */
  			spba@70000000 {
  				esdhc@70004000 { /* ESDHC1 */
+ 					pinctrl-names = "default";
+ 					pinctrl-0 = <&pinctrl_esdhc1_1>;
 -					fsl,cd-internal;
 -					fsl,wp-internal;
 +					fsl,cd-controller;
 +					fsl,wp-controller;
  					status = "okay";
  				};