From ec11ebcf2fab2d367e18c45712f7216aa6452243 Mon Sep 17 00:00:00 2001 From: Soren Brinkmann Date: Thu, 13 Jun 2013 09:37:16 -0700 Subject: [PATCH] arm: dt: zynq: Use 'status' property for UART nodes Set the default status for UARTs to disabled in the zynq-7000.dtsi file and let board dts files enable the UARTs on demand. Signed-off-by: Soren Brinkmann Reviewed-by: Steffen Trumtrar Signed-off-by: Michal Simek --- arch/arm/boot/dts/zynq-7000.dtsi | 2 ++ arch/arm/boot/dts/zynq-zc702.dts | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 0dbee2c23905..6f54a64850eb 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -49,6 +49,7 @@ uart0: uart@e0000000 { compatible = "xlnx,xuartps"; + status = "disabled"; clocks = <&clkc 23>, <&clkc 40>; clock-names = "ref_clk", "aper_clk"; reg = <0xE0000000 0x1000>; @@ -57,6 +58,7 @@ uart1: uart@e0001000 { compatible = "xlnx,xuartps"; + status = "disabled"; clocks = <&clkc 24>, <&clkc 41>; clock-names = "ref_clk", "aper_clk"; reg = <0xE0001000 0x1000>; diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index e25a307438ad..21aea99a067b 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -24,7 +24,11 @@ }; chosen { - bootargs = "console=ttyPS1,115200 earlyprintk"; + bootargs = "console=ttyPS0,115200 earlyprintk"; }; }; + +&uart1 { + status = "okay"; +}; -- 2.34.1