From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 5 Apr 2016 11:46:28 +0000 (+0200)
Subject: ARM64: zynqmp: Use dcc instead regular uart for mini targets
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b1785dc73202bbe6f5ae07f65f0dddf4c8e912f;p=thirdparty%2Fu-boot.git

ARM64: zynqmp: Use dcc instead regular uart for mini targets

mini configuration is supposed to run from OCM which don't need to use
any psu_init configuration that's why using dcc is much better option.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/dts/zynqmp-mini-nand.dts b/arch/arm/dts/zynqmp-mini-nand.dts
index 0e02e764ce6..620fae7158c 100644
--- a/arch/arm/dts/zynqmp-mini-nand.dts
+++ b/arch/arm/dts/zynqmp-mini-nand.dts
@@ -18,7 +18,7 @@
 	#size-cells = <1>;
 
 	aliases {
-		serial0 = &uart0;
+		serial0 = &dcc;
 	};
 
 	chosen {
@@ -30,6 +30,12 @@
 		reg = <0x0 0x0 0x40000000>;
 	};
 
+	dcc: dcc {
+		compatible = "arm,dcc";
+		status = "disabled";
+		u-boot,dm-pre-reloc;
+	};
+
 	amba: amba {
 		compatible = "simple-bus";
 		#address-cells = <2>;
@@ -95,20 +101,9 @@
 				reg = <0x1 0x3400000 0xFCC00000>;
 			};
 		};
-
-		uart0: serial@ff000000 {
-			compatible = "cdns,uart-r1p12";
-			status = "okay";
-			reg = <0x0 0xff000000 0x1000>;
-			clock-names = "uart_clk", "pclk";
-			clocks = <&misc_clk &misc_clk>;
-		};
-
-		misc_clk: misc_clk {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <25000000>;
-		};
-
 	};
 };
+
+&dcc {
+	status = "okay";
+};
diff --git a/arch/arm/dts/zynqmp-mini-qspi.dts b/arch/arm/dts/zynqmp-mini-qspi.dts
index 4d24aee29f0..674aa7ef30d 100644
--- a/arch/arm/dts/zynqmp-mini-qspi.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi.dts
@@ -18,7 +18,7 @@
 	#size-cells = <1>;
 
 	aliases {
-		serial0 = &uart0;
+		serial0 = &dcc;
 		spi0 = &qspi;
 	};
 
@@ -31,6 +31,12 @@
 		reg = <0x0 0x0 0x40000000>;
 	};
 
+	dcc: dcc {
+		compatible = "arm,dcc";
+		status = "disabled";
+		u-boot,dm-pre-reloc;
+	};
+
 	amba: amba {
 		compatible = "simple-bus";
 		#address-cells = <2>;
@@ -48,14 +54,6 @@
 			#size-cells = <0>;
 		};
 
-		uart0: serial@ff000000 {
-			compatible = "cdns,uart-r1p12";
-			status = "disabled";
-			reg = <0x0 0xff000000 0x1000>;
-			clock-names = "uart_clk", "pclk";
-			clocks = <&misc_clk &misc_clk>;
-		};
-
 		misc_clk: misc_clk {
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
@@ -93,6 +91,6 @@
 	};
 };
 
-&uart0 {
+&dcc {
 	status = "okay";
 };