diff options
author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2013-06-13 09:37:16 -0700 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2013-06-17 10:32:39 +0200 |
commit | ec11ebcf2fab2d367e18c45712f7216aa6452243 (patch) | |
tree | 47485b684cf467d33a41d5e9c618a3c7c34d7542 /arch/arm | |
parent | 7fa5ac3fa2103ad4f8334373e786857ee6a3ba9f (diff) | |
download | op-kernel-dev-ec11ebcf2fab2d367e18c45712f7216aa6452243.zip op-kernel-dev-ec11ebcf2fab2d367e18c45712f7216aa6452243.tar.gz |
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 <soren.brinkmann@xilinx.com>
Reviewed-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/zynq-7000.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/zynq-zc702.dts | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 0dbee2c..6f54a64 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 e25a307..21aea99 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"; +}; |