From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 5 Jan 2014 23:47:17 +0000 (+1100)
Subject: Merge remote-tracking branch 'imx-mxs/for-next'
X-Git-Tag: next-20140106~108
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=354eee9481dac8f14074fa9e8a88da0dc05206ba;p=karo-tx-linux.git

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
---

354eee9481dac8f14074fa9e8a88da0dc05206ba
diff --cc arch/arm/boot/dts/imx27.dtsi
index 5708e42af338,63b1b3291c1d..d27123d6a242
--- a/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/imx51.dtsi
index f1ab0e2ceb46,3291e553c4fd..393a48800589
--- a/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 5ee3d7dc921a,214ac2e1802a..82b37735f521
--- a/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-qsb.dts
index 3e655e913c32,4c04459c4525..35334e3a14a4
--- a/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 91dc916c8bba,e84decfb05d0..4d28bbdf530f
--- a/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 abf11014f1ad,90359da564ce..4ce7087ecf6f
--- a/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 3e28d135ada4,05b4796b1318..dea52ff9adbd
--- a/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 b4a4de5a7784,91e5dd43537f..10b912bf8cdd
--- a/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 773504c8a6ba,88894b13ccd2..c2900173cd9a
--- a/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";
  };