summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Pargmann <mpa@pengutronix.de>2013-11-20 09:45:50 +0100
committerShawn Guo <shawn.guo@linaro.org>2014-02-09 14:32:57 +0100
commit858db3160820b0e0d02c363ea7d8e409ea0c498a (patch)
tree098cfc51ca450c9a6990316dee4a251a32f7bf7e
parentARM: dts: imx27 phyCARD-S pinctrl (diff)
downloadlinux-858db3160820b0e0d02c363ea7d8e409ea0c498a.tar.xz
linux-858db3160820b0e0d02c363ea7d8e409ea0c498a.zip
ARM: dts: imx27 phycore move uart1 to rdk
uart1 is not used on SOM. It is passed directly to the rdk board. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts1
-rw-r--r--arch/arm/boot/dts/imx27-phytec-phycore-som.dts4
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index 0fc6551786c6..ad76d88a90ff 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -29,6 +29,7 @@
&uart1 {
fsl,uart-has-rtscts;
+ status = "okay";
};
&uart2 {
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
index 4ec402c38945..648541a33e8d 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
@@ -165,10 +165,6 @@
status = "okay";
};
-&uart1 {
- status = "okay";
-};
-
&weim {
status = "okay";