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

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

Merge "Merge remote-tracking branch 'origin/dev/msm-3.18-drm_kms' into msm-3.18"

parents f69dc5db 05accafd

Documentation/devicetree/bindings/fb/adv7533.txt

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ Optional properties: 
- qcom,max-voltage-level		Maximum voltage level to be supplied to bridge chip

- qcom,enable-load			Load current to bridge chip when enabled

- qcom,disable-load			Load current to bridge chip when disabled

- qcom,post-on-sleep			Sleep time (ms) to indicate the sleep

					time after the vreg is enabled



Example:

&soc {
@@ -46,6 +48,7 @@ Example: 
			qcom,max-voltage-level = <0>;

			qcom,enable-load = <0>;

			qcom,disable-load = <0>;

			qcom,post-on-sleep = <10>;

		};

	};

};

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+74 −17
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ 
};



&mdss_hdmi_tx {

	qcom,display-id = "secondary";

	pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active", "hdmi_cec_active",

				"hdmi_active", "hdmi_sleep";

	pinctrl-0 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_suspend
@@ -312,6 +313,7 @@ 
						&mdss_hdmi_cec_active>;

	pinctrl-4 = <&mdss_hdmi_hpd_suspend &mdss_hdmi_ddc_suspend

						&mdss_hdmi_cec_suspend>;

	/delete-property/ qcom,pluggable;

};



#include "msm8996-sde-display.dtsi"
@@ -434,29 +436,73 @@ 
};



&mdss_dsi {

	hw-config = "split_dsi";

	hw-config = "dual_dsi";

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_dual_nt35597_video>;

	qcom,dsi-pref-prim-pan = <&dsi_adv7533_1080p>;

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

	qcom,platform-enable-gpio = <&tlmm 70 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 8 0>;

	qcom,platform-bklight-en-gpio = <&pm8994_gpios 10 0>;

	qcom,display-id = "primary";

	qcom,bridge-index = <0>;

	vddio-supply = <&pm8994_l17>;



	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 = <3300000>;

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

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

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

		};



		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>;

		};

	};

};



&mdss_dsi1 {

	qcom,dsi-pref-prim-pan = <&dsi_dual_nt35597_video>;

	qcom,dsi-pref-prim-pan = <&dsi_adv7533_1080p>;

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

	qcom,platform-enable-gpio = <&tlmm 70 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 8 0>;

	qcom,platform-bklight-en-gpio = <&pm8994_gpios 10 0>;

	qcom,display-id = "tertiary";

	qcom,bridge-index = <1>;

	vddio-supply = <&pm8994_l17>;



	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 = <3300000>;

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

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

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

		};



		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>;

		};

	};

};



&dsi_dual_sharp_video {
@@ -613,9 +659,15 @@ 
			pinctrl-1 = <&adv7533_0_int_suspend

				&adv7533_0_hpd_int_suspend

				&adv7533_0_switch_suspend>;

			adi,irq-gpio = <&tlmm 106 0x2002>;

			adi,hpd-irq-gpio = <&tlmm 106 0x2003>;

			adi,switch-gpio = <&tlmm 105 0x1>;

			adi,irq-gpio = <&tlmm 71 0x2002>;

			adi,switch-gpio = <&tlmm 72 0x1>;

			vddio-supply = <&pm8994_l17>;

			qcom,supply-names = "vddio";

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

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

			qcom,enable-load = <100000>;

			qcom,disable-load = <100>;

			qcom,post-on-sleep = <60>;

		};



		adv7533@39 {
@@ -634,9 +686,14 @@ 
			pinctrl-1 = <&adv7533_1_int_suspend

				&adv7533_1_hpd_int_suspend

				&adv7533_1_switch_suspend>;

			adi,irq-gpio = <&tlmm 108 0x2002>;

			adi,hpd-irq-gpio = <&tlmm 106 0x2003>;

			adi,switch-gpio = <&tlmm 107 0x0>;

			adi,irq-gpio = <&tlmm 73 0x2002>;

			adi,switch-gpio = <&tlmm 74 0x0>;

			vddio-supply = <&pm8994_l17>;

			qcom,supply-names = "vddio";

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

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

			qcom,enable-load = <100000>;

			qcom,disable-load = <100>;

		};

	};

drivers/video/msm/msm_dba/adv7533.c

+14 −2
Original line number Diff line number Diff line
@@ -508,13 +508,25 @@ static void adv7533_parse_vreg_dt(struct device *dev, 
		}

		mp->vreg_config[i].disable_load = val_array[i];



		pr_debug("%s: %s min=%d, max=%d, enable=%d disable=%d\n",

		/* post-on-sleep */

		memset(val_array, 0, sizeof(u32) * dt_vreg_total);

		rc = of_property_read_u32_array(of_node,

				"qcom,post-on-sleep", val_array,

						dt_vreg_total);

		if (rc)

			pr_warn("%s: error read post on sleep. rc=%d\n",

					__func__, rc);

		else

			mp->vreg_config[i].post_on_sleep = val_array[i];



		pr_info("%s: %s min=%d, max=%d, enable=%d disable=%d post-on-sleep=%d\n",

			__func__,

			mp->vreg_config[i].vreg_name,

			mp->vreg_config[i].min_voltage,

			mp->vreg_config[i].max_voltage,

			mp->vreg_config[i].enable_load,

			mp->vreg_config[i].disable_load);

			mp->vreg_config[i].disable_load,

			mp->vreg_config[i].post_on_sleep);

	}



	devm_kfree(dev, val_array);