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

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

Merge "msm: mdss: Organize regulator supplies used by DSI controller"

parents 78eab5fb 6f7612d0

Documentation/devicetree/bindings/fb/mdss-dsi-ctrl.txt

+58 −36
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ Required properties: 
Optional properties:

- label:		        	A string used to describe the controller used.



- qcom,platform-supply-entry<1..n>:	A node that lists the elements of the supply. There

					can be more than one instance of this binding,

					in which case the entry would be appended with

					the supply entry index.

					e.g. qcom,platform-supply-entry1

- qcom,ctrl-supply-entries:		A node that lists the elements of the supply used by the

					DSI controller and PHY. There can be more than one instance

					of this binding, in which case the entry would be appended

					with the supply entry index.

					e.g. qcom,ctrl-supply-entry@0

					-- qcom,supply-name: name of the supply (vdd/vdda/vddio)

					-- qcom,supply-min-voltage: minimum voltage level (uV)

					-- qcom,supply-max-voltage: maximum voltage level (uV)
@@ -46,6 +46,12 @@ Optional properties: 
					-- qcom,supply-post-on-sleep: time to sleep (ms) after turning on

					-- qcom,supply-pre-off-sleep: time to sleep (ms) before turning off

					-- qcom,supply-post-off-sleep: time to sleep (ms) after turning off

- qcom,panel-supply-entries:		A node that lists the elements of the supply used to

					power the DSI panel. There can be more than one instance

					of this binding, in which case the entry would be appended

					with the supply entry index. For a detailed description of

					fields in the supply entry, refer to the qcom,ctrl-supply-entries

					binding above.

- qcom,platform-enable-gpio:		Specifies the panel lcd/display enable gpio.

- qcom,platform-reset-gpio:		Specifies the panel reset gpio.

- qcom,platform-te-gpio:		Specifies the gpio used for TE.
@@ -91,37 +97,53 @@ Example: 
		qcom,platform-enable-gpio = <&msmgpio 58 1>;

		qcom,platform-bklight-en-gpio = <&msmgpio 86 0>;

		qcom,platform-mode-gpio = <&msmgpio 7 0>;

		qcom,platform-supply-entry1 {



		qcom,ctrl-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,ctrl-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdda";

				qcom,supply-min-voltage = <1200000>;

				qcom,supply-max-voltage = <1200000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

				qcom,supply-pre-on-sleep = <0>;

				qcom,supply-post-on-sleep = <20>;

				qcom,supply-pre-off-sleep = <0>;

				qcom,supply-post-off-sleep = <0>;

			};

		};



		qcom,panel-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

				qcom,supply-min-voltage = <2800000>;

				qcom,supply-max-voltage = <2800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

				qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <20>;

				qcom,supply-post-on-sleep = <0>;

				qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <20>;

				qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry2 {



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

				qcom,supply-min-voltage = <1800000>;

				qcom,supply-max-voltage = <1800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

				qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <30>;

				qcom,supply-post-on-sleep = <0>;

				qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <30>;

				qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry3 {

			qcom,supply-name = "vdda";

			qcom,supply-min-voltage = <1200000>;

			qcom,supply-max-voltage = <1200000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <30>;

		};

        };

arch/arm/boot/dts/qcom/apq8084-mdss.dtsi

+74 −65
Original line number Diff line number Diff line
@@ -160,9 +160,9 @@ 
			<0xfd922b00 0x2b0>,

			<0xfd828000 0x108>;

		reg-names = "dsi_ctrl", "dsi_phy", "mmss_misc_phys";

		vdda-supply = <&pma8084_l2>;

		vdd-supply = <&pma8084_l22>;

		vddio-supply = <&pma8084_l12>;

		vdda-supply = <&pma8084_l2>;

		qcom,mdss-fb-map = <&mdss_fb0>;

		qcom,mdss-mdp = <&mdss_mdp>;
@@ -175,40 +175,44 @@ 
			00 00 00 00 0f 00 00 01 97

			00 c0 00 00 00 00 00 01 bb];



		qcom,platform-supply-entry1 {

		qcom,ctrl-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,ctrl-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdda";

				qcom,supply-min-voltage = <1200000>;

				qcom,supply-max-voltage = <1200000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			};

		};



		qcom,panel-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

				qcom,supply-min-voltage = <3000000>;

				qcom,supply-max-voltage = <3000000>;

				qcom,supply-enable-load = <150000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

				qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry2 {



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

				qcom,supply-min-voltage = <1800000>;

				qcom,supply-max-voltage = <1800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

				qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry3 {

			qcom,supply-name = "vdda";

			qcom,supply-min-voltage = <1200000>;

			qcom,supply-max-voltage = <1200000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <0>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

		};



	};



	mdss_dsi1: qcom,mdss_dsi@fd922e00 {
@@ -219,9 +223,9 @@ 
			<0xfd923100 0x2b0>,

			<0xfd828000 0x108>;

		reg-names = "dsi_ctrl", "dsi_phy", "mmss_misc_phys";

		vdda-supply = <&pma8084_l2>;

		vdd-supply = <&pma8084_l22>;

		vddio-supply = <&pma8084_l12>;

		vdda-supply = <&pma8084_l2>;

		qcom,mdss-fb-map = <&mdss_fb0>;

		qcom,mdss-mdp = <&mdss_mdp>;
@@ -234,38 +238,43 @@ 
			00 00 00 00 0f 00 00 01 97

			00 c0 00 00 00 00 00 01 bb];



		qcom,platform-supply-entry1 {

		qcom,ctrl-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,ctrl-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdda";

				qcom,supply-min-voltage = <1200000>;

				qcom,supply-max-voltage = <1200000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			};

		};



		qcom,panel-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

				qcom,supply-min-voltage = <3000000>;

				qcom,supply-max-voltage = <3000000>;

				qcom,supply-enable-load = <150000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

				qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry2 {



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

				qcom,supply-min-voltage = <1800000>;

				qcom,supply-max-voltage = <1800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

				qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry3 {

			qcom,supply-name = "vdda";

			qcom,supply-min-voltage = <1200000>;

			qcom,supply-max-voltage = <1200000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <0>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

		};

	};

arch/arm/boot/dts/qcom/msm8226-mdss.dtsi

+36 −31
Original line number Diff line number Diff line
@@ -136,38 +136,43 @@ 
			00 00 00 00 0a 00 00 01 97

			00 00 00 00 0f 00 00 01 97

			00 c0 00 00 00 00 00 01 bb];

		qcom,platform-supply-entry1 {



		qcom,ctrl-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,ctrl-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdda";

				qcom,supply-min-voltage = <1200000>;

				qcom,supply-max-voltage = <1200000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

				qcom,supply-post-on-sleep = <20>;

			};

		};



		qcom,panel-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

				qcom,supply-min-voltage = <2800000>;

				qcom,supply-max-voltage = <2800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <0>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry2 {



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

				qcom,supply-min-voltage = <1800000>;

				qcom,supply-max-voltage = <1800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <0>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry3 {

			qcom,supply-name = "vdda";

			qcom,supply-min-voltage = <1200000>;

			qcom,supply-max-voltage = <1200000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

		};

	};

arch/arm/boot/dts/qcom/msm8610-mdss.dtsi

+36 −33
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
		cell-index = <0>;

		reg = <0xfdd00000 0x100000>;

		interrupts = <0 30 0>;

		vdd-supply = <&pm8110_l4>;

		vdda-supply = <&pm8110_l19>;

		vdda-supply = <&pm8110_l4>;

		vdd-supply = <&pm8110_l19>;

		vddio-supply = <&pm8110_l14>;

		qcom,mdss-fb-map = <&mdss_fb0>;

		qcom,mdss-mdp = <&mdss_mdp>;
@@ -48,40 +48,43 @@ 
		80 45 00 00 01 66

		40 67 00 00 01 88];



		qcom,platform-supply-entry1 {

			qcom,supply-name = "vdd";

		qcom,ctrl-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,ctrl-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdda";

				qcom,supply-min-voltage = <1200000>;

				qcom,supply-max-voltage = <1200000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

				qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

				qcom,supply-post-off-sleep = <20>;

			};

		};



		qcom,platform-supply-entry2 {

			qcom,supply-name = "vddio";

			qcom,supply-min-voltage = <1800000>;

			qcom,supply-max-voltage = <1800000>;

		qcom,panel-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

				qcom,supply-min-voltage = <2850000>;

				qcom,supply-max-voltage = <2850000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <0>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};



		qcom,platform-supply-entry3 {

			qcom,supply-name = "vdda";

			qcom,supply-min-voltage = <2850000>;

			qcom,supply-max-voltage = <2850000>;

			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

				qcom,supply-min-voltage = <1800000>;

				qcom,supply-max-voltage = <1800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <0>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};

		};

	};

};

arch/arm/boot/dts/qcom/msm8916-mdss.dtsi

+37 −32
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ 
		reg-names = "dsi_ctrl", "dsi_phy";

		qcom,mdss-fb-map = <&mdss_fb0>;

		qcom,mdss-mdp = <&mdss_mdp>;

		vdda-supply = <&pm8916_l2>;

		vdd-supply = <&pm8916_l17>;

		vddio-supply = <&pm8916_l6>;

		vdda-supply = <&pm8916_l2>;

		clocks = <&clock_gcc clk_gcc_mdss_mdp_clk>,

                         <&clock_gcc clk_gcc_mdss_ahb_clk>,

                         <&clock_gcc clk_gcc_mdss_axi_clk>,
@@ -135,38 +135,43 @@ 
			00 00 00 00 0a 00 00 01 97

			00 00 00 00 0f 00 00 01 97

			00 c0 00 00 00 00 00 01 bb];

		qcom,platform-supply-entry1 {



		qcom,ctrl-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,ctrl-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdda";

				qcom,supply-min-voltage = <1200000>;

				qcom,supply-max-voltage = <1200000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

				qcom,supply-post-on-sleep = <20>;

			};

		};



		qcom,panel-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdd";

				qcom,supply-min-voltage = <2850000>;

				qcom,supply-max-voltage = <2850000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <0>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry2 {



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vddio";

				qcom,supply-min-voltage = <1800000>;

				qcom,supply-max-voltage = <1800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <0>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

			};

		qcom,platform-supply-entry3 {

			qcom,supply-name = "vdda";

			qcom,supply-min-voltage = <1200000>;

			qcom,supply-max-voltage = <1200000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

		};

	};