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

Commit fa087949 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: read display id from device tree"

parents 65b0fe53 3e25e84c

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

+15 −5
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ Optional properties: 
					the default value for single DSI is set as PLL0.

- qcom,mmss-ulp-clamp-ctrl-offset:	Specifies the offset for dsi ulps clamp control register.

- qcom,mmss-phyreset-ctrl-offset:	Specifies the offset for dsi phy reset control register.

- qcom,timing-db-mode:			Boolean specifies dsi timing mode registers are supported or not.

- qcom,dsi-clk-ln-recovery:		Boolean which enables the clk lane recovery



mdss-dsi-ctrl is a dsi controller device which is treated as a subnode of the mdss-dsi device.
@@ -82,8 +81,8 @@ Required properties: 
					"mmss_misc_phys" - Register region for MMSS DSI clamps

- vdd-supply:				Phandle for vdd regulator device node.

- vddio-supply:				Phandle for vdd-io regulator device node.

- qcom,mdss-fb-map:			pHandle that specifies the framebuffer to which the

					interface is mapped.

- qcom,mdss-fb-map-prim:		pHandle that specifies the framebuffer to which the

					primary interface is mapped.

- qcom,mdss-mdp:			pHandle that specifies the mdss-mdp device.

- qcom,platform-regulator-settings:	An array of length 7 or 5 that specifies the PHY

					regulator settings. It use 5 bytes for 8996 pll.
@@ -98,6 +97,10 @@ Required properties: 


Optional properties:

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

- qcom,mdss-fb-map:			pHandle that specifies the framebuffer to which the

					interface is mapped.

- qcom,mdss-fb-map-sec:			pHandle that specifies the framebuffer to which the

					secondary interface is mapped.

- 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.
@@ -123,6 +126,12 @@ Optional properties: 
					"lane_map_2103" = <2 1 0 3>

					"lane_map_3210" = <3 2 1 0>

- qcom,pluggable			Boolean to enable hotplug feature.

- qcom,timing-db-mode:			Boolean specifies dsi timing mode registers are supported or not.

- qcom,display-id			A string indicates the display ID for the controller.

					The possible values are:

					- "primary"

					- "secondary"

					- "tertiary"



Example:

	mdss_dsi: qcom,mdss_dsi@0 {
@@ -138,7 +147,6 @@ Example: 
		      0x1a98780 0x1a98780 0x30

		      0x193e000 0x193e000 0x30>;



		qcom,timing-db-mode;

		qcom,dsi-clk-ln-recovery;



		qcom,core-supply-entries {
@@ -208,7 +216,7 @@ Example: 


			vdd-supply = <&pm8226_l15>;

			vddio-supply = <&pm8226_l8>;

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

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

			qcom,mdss-mdp = <&mdss_mdp>;



			qcom,dsi-pref-prim-pan = <&dsi_tosh_720_vid>;
@@ -226,6 +234,7 @@ Example: 
			qcom,mmss-phyreset-ctrl-offset = <0x24>;

			qcom,regulator-ldo-mode;

			qcom,null-insertion-enabled;

			qcom,timing-db-mode;



			pinctrl-names = "mdss_default", "mdss_sleep";

			pinctrl-0 = <&mdss_dsi_active>;
@@ -237,5 +246,6 @@ Example: 
			qcom,platform-mode-gpio = <&msmgpio 7 0>;

			qcom,dsi-irq-line;

			qcom,lane-map = "lane_map_3012";

			qcom,display-id = "primary";

	        };

	};

Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ Optional properties: 
  HDMI interface will remain powered on from LK to kernel with continuous

  display of bootup logo.

- qcom,pluggable: boolean to enable hotplug feature.

- qcom,display-id: A string indicates the display ID for the controller.

		   The possible values are:

		   - "primary"

		   - "secondary"

		   - "tertiary"



[Optional child nodes]: These nodes are for devices which are

dependent on HDMI Tx controller. If HDMI Tx controller is disabled then
@@ -90,6 +95,7 @@ Example: 


		qcom,conditional-power-on;

		qcom,pluggable;

		qcom,display-id = "secondary";



		qcom,msm-hdmi-audio-rx {

			compatible = "qcom,msm-hdmi-audio-codec-rx";

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

+3 −3
Original line number Diff line number Diff line
@@ -220,8 +220,9 @@ 


		qcom,mmss-ulp-clamp-ctrl-offset = <0x20>;

		qcom,mmss-phyreset-ctrl-offset = <0x24>;

		qcom,timing-db-mode;



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

		qcom,mdss-fb-map-sec = <&mdss_fb2>;

		qcom,core-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -276,10 +277,10 @@ 
			reg-names = "dsi_ctrl", "dsi_phy",

			      "dsi_phy_regulator", "mmss_misc_phys";



			qcom,timing-db-mode;

			qcom,mdss-mdp = <&mdss_mdp>;

			vdd-supply = <&pm8937_l17>;

			vddio-supply = <&pm8937_l6>;

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



			clocks = <&clock_gcc_mdss clk_gcc_mdss_byte0_clk>,

				<&clock_gcc_mdss clk_gcc_mdss_pclk0_clk>,
@@ -314,7 +315,6 @@ 
			qcom,mdss-mdp = <&mdss_mdp>;

			vdd-supply = <&pm8937_l17>;

			vddio-supply = <&pm8937_l6>;

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



			clocks = <&clock_gcc_mdss clk_gcc_mdss_byte1_clk>,

				<&clock_gcc_mdss clk_gcc_mdss_pclk1_clk>,

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

+2 −3
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 
		hw-config = "single_dsi";

		#address-cells = <1>;

		#size-cells = <1>;

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

		gdsc-supply = <&gdsc_mdss>;

		vdda-supply = <&pm8950_l2>;

		vddio-supply = <&pm8950_l6>;
@@ -136,8 +137,6 @@ 
			<&clock_gcc clk_gcc_mdss_axi_clk>;

		clock-names = "mdp_core_clk", "iface_clk", "bus_clk";



		qcom,timing-db-mode;



		qcom,core-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;
@@ -192,12 +191,12 @@ 
			reg-names = "dsi_ctrl", "dsi_phy",

			      "dsi_phy_regulator", "mmss_misc_phys";



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

			qcom,mdss-mdp = <&mdss_mdp>;

			vdd-supply = <&pm8950_l17>;

			vddio-supply = <&pm8950_l6>;

			lab-supply = <&lab_regulator>;

			ibb-supply = <&ibb_regulator>;

			qcom,timing-db-mode;



			clocks = <&clock_gcc_mdss clk_gcc_mdss_byte0_clk>,

				<&clock_gcc_mdss clk_gcc_mdss_pclk0_clk>,

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

+10 −3
Original line number Diff line number Diff line
@@ -279,6 +279,11 @@ 
			cell-index = <2>;

			compatible = "qcom,mdss-fb";

		};



		mdss_fb3: qcom,mdss_fb_secondary {

			cell-index = <3>;

			compatible = "qcom,mdss-fb";

		};

	};



	mdss_dsi: qcom,mdss_dsi@0 {
@@ -304,7 +309,9 @@ 
			<22 512 0 1000>;



		qcom,mmss-ulp-clamp-ctrl-offset = <0x14>;

		qcom,timing-db-mode;



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

		qcom,mdss-fb-map-sec = <&mdss_fb3>;



		clocks = <&clock_mmss clk_mdss_mdp_vote_clk>,

			 <&clock_mmss clk_mdss_ahb_clk>,
@@ -370,12 +377,12 @@ 
				<0x828000 0x108>;

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



			qcom,timing-db-mode;

			oled-vdda-supply = <&pm8994_l19>;

			vddio-supply = <&pm8994_l14>;

			lab-supply = <&lab_regulator>;

			ibb-supply = <&ibb_regulator>;

			qcom,mdss-mdp = <&mdss_mdp>;

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



			clocks = <&clock_mmss clk_mdss_byte0_clk>,

				 <&clock_mmss clk_mdss_pclk0_clk>,
@@ -421,12 +428,12 @@ 
				<0x828000 0x108>;

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



			qcom,timing-db-mode;

			oled-vdda-supply = <&pm8994_l19>;

			vddio-supply = <&pm8994_l14>;

			lab-supply = <&lab_regulator>;

			ibb-supply = <&ibb_regulator>;

			qcom,mdss-mdp = <&mdss_mdp>;

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



			clocks = <&clock_mmss clk_mdss_byte1_clk>,

				 <&clock_mmss clk_mdss_pclk1_clk>,