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

Commit 20c38435 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14.c2"

parents 71c03e27 6035d4b3

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

+8 −0
Original line number Diff line number Diff line
@@ -173,6 +173,14 @@ Optional properties: 
					"bl_ctrl_pwm" = Backlight controlled by PWM gpio.

					"bl_ctrl_wled" = Backlight controlled by WLED.

					"bl_ctrl_dcs" = Backlight controlled by DCS commands.

					"bl_ctrl_external" = Backlight controlled by externally

					other: Unknown backlight control. (default)

- qcom,mdss-dsi-sec-bl-pmic-control-type: A string that specifies the implementation of backlight

					  control for secondary panel.

					  "bl_ctrl_pwm" = Backlight controlled by PWM gpio.

                                          "bl_ctrl_wled" = Backlight controlled by WLED.

                                          "bl_ctrl_dcs" = Backlight controlled by DCS commands.

                                          "bl_ctrl_external" = Backlight controlled by externally

                                          other: Unknown backlight control. (default)

- qcom,mdss-dsi-bl-pwm-pmi:		Boolean to indicate that PWM control is through second pmic chip.

- qcom,mdss-dsi-bl-pmic-bank-select:	LPG channel for backlight.

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

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ Required properties: 
                        "qcom,mdss_hdmi_pll_8998", "qcom,mdss_dp_pll_10nm",

                        "qcom,mdss_dsi_pll_7nm",   "qcom,mdss_dp_pll_7nm",

			"qcom,mdss_dsi_pll_28lpm", "qcom,mdss_dsi_pll_14nm",

			"qcom,mdss_dp_pll_14nm", "qcom,mdss_hdmi_pll_28lpm"

			"qcom,mdss_dp_pll_14nm", "qcom,mdss_hdmi_pll_28lpm",

			"qcom,mdss_dsi_pll_7nm_v2"

- cell-index:		Specifies the controller used

- reg:			offset and length of the register set for the device.

- reg-names :		names to refer to register sets related to this device

arch/arm64/boot/dts/qcom/dsi-panel-sw43404-amoled-dsc-fhd-plus-cmd.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
				qcom,mdss-dsi-h-right-border = <0>;

				qcom,mdss-dsi-v-top-border = <0>;

				qcom,mdss-dsi-v-bottom-border = <0>;

				qcom,mdss-dsi-panel-jitter = <0x1 0x1>;

				qcom,mdss-dsi-panel-jitter = <0x3 0x1>;

				qcom,mdss-dsi-on-command = [

				  39 01 00 00 00 00 03 b0 a5 00

				  07 01 00 00 00 00 02 01 00

arch/arm64/boot/dts/qcom/sm8150-cdp.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,panel-sec-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-sec-bl-pmic-control-type = "bl_ctrl_external";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "single_port";
@@ -240,6 +241,7 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,panel-sec-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-sec-bl-pmic-control-type = "bl_ctrl_external";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "single_port";
@@ -253,6 +255,7 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,panel-sec-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-sec-bl-pmic-control-type = "bl_ctrl_external";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "single_port";

arch/arm64/boot/dts/qcom/sm8150-sde.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ 
		qcom,mdss-default-ot-wr-limit = <32>;



		qcom,mdss-sbuf-headroom = <20>;

		qcom,mdss-rot-linewidth = <8192>;



		cache-slice-names = "rotator";

		cache-slices = <&llcc 4>;