Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
	arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
	arch/arm/boot/dts/imx51-apf51.dts
	arch/arm/boot/dts/imx6q-sabrelite.dts

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/imx27.dtsi
index 5708e42af3380b858a45ccef328aed6df05bddb3,63b1b3291c1db121b97a193baeb20d21bb0832db..d27123d6a2428a40cde72604feb479960faeb61c
--- 1/arch/arm/boot/dts/imx27.dtsi
--- 2/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@@ -9,8 -9,10 +9,11 @@@
   * http://www.gnu.org/copyleft/gpl.html
   */
  
 +#include <dt-bindings/gpio/gpio.h>
  #include "skeleton.dtsi"
+ #include "imx27-pingrp.h"
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/gpio/gpio.h>
  
  / {
        aliases {

diff --cc arch/arm/boot/dts/imx28-apf28dev.dts
Simple merge

diff --cc arch/arm/boot/dts/imx28-cfa10037.dts
Simple merge

diff --cc arch/arm/boot/dts/imx28-cfa10049.dts
Simple merge

diff --cc arch/arm/boot/dts/imx28-cfa10057.dts
Simple merge

diff --cc arch/arm/boot/dts/imx28-cfa10058.dts
Simple merge

diff --cc arch/arm/boot/dts/imx28-evk.dts
Simple merge

diff --cc arch/arm/boot/dts/imx28-m28cu3.dts
Simple merge

diff --cc arch/arm/boot/dts/imx28.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx51.dtsi
index f1ab0e2ceb4677928e1fc014811df1eaa2ab308e,3291e553c4fd2639066ed80903371731ad40088e..393a4880058984322476a4baa62e82646e008971
--- 1/arch/arm/boot/dts/imx51.dtsi
--- 2/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@@ -10,9 -10,11 +10,12 @@@
   * http://www.gnu.org/copyleft/gpl.html
   */
  
 +#include <dt-bindings/gpio/gpio.h>
  #include "skeleton.dtsi"
- #include "imx51-pinfunc.h"
+ #include "imx51-pingrp.h"
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/clock/imx5-clock.h>
+ #include <dt-bindings/gpio/gpio.h>
  
  / {
        aliases {

diff --cc arch/arm/boot/dts/imx53-evk.dts
index 5ee3d7dc921a50c786ae1aaf415511d23acac742,214ac2e1802a779373607aabd04ac765fce4d610..82b37735f521d9dc2c7d4393a28579c6130f0c90
--- 1/arch/arm/boot/dts/imx53-evk.dts
--- 2/arch/arm/boot/dts/imx53-evk.dts
+++ b/arch/arm/boot/dts/imx53-evk.dts
@@@ -119,8 -143,8 +143,8 @@@
  
  &fec {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec_1>;
+       pinctrl-0 = <&pinctrl_fec>;
        phy-mode = "rmii";
 -      phy-reset-gpios = <&gpio7 6 0>;
 +      phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
        status = "okay";
  };

diff --cc arch/arm/boot/dts/imx53-mba53.dts
Simple merge

diff --cc arch/arm/boot/dts/imx53-qsb.dts
index 3e655e913c32238a43ba24299d7cd538a3b80a93,4c04459c45251c8e5c9f4fa1783f933d29456028..35334e3a14a4f6e38cbc64710bf6d0e8a08bc78d
--- 1/arch/arm/boot/dts/imx53-qsb.dts
--- 2/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@@ -301,9 -336,9 +336,9 @@@
  
  &fec {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec_1>;
+       pinctrl-0 = <&pinctrl_fec>;
        phy-mode = "rmii";
 -      phy-reset-gpios = <&gpio7 6 0>;
 +      phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
        status = "okay";
  };
  

diff --cc arch/arm/boot/dts/imx53-smd.dts
index 91dc916c8bba776e663b32d0d10df1d79b8def50,e84decfb05d0b9e64ed1374a0fd3ffdd390421fc..4d28bbdf530f8ddd9c1de6eccd8962626012af95
--- 1/arch/arm/boot/dts/imx53-smd.dts
--- 2/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@@ -175,8 -215,8 +215,8 @@@
  
  &fec {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec_1>;
+       pinctrl-0 = <&pinctrl_fec>;
        phy-mode = "rmii";
 -      phy-reset-gpios = <&gpio7 6 0>;
 +      phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
        status = "okay";
  };

diff --cc arch/arm/boot/dts/imx53.dtsi
index abf11014f1adb1212aca1bfc5a44ad340612bedd,90359da564ce183e3f3bf13760bc15e7b14f6c43..4ce7087ecf6f37e6d894d78bd4ce9569c434b3e2
--- 1/arch/arm/boot/dts/imx53.dtsi
--- 2/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@@ -10,9 -10,9 +10,10 @@@
   * http://www.gnu.org/copyleft/gpl.html
   */
  
 +#include <dt-bindings/gpio/gpio.h>
  #include "skeleton.dtsi"
- #include "imx53-pinfunc.h"
+ #include "imx53-pingrp.h"
+ #include <dt-bindings/clock/imx5-clock.h>
  
  / {
        aliases {

diff --cc arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
index 3e28d135ada4307943fb98e02c454e93167ef239,05b4796b1318d9b865cb60ca16114b7a92f05682..dea52ff9adbda8809692fb279a039447ab930ef9
--- 1/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
--- 2/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
@@@ -150,9 -172,9 +172,9 @@@
  
  &fec {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_enet_3>;
+       pinctrl-0 = <&pinctrl_enet>;
        phy-mode = "rgmii";
 -      phy-reset-gpios = <&gpio3 23 0>;
 +      phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
        status = "disabled";
  };
  

diff --cc arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index b4a4de5a7784ab7d23752ac835e6732d01dfd347,91e5dd43537fcc1031935da919b49e4d703f0b3c..10b912bf8cdd5f8a5cc77c9ed04542d8f53b65f3
--- 1/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
--- 2/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@@ -114,9 -130,9 +130,9 @@@
  
  &fec {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_enet_1>;
+       pinctrl-0 = <&pinctrl_enet>;
        phy-mode = "rgmii";
 -      phy-reset-gpios = <&gpio1 25 0>;
 +      phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
        status = "okay";
  };
  

diff --cc arch/arm/boot/dts/imx6qdl-wandboard.dtsi
index 773504c8a6ba6dc13ddd29a5828859e59b6927f1,88894b13ccd23e96702b27501c012a8f3aa1921a..c2900173cd9aad62daf277dc634ca19ebfa20f4a
--- 1/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
--- 2/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
@@@ -96,9 -140,9 +140,9 @@@
  
  &fec {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_enet_1>;
+       pinctrl-0 = <&pinctrl_enet>;
        phy-mode = "rgmii";
 -      phy-reset-gpios = <&gpio3 29 0>;
 +      phy-reset-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
        status = "okay";
  };
  

diff --cc arch/arm/boot/dts/imx6qdl.dtsi
Simple merge