From: Markus Pargmann Date: Wed, 20 Nov 2013 08:45:50 +0000 (+0100) Subject: ARM: dts: imx27 phycore move uart1 to rdk X-Git-Tag: next-20140106~108^2~84 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d4fff57b69668220d507a91f12c49eb62a7cc83;p=karo-tx-linux.git 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 Signed-off-by: Shawn Guo --- 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";