Merge "ARM: dts: msm: Enable RM67162 edo cmd panel on Spyro" (0bdce9c4) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/dsi-panel-edo-rm67162-qvga-cmd.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@
		29 01 00 00 00 00 02 05 00
		29 01 00 00 00 00 02 FE 00
		29 01 00 00 00 00 02 35 00
		29 01 00 00 00 00 02 51 00
		29 01 00 00 00 00 02 51 80
		29 01 00 00 00 00 02 53 20
		29 01 00 00 78 00 02 11 00
		29 01 00 00 05 00 02 29 00];
		@@ -67,7 +67,7 @@
		qcom,mdss-dsi-te-using-te-pin;
		qcom,mdss-dsi-panel-timings = [7d 25 1d 00 37 33 22 27
		1e 03 04 00];
		qcom,mdss-dsi-t-clk-post = <0x20>;
		qcom,mdss-dsi-t-clk-post = <0x09>;
		qcom,mdss-dsi-t-clk-pre = <0x2c>;
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <255>;

arch/arm64/boot/dts/qcom/msm8937-mdss-panels.dtsi

+25 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2019, 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
		@@ -26,6 +26,7 @@
		#include "dsi-panel-nt35695b-truly-fhd-video.dtsi"
		#include "dsi-panel-nt35695b-truly-fhd-cmd.dtsi"
		#include "dsi-panel-icn9706-720-1440p-video.dtsi"
		#include "dsi-panel-edo-rm67162-qvga-cmd.dtsi"

		&soc {
		dsi_panel_pwr_supply: dsi_panel_pwr_supply {
		@@ -69,4 +70,27 @@
		qcom,supply-post-on-sleep = <10>;
		};
		};

		dsi_pm660_panel_pwr_supply: dsi_pm660_panel_pwr_supply {
		#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,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>;
		};
		};
		};

arch/arm64/boot/dts/qcom/sdm429-qrd-spyro-evt.dtsi

+14 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,20 @@
		};
		};
		&mdss_dsi0 {
		qcom,dsi-pref-prim-pan = <&dsi_hx8399c_hd_vid>;
		qcom,dsi-pref-prim-pan = <&dsi_edo_rm67162_qvga_cmd>;
		pinctrl-names = "mdss_default", "mdss_sleep";
		pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
		pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
		qcom,platform-te-gpio = <&tlmm 24 0>;
		qcom,platform-reset-gpio = <&tlmm 60 0>;
		qcom,platform-enable-gpio = <&tlmm 69 0>;
		};

		&dsi_edo_rm67162_qvga_cmd {
		/delete-property/ qcom,mdss-dsi-panel-timings;
		qcom,mdss-dsi-panel-timings-phy-12nm = [06 05 01 01 00 03 01 03];
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,panel-supply-entries = <&dsi_pm660_panel_pwr_supply>;
		};
		&soc {
		/delete-node/ qcom,cci@1b0c000;

arch/arm64/boot/dts/qcom/sdm429w-pm660.dtsi

+52 −26

Original line number	Diff line number	Diff line
		@@ -310,32 +310,6 @@
		};
		};

		&mdss_dsi {
		/delete-property/ vdda-supply;
		/delete-property/ vddio-supply;
		};

		&mdss_dsi0 {
		/delete-property/ vdd-supply;
		/delete-property/ vddio-supply;
		/delete-property/ bklight_en-supply;
		/delete-property/ lab-supply;
		/delete-property/ ibb-supply;
		};

		&mdss_dsi1 {
		/delete-property/ vdd-supply;
		/delete-property/ vddio-supply;
		};

		&mdss_dsi0_pll {
		/delete-property/ vddio-supply;
		};

		&mdss_dsi1_pll {
		/delete-property/ vddio-supply;
		};

		&i2c_2 {
		/delete-node/ qcom,smb1355@8;
		/delete-node/ qcom,smb1355@c;
		@@ -737,3 +711,55 @@
		qcom,vdd-io-current-level = <0 10000>;
		qcom,dll-hsr-list = <0x00076400 0x0 0x0 0x0 0x00040868>;
		};

		&mdss_dsi {
		/delete-property/ vdda-supply;
		/delete-property/ vddio-supply;
		/delete-property/ bklight_en-supply;
		/delete-property/ lab-supply;
		/delete-property/ ibb-supply;
		vdda-supply = <&L6A>; /* 0.8v */
		vddio-supply = <&L13A>; /* 1.8v */

		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 = <800000>;
		qcom,supply-max-voltage = <800000>;
		qcom,supply-enable-load = <100000>;
		qcom,supply-disable-load = <100>;
		qcom,supply-post-on-sleep = <20>;
		};
		};
		};

		&mdss_dsi0 {
		/delete-property/ vdd-supply;
		/delete-property/ vddio-supply;
		/delete-property/ bklight_en-supply;
		/delete-property/ lab-supply;
		/delete-property/ ibb-supply;
		vdd-supply = <&L15A>;/* 2.8v */
		vddio-supply = <&L13A>; /* 1.8v */
		};

		&mdss_dsi1 {
		status = "disabled";
		/delete-property/ vdd-supply;
		/delete-property/ vddio-supply;
		};

		&mdss_dsi0_pll {
		/delete-property/ vddio-supply;
		vddio-supply = <&L13A>;/* 1.8v */
		};

		&mdss_dsi1_pll {
		/delete-property/ vddio-supply;
		vddio-supply = <&L13A>;
		};

drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -709,7 +709,6 @@ int mdss_mdp_get_split_display_ctls(struct mdss_mdp_ctl **ctl,
		swap(ctl, sctl);
		}
		} else {
		rc = -EINVAL;
		pr_debug("%s no split mode:%d\n", __func__,
		(*ctl)->mfd->split_mode);
		}