X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fdts%2Fzynqmp.dtsi;h=619450e1ba92c4d55965879b7ab567c0efe0e4f9;hb=1c62d999528da1f052cb4b07cbb540b148c52537;hp=ec6fc6a668415861f4a49772b016f590c91bc3cd;hpb=33aec51742702e3a141973f485905a0f008c3dc6;p=oweals%2Fu-boot.git

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index ec6fc6a668..619450e1ba 100644
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -10,7 +10,7 @@
 / {
 	compatible = "xlnx,zynqmp";
 	#address-cells = <2>;
-	#size-cells = <1>;
+	#size-cells = <2>;
 
 	cpus {
 		#address-cells = <1>;
@@ -247,15 +247,15 @@
 		compatible = "simple-bus";
 		#address-cells = <2>;
 		#size-cells = <1>;
-		ranges;
+		ranges = <0 0 0 0 0xffffffff>;
 
 		gic: interrupt-controller@f9010000 {
 			compatible = "arm,gic-400", "arm,cortex-a15-gic";
 			#interrupt-cells = <3>;
 			reg = <0x0 0xf9010000 0x10000>,
-			      <0x0 0xf902f000 0x2000>,
+			      <0x0 0xf9020000 0x20000>,
 			      <0x0 0xf9040000 0x20000>,
-			      <0x0 0xf906f000 0x2000>;
+			      <0x0 0xf9060000 0x20000>;
 			interrupt-controller;
 			interrupt-parent = <&gic>;
 			interrupts = <1 9 0xf04>;
@@ -264,9 +264,10 @@
 
 	amba: amba {
 		compatible = "simple-bus";
+		u-boot,dm-pre-reloc;
 		#address-cells = <2>;
 		#size-cells = <1>;
-		ranges;
+		ranges = <0 0 0 0 0xffffffff>;
 
 		can0: can@ff060000 {
 			compatible = "xlnx,zynq-can-1.0";
@@ -619,10 +620,10 @@
 			#interrupt-cells = <1>;
 			device_type = "pci";
 			interrupt-parent = <&gic>;
-			interrupts = < 0 118 4>,
-				     < 0 116 4>,
-				     < 0 115 4>,	/* MSI_1 [63...32] */
-				     < 0 114 4 >;	/* MSI_0 [31...0] */
+			interrupts = <0 118 4>,
+				     <0 116 4>,
+				     <0 115 4>,	/* MSI_1 [63...32] */
+				     <0 114 4>;	/* MSI_0 [31...0] */
 			interrupt-names = "misc", "intx", "msi_1", "msi_0";
 			reg = <0x0 0xfd0e0000 0x1000>,
 			      <0x0 0xfd480000 0x1000>,
@@ -648,7 +649,8 @@
 			interrupts = <0 15 4>;
 			interrupt-parent = <&gic>;
 			num-cs = <1>;
-			reg = <0x0 0xff0f0000 0x1000 0x0 0xc0000000 0x8000000>;
+			reg = <0x0 0xff0f0000 0x1000>,
+			      <0x0 0xc0000000 0x8000000>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			power-domains = <&pd_qspi>;
@@ -673,6 +675,7 @@
 		};
 
 		sdhci0: sdhci@ff160000 {
+			u-boot,dm-pre-reloc;
 			compatible = "arasan,sdhci-8.9a";
 			status = "disabled";
 			interrupt-parent = <&gic>;
@@ -684,6 +687,7 @@
 		};
 
 		sdhci1: sdhci@ff170000 {
+			u-boot,dm-pre-reloc;
 			compatible = "arasan,sdhci-8.9a";
 			status = "disabled";
 			interrupt-parent = <&gic>;
@@ -775,7 +779,8 @@
 		};
 
 		uart0: serial@ff000000 {
-			compatible = "cdns,uart-r1p12";
+			u-boot,dm-pre-reloc;
+			compatible = "cdns,uart-r1p12", "xlnx,xuartps";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 21 4>;
@@ -785,7 +790,8 @@
 		};
 
 		uart1: serial@ff010000 {
-			compatible = "cdns,uart-r1p12";
+			u-boot,dm-pre-reloc;
+			compatible = "cdns,uart-r1p12", "xlnx,xuartps";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 22 4>;
@@ -795,23 +801,45 @@
 		};
 
 		usb0: usb@fe200000 {
-			compatible = "snps,dwc3";
+			#address-cells = <2>;
+			#size-cells = <1>;
 			status = "disabled";
-			interrupt-parent = <&gic>;
-			interrupts = <0 65 4>;
-			reg = <0x0 0xfe200000 0x40000>;
-			clock-names = "clk_xin", "clk_ahb";
+			compatible = "xlnx,zynqmp-dwc3";
+			clock-names = "bus_clk", "ref_clk";
+			clocks = <&clk125>, <&clk125>;
 			power-domains = <&pd_usb0>;
+			ranges;
+
+			dwc3_0: dwc3@fe200000 {
+				compatible = "snps,dwc3";
+				status = "disabled";
+				reg = <0x0 0xfe200000 0x40000>;
+				interrupt-parent = <&gic>;
+				interrupts = <0 65 4>;
+				/* snps,quirk-frame-length-adjustment = <0x20>; */
+				snps,refclk_fladj;
+			};
 		};
 
 		usb1: usb@fe300000 {
-			compatible = "snps,dwc3";
+			#address-cells = <2>;
+			#size-cells = <1>;
 			status = "disabled";
-			interrupt-parent = <&gic>;
-			interrupts = <0 70 4>;
-			reg = <0x0 0xfe300000 0x40000>;
-			clock-names = "clk_xin", "clk_ahb";
+			compatible = "xlnx,zynqmp-dwc3";
+			clock-names = "bus_clk", "ref_clk";
+			clocks = <&clk125>, <&clk125>;
 			power-domains = <&pd_usb1>;
+			ranges;
+
+			dwc3_1: dwc3@fe300000 {
+				compatible = "snps,dwc3";
+				status = "disabled";
+				reg = <0x0 0xfe300000 0x40000>;
+				interrupt-parent = <&gic>;
+				interrupts = <0 70 4>;
+				/* snps,quirk-frame-length-adjustment = <0x20>; */
+				snps,refclk_fladj;
+			};
 		};
 
 		watchdog0: watchdog@fd4d0000 {
@@ -842,10 +870,11 @@
 			};
 		};
 
-		xlnx_dp: dp@43c00000 {
+		xlnx_dp: dp@fd4a0000 {
 			compatible = "xlnx,v-dp";
 			status = "disabled";
-			reg = <0x0 0xfd4a0000 0x1000>;
+			reg = <0x0 0xfd4a0000 0x1000>,
+			      <0x0 0xfd400000 0x20000>;
 			interrupts = <0 119 4>;
 			interrupt-parent = <&gic>;
 			clock-names = "aclk", "aud_clk";
@@ -858,6 +887,7 @@
 			xlnx,bpc = <8>;
 			xlnx,audio-chan = <2>;
 			xlnx,dp-sub = <&xlnx_dp_sub>;
+			xlnx,max-pclock-frequency = <300000>;
 		};
 
 		xlnx_dp_snd_card: dp_snd_card {
@@ -887,12 +917,16 @@
 			dma-names = "tx";
 		};
 
-		xlnx_dp_sub: dp_sub@43c0a000 {
+		xlnx_dp_sub: dp_sub@fd4aa000 {
 			compatible = "xlnx,dp-sub";
 			status = "disabled";
-			reg = <0x0 0xfd4aa000 0x1000>, <0x0 0xfd4ab000 0x1000>, <0x0 0xfd4ac000 0x1000>;
+			reg = <0x0 0xfd4aa000 0x1000>,
+			      <0x0 0xfd4ab000 0x1000>,
+			      <0x0 0xfd4ac000 0x1000>;
 			reg-names = "blend", "av_buf", "aud";
 			xlnx,output-fmt = "rgb";
+			xlnx,vid-fmt = "yuyv";
+			xlnx,gfx-fmt = "rgb565";
 		};
 
 		xlnx_dpdma: dma@fd4c0000 {
@@ -904,22 +938,22 @@
 			clock-names = "axi_clk";
 			dma-channels = <6>;
 			#dma-cells = <1>;
-			dma-video0channel@43c10000 {
+			dma-video0channel@fd4c0000 {
 				compatible = "xlnx,video0";
 			};
-			dma-video1channel@43c10000 {
+			dma-video1channel@fd4c0000 {
 				compatible = "xlnx,video1";
 			};
-			dma-video2channel@43c10000 {
+			dma-video2channel@fd4c0000 {
 				compatible = "xlnx,video2";
 			};
-			dma-graphicschannel@43c10000 {
+			dma-graphicschannel@fd4c0000 {
 				compatible = "xlnx,graphics";
 			};
-			dma-audio0channel@43c10000 {
+			dma-audio0channel@fd4c0000 {
 				compatible = "xlnx,audio0";
 			};
-			dma-audio1channel@43c10000 {
+			dma-audio1channel@fd4c0000 {
 				compatible = "xlnx,audio1";
 			};
 		};