From: Olof Johansson <olof@lixom.net>
Date: Fri, 30 Nov 2018 23:16:42 +0000 (-0800)
Subject: Merge tag 'vexpress-drm-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.0-rc1~77^2~47
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/9cf0418ee072c24a2bc438b6ad8fc4ab07ec5f5d?hp=-c

Merge tag 'vexpress-drm-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt

Versatile Express DTS update for DRM:
This updates the Versatile Express family DTS files to
contain the correct and detailed information required
for the PL11x DRM driver to work properly.

* tag 'vexpress-drm-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: dts: Modernize the Vexpress PL111 integration

Signed-off-by: Olof Johansson <olof@lixom.net>
---

9cf0418ee072c24a2bc438b6ad8fc4ab07ec5f5d
diff --combined arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index 8b926c30ccd1,a5136b1adaa2..a2ccacd07f4f
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@@ -104,6 -104,20 +104,20 @@@
  		reg = <0 0x80000000 0 0x40000000>;
  	};
  
+ 	reserved-memory {
+ 		#address-cells = <2>;
+ 		#size-cells = <2>;
+ 		ranges;
+ 
+ 		/* Chipselect 2 is physically at 0x18000000 */
+ 		vram: vram@18000000 {
+ 			/* 8 MB of designated video RAM */
+ 			compatible = "shared-dma-pool";
+ 			reg = <0 0x18000000 0 0x00800000>;
+ 			no-map;
+ 		};
+ 	};
+ 
  	wdt@2a490000 {
  		compatible = "arm,sp805", "arm,primecell";
  		reg = <0 0x2a490000 0 0x1000>;
@@@ -393,11 -407,10 +407,11 @@@
  
  		clocks = <&oscclk6a>;
  		clock-names = "apb_pclk";
 -		port {
 -			etb_in_port: endpoint {
 -				slave-mode;
 -				remote-endpoint = <&replicator_out_port0>;
 +		in-ports {
 +			port {
 +				etb_in_port: endpoint {
 +					remote-endpoint = <&replicator_out_port0>;
 +				};
  			};
  		};
  	};
@@@ -408,11 -421,10 +422,11 @@@
  
  		clocks = <&oscclk6a>;
  		clock-names = "apb_pclk";
 -		port {
 -			tpiu_in_port: endpoint {
 -				slave-mode;
 -				remote-endpoint = <&replicator_out_port1>;
 +		in-ports {
 +			port {
 +				tpiu_in_port: endpoint {
 +					remote-endpoint = <&replicator_out_port1>;
 +				};
  			};
  		};
  	};
@@@ -423,10 -435,11 +437,10 @@@
  		 */
  		compatible = "arm,coresight-replicator";
  
 -		ports {
 +		out-ports {
  			#address-cells = <1>;
  			#size-cells = <0>;
  
 -			/* replicator output ports */
  			port@0 {
  				reg = <0>;
  				replicator_out_port0: endpoint {
@@@ -440,11 -453,12 +454,11 @@@
  					remote-endpoint = <&tpiu_in_port>;
  				};
  			};
 +		};
  
 -			/* replicator input port */
 -			port@2 {
 -				reg = <0>;
 +		in-ports {
 +			port {
  				replicator_in_port0: endpoint {
 -					slave-mode;
  					remote-endpoint = <&funnel_out_port0>;
  				};
  			};
@@@ -457,36 -471,40 +471,36 @@@
  
  		clocks = <&oscclk6a>;
  		clock-names = "apb_pclk";
 -		ports {
 -			#address-cells = <1>;
 -			#size-cells = <0>;
 -
 -			/* funnel output port */
 -			port@0 {
 -				reg = <0>;
 +		out-ports {
 +			port {
  				funnel_out_port0: endpoint {
  					remote-endpoint =
  						<&replicator_in_port0>;
  				};
  			};
 +		};
  
 -			/* funnel input ports */
 -			port@1 {
 +		in-ports {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
 +			port@0 {
  				reg = <0>;
  				funnel_in_port0: endpoint {
 -					slave-mode;
  					remote-endpoint = <&ptm0_out_port>;
  				};
  			};
  
 -			port@2 {
 +			port@1 {
  				reg = <1>;
  				funnel_in_port1: endpoint {
 -					slave-mode;
  					remote-endpoint = <&ptm1_out_port>;
  				};
  			};
  
 -			port@3 {
 +			port@2 {
  				reg = <2>;
  				funnel_in_port2: endpoint {
 -					slave-mode;
  					remote-endpoint = <&etm0_out_port>;
  				};
  			};
@@@ -496,6 -514,7 +510,6 @@@
  			port@4 {
  				reg = <4>;
  				funnel_in_port4: endpoint {
 -					slave-mode;
  					remote-endpoint = <&etm1_out_port>;
  				};
  			};
@@@ -503,6 -522,7 +517,6 @@@
  			port@5 {
  				reg = <5>;
  				funnel_in_port5: endpoint {
 -					slave-mode;
  					remote-endpoint = <&etm2_out_port>;
  				};
  			};
@@@ -516,11 -536,9 +530,11 @@@
  		cpu = <&cpu0>;
  		clocks = <&oscclk6a>;
  		clock-names = "apb_pclk";
 -		port {
 -			ptm0_out_port: endpoint {
 -				remote-endpoint = <&funnel_in_port0>;
 +		out-ports {
 +			port {
 +				ptm0_out_port: endpoint {
 +					remote-endpoint = <&funnel_in_port0>;
 +				};
  			};
  		};
  	};
@@@ -532,11 -550,9 +546,11 @@@
  		cpu = <&cpu1>;
  		clocks = <&oscclk6a>;
  		clock-names = "apb_pclk";
 -		port {
 -			ptm1_out_port: endpoint {
 -				remote-endpoint = <&funnel_in_port1>;
 +		out-ports {
 +			port {
 +				ptm1_out_port: endpoint {
 +					remote-endpoint = <&funnel_in_port1>;
 +				};
  			};
  		};
  	};
@@@ -548,11 -564,9 +562,11 @@@
  		cpu = <&cpu2>;
  		clocks = <&oscclk6a>;
  		clock-names = "apb_pclk";
 -		port {
 -			etm0_out_port: endpoint {
 -				remote-endpoint = <&funnel_in_port2>;
 +		out-ports {
 +			port {
 +				etm0_out_port: endpoint {
 +					remote-endpoint = <&funnel_in_port2>;
 +				};
  			};
  		};
  	};
@@@ -564,11 -578,9 +578,11 @@@
  		cpu = <&cpu3>;
  		clocks = <&oscclk6a>;
  		clock-names = "apb_pclk";
 -		port {
 -			etm1_out_port: endpoint {
 -				remote-endpoint = <&funnel_in_port4>;
 +		out-ports {
 +			port {
 +				etm1_out_port: endpoint {
 +					remote-endpoint = <&funnel_in_port4>;
 +				};
  			};
  		};
  	};
@@@ -580,11 -592,9 +594,11 @@@
  		cpu = <&cpu4>;
  		clocks = <&oscclk6a>;
  		clock-names = "apb_pclk";
 -		port {
 -			etm2_out_port: endpoint {
 -				remote-endpoint = <&funnel_in_port5>;
 +		out-ports {
 +			port {
 +				etm2_out_port: endpoint {
 +					remote-endpoint = <&funnel_in_port5>;
 +				};
  			};
  		};
  	};