From: Markus Pargmann <mpa@pengutronix.de>
Date: Sun, 7 Jul 2013 13:13:30 +0000 (+0200)
Subject: ARM: dts: imx27 phyCARD-S, move i2c1 and owire to rdk
X-Git-Tag: v3.12-rc1~115^2~5^2~46
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b9d6bfaabc9fb8fa99245109b966469f3a1d6e7c;p=~emulex%2Finfiniband.git

ARM: dts: imx27 phyCARD-S, move i2c1 and owire to rdk

Both buses are not used on the phyCARD-S module. This patch moves them
to the rdk file. Remove ioexpander.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---

diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
index 390d8f2f84d..0514b0a8919 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
@@ -41,6 +41,19 @@
 	status = "okay";
 };
 
+&i2c1 {
+	status = "okay";
+
+	rtc@51 {
+		compatible = "nxp,pcf8563";
+		reg = <0x51>;
+	};
+};
+
+&owire {
+	status = "okay";
+};
+
 &sdhci2 {
 	cd-gpios = <&gpio3 29 0>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
index cdff8c7b4b1..c8d57d1d074 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
@@ -33,20 +33,6 @@
 	status = "okay";
 };
 
-&i2c1 {
-	status = "okay";
-
-	ioexpander@41 {
-		compatible = "nxp,pca9536";
-		reg = <0x41>;
-	};
-
-	rtc@51 {
-		compatible = "nxp,pcf8563";
-		reg = <0x51>;
-	};
-};
-
 &i2c2 {
 	status = "okay";
 
@@ -56,7 +42,3 @@
 		reg = <0x52>;
 	};
 };
-
-&owire {
-	status = "okay";
-};