Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d9a4e66 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Removing len parameters for mdss device tree"

parents d9c2afb1 a9b5c94e
Loading
Loading
Loading
Loading
+0 −27
Original line number Diff line number Diff line
@@ -62,14 +62,6 @@ Required properties
				value corresponds to the number of smp blocks
				and the second is the size of each block
				present in the mdss hardware.
- qcom,mdss-sspp-len:		Address offset for SSPP pipes from one to the
				next. These are calculated using the difference between
				successive VIG pipes or RGB pipes or DMA pipes. The offset
				is same for any of these three types of pipes hence there
				is only one variable. For targets with single VIG pipe or
				single RGB pipe or single DMA pipe this value has been taken
				from targets with similar architecture but having multiple
				SSPP pipes.
- qcom,mdss-ctl-off:		Array of offset addresses for the available ctl
				hw blocks within MDP, these offsets are
				calculated from register "mdp_phys" defined in
@@ -115,21 +107,6 @@ Required properties
				defined in reg property. The number of offsets
				defiend should reflect the number of progammable
				interface blocks available in hardware.
- qcom,mdss-ctl-len:		Address offset from one CTL to the next. These
				offsets are calculated using difference of successive CTL
				offsets. The offset is constant for successive CTL.
- qcom,mdss-mixer-intf-len:	Address offset from one layer mixer to the next.
				These are calculated using difference of successive layer
				mixer offsets. The offset is constant for successive layer
				mixers. For targets with single layer mixer this value has
				been taken from targets with multiple layer mixers with
				similar architecture.
- qcom,mdss-dspp-len:		Address offset from one DSPP to the next. These
				offsets are calculated using difference of successive DSPP
				base addresses. The offset is constant for successive DSPP
				pipes. For targets with single DSPP this value has been taken
				from targets with multiple DSPP pipes with similar
				architecture.
- qcom,mdss-pref-prim-intf:	A string which indicates the configured hardware
				interface between MDP and the primary panel.
				Individual panel controller drivers initialize
@@ -378,7 +355,6 @@ Example:
						<2 4 5>,
						<2 6 7>;
		qcom,mdss-smp-data = <22 4096>;
		qcom,mdss-sspp-len = <0x00000400>;
		qcom,mdss-rot-block-size = <64>;
		qcom,mdss-smp-mb-per-pipe = <2>;
		qcom,mdss-pref-prim-intf = "dsi";
@@ -401,9 +377,6 @@ Example:
				    0x00017100 0x00019100>;
		qcom,mdss-intf-off = <0x00021100 0x00021300
					   0x00021500 0x00021700>;
		qcom,mdss-ctl-len = <0x00000100>;
		qcom,mdss-mixer-intf-len = <0x00000400>;
		qcom,mdss-dspp-len = <0x00000400>;

		/* buffer parameters to calculate prefill bandwidth */
		qcom,mdss-prefill-outstanding-buffer-bytes = <1024>;
+0 −4
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@
						<2 6 7>;

		qcom,mdss-smp-data = <44 8192>;
		qcom,mdss-sspp-len = <0x00000400>;

		qcom,mdss-ctl-off = <0x00000600 0x00000700 0x00000800
				     0x00000900 0x0000A00>;
@@ -75,9 +74,6 @@
					  0x00013200>;
		qcom,mdss-ad-off = <0x0013500 0x00013700 0x00013900>;
		qcom,mdss-highest-bank-bit = <0x3>;
		qcom,mdss-ctl-len = <0x00000100>;
		qcom,mdss-mixer-intf-len = <0x00000400>;
		qcom,mdss-dspp-len = <0x00000400>;

		qcom,mdss-has-bwc;
		qcom,mdss-has-decimation;
+0 −4
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@
		qcom,mdss-pipe-dma-xin-id = <2>;

		qcom,mdss-smp-data = <7 4096>;
		qcom,mdss-sspp-len = <0x00000400>;

		qcom,mdss-ctl-off = <0x00000600 0x00000700>;
		qcom,mdss-mixer-intf-off = <0x00003200>;
@@ -61,9 +60,6 @@
		qcom,mdss-rot-block-size = <64>;
		qcom,mdss-smp-mb-per-pipe = <3>;
		vdd-cx-supply = <&pm8226_s1_corner>;
		qcom,mdss-ctl-len = <0x00000100>;
		qcom,mdss-mixer-intf-len = <0x00000400>;
		qcom,mdss-dspp-len = <0x00000400>;

		qcom,vbif-settings = <0x004 0x00000001>,
				     <0x0D8 0x00000707>,
+0 −4
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@
		qcom,mdss-pipe-dma-xin-id = <2 10>;

		qcom,mdss-smp-data = <22 4096>;
		qcom,mdss-sspp-len = <0x00000400>;

		qcom,mdss-ctl-off = <0x00000600 0x00000700 0x00000800
				     0x00000900 0x0000A00>;
@@ -63,9 +62,6 @@
				    0x00017100 0x00019100>;
		qcom,mdss-intf-off = <0x00021100 0x00021300
					   0x00021500 0x00021700>;
		qcom,mdss-ctl-len = <0x00000100>;
		qcom,mdss-mixer-intf-len = <0x00000400>;
		qcom,mdss-dspp-len = <0x00000400>;

		qcom,mdss-has-wfd-blk;
		qcom,vbif-settings = <0x0004 0x00000001>,
+1 −5
Original line number Diff line number Diff line
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
@@ -42,7 +42,6 @@
		qcom,mdss-pipe-rgb-fetch-id = <10 11>;
		qcom,mdss-pipe-dma-fetch-id = <7>;
		qcom,mdss-smp-data = <12 8192>;
		qcom,mdss-sspp-len = <0x00000400>;

		qcom,mdss-ctl-off = <0x00000600 0x00000700 0x00000800>;
		qcom,mdss-mixer-intf-off = <0x00003200 0x00003600>;
@@ -52,9 +51,6 @@
		qcom,mdss-intf-off = <0x00000000 0x00012700>;
		qcom,mdss-pingpong-off = <0x00012d00 0x00012e00>;
		qcom,mdss-ad-off = <0x00013100>;
		qcom,mdss-ctl-len = <0x00000100>;
		qcom,mdss-mixer-intf-len = <0x00000400>;
		qcom,mdss-dspp-len = <0x00000400>;

		qcom,mdss-has-wfd-blk;
		qcom,mdp-settings = <0x02E0 0x000000A9>,
Loading