[U-Boot] [PATCH 4/4] zynq: add UART nodes to device tree to initialize UART with OF

Masahiro Yamada
2014-05-14T12:55:10Z

Commit c9416b92 added OF UART initialization support
but uart and aliases nodes are missing in device tree.

The nodes uart0 and uart1 have been copied from
arch/arm/boot/dts/zynq-7000.dtsi, Linux Kernel v3.15-rc5 tag.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Michal Simek <michal.simek@xilinx.com>
---

arch/arm/dts/zynq-7000.dtsi | 18 ++++++++++++++++++
arch/arm/dts/zynq-microzed.dts | 4 ++++
arch/arm/dts/zynq-zc702.dts | 4 ++++
arch/arm/dts/zynq-zc706.dts | 4 ++++
arch/arm/dts/zynq-zc770-xm010.dts | 4 ++++
arch/arm/dts/zynq-zc770-xm012.dts | 4 ++++
arch/arm/dts/zynq-zc770-xm013.dts | 4 ++++
arch/arm/dts/zynq-zed.dts | 4 ++++
8 files changed, 46 insertions(+)

diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi
index f20b8bd..0766aaf 100644
--- a/arch/arm/dts/zynq-7000.dtsi
+++ b/arch/arm/dts/zynq-7000.dtsi
@@ -10,4 +10,22 @@

/ {
compatible = "xlnx,zynq-7000";
+
+ amba {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ uart0: uart at e0000000 {
+ compatible = "xlnx,xuartps";
+ status = "disabled";
+ reg = <0xE0000000 0x1000>;
+ };
+
+ uart1: uart at e0001000 {
+ compatible = "xlnx,xuartps";
+ status = "disabled";
+ reg = <0xE0001000 0x1000>;
+ };
+ };
};
diff --git a/arch/arm/dts/zynq-microzed.dts b/arch/arm/dts/zynq-microzed.dts
index 842896f..c373a2c 100644
--- a/arch/arm/dts/zynq-microzed.dts
+++ b/arch/arm/dts/zynq-microzed.dts
@@ -12,6 +12,10 @@
model = "Zynq MicroZED Board";
compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";

+ aliases {
+ serial0 = &uart1;
+ };
+
memory {
device_type = "memory";
reg = <0 0x40000000>;
diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts
index a94e331..4fa0b00 100644
--- a/arch/arm/dts/zynq-zc702.dts
+++ b/arch/arm/dts/zynq-zc702.dts
@@ -12,6 +12,10 @@
model = "Zynq ZC702 Board";
compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";

+ aliases {
+ serial0 = &uart1;
+ };
+
memory {
device_type = "memory";
reg = <0 0x40000000>;
diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts
index 92de947..2a80195 100644
--- a/arch/arm/dts/zynq-zc706.dts
+++ b/arch/arm/dts/zynq-zc706.dts
@@ -12,6 +12,10 @@
model = "Zynq ZC706 Board";
compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";

+ aliases {
+ serial0 = &uart1;
+ };
+
memory {
device_type = "memory";
reg = <0 0x40000000>;
diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index 8d68208..5e66174 100644
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -12,6 +12,10 @@
model = "Zynq ZC770 XM010 Board";
compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";

+ aliases {
+ serial0 = &uart1;
+ };
+
memory {
device_type = "memory";
reg = <0 0x40000000>;
diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts
index 9ebbddf..127a661 100644
--- a/arch/arm/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/dts/zynq-zc770-xm012.dts
@@ -12,6 +12,10 @@
model = "Zynq ZC770 XM012 Board";
compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";

+ aliases {
+ serial0 = &uart1;
+ };
+
memory {
device_type = "memory";
reg = <0 0x40000000>;
diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts
index b4f7fa2..c61c7e7 100644
--- a/arch/arm/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/dts/zynq-zc770-xm013.dts
@@ -12,6 +12,10 @@
model = "Zynq ZC770 XM013 Board";
compatible = "xlnx,zynq-zc770-xm013", "xlnx,zynq-7000";

+ aliases {
+ serial0 = &uart0;
+ };
+
memory {
device_type = "memory";
reg = <0 0x40000000>;
diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts
index 3488a56..70cc8a6 100644
--- a/arch/arm/dts/zynq-zed.dts
+++ b/arch/arm/dts/zynq-zed.dts
@@ -12,6 +12,10 @@
model = "Zynq ZED Board";
compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";

+ aliases {
+ serial0 = &uart1;
+ };
+
memory {
device_type = "memory";
reg = <0 0x20000000>;
--
1.8.3.2