Merge "Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14" (ea8bcecf) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/dsi-panel-sim-dualmipi-cmd.dtsi

+51 −26

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2018, 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
		@@ -46,6 +46,31 @@

		qcom,mdss-dsi-display-timings {
		timing@0{
		qcom,mdss-dsi-panel-width = <540>;
		qcom,mdss-dsi-panel-height = <1920>;
		qcom,mdss-dsi-h-front-porch = <28>;
		qcom,mdss-dsi-h-back-porch = <4>;
		qcom,mdss-dsi-h-pulse-width = <4>;
		qcom,mdss-dsi-h-sync-skew = <0>;
		qcom,mdss-dsi-v-back-porch = <12>;
		qcom,mdss-dsi-v-front-porch = <12>;
		qcom,mdss-dsi-v-pulse-width = <2>;
		qcom,mdss-dsi-h-left-border = <0>;
		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-framerate = <120>;
		qcom,mdss-dsi-on-command =
		[/* exit sleep mode, wait 0ms */
		05 01 00 00 00 00 01 29];
		/* Set display on, wait 16ms */
		qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
		qcom,mdss-dsi-off-command =
		[05 01 00 00 00 00 02 28 00
		05 01 00 00 00 00 02 10 00];
		qcom,mdss-dsi-off-command-state = "dsi_hs_mode";
		};
		timing@1{
		qcom,mdss-dsi-panel-width = <1280>;
		qcom,mdss-dsi-panel-height = <1440>;
		qcom,mdss-dsi-h-front-porch = <120>;
		@@ -62,33 +87,33 @@
		qcom,mdss-dsi-h-sync-pulse = <0>;
		qcom,mdss-dsi-panel-framerate = <60>;
		qcom,mdss-dsi-on-command =
		[29 01 00 00 00 00 02 b0 03
		05 01 00 00 0a 00 01 00
		/* Soft reset, wait 10ms */
		15 01 00 00 0a 00 02 3a 77
		/* Set Pixel format (24 bpp) */
		39 01 00 00 0a 00 05 2a 00 00 04 ff
		/* Set Column address */
		39 01 00 00 0a 00 05 2b 00 00 05 9f
		/* Set page address */
		15 01 00 00 0a 00 02 35 00
		/* Set tear on */
		39 01 00 00 0a 00 03 44 00 00
		/* Set tear scan line */
		15 01 00 00 0a 00 02 51 ff
		/* write display brightness */
		15 01 00 00 0a 00 02 53 24
		/* write control brightness */
		15 01 00 00 0a 00 02 55 00
		/* CABC brightness */
		05 01 00 00 78 00 01 11
		/* exit sleep mode, wait 120ms */
		05 01 00 00 10 00 01 29];
		/* Set display on, wait 16ms */
		[/* exit sleep mode, wait 0ms */
		05 01 00 00 00 00 01 29];
		qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
		qcom,mdss-dsi-off-command =
		[05 01 00 00 00 00 02 28 00
		05 01 00 00 00 00 02 10 00];
		qcom,mdss-dsi-off-command-state = "dsi_hs_mode";
		};
		timing@2{
		qcom,mdss-dsi-panel-width = <1080>;
		qcom,mdss-dsi-panel-height = <3840>;
		qcom,mdss-dsi-h-front-porch = <30>;
		qcom,mdss-dsi-h-back-porch = <100>;
		qcom,mdss-dsi-h-pulse-width = <4>;
		qcom,mdss-dsi-h-sync-skew = <0>;
		qcom,mdss-dsi-v-back-porch = <7>;
		qcom,mdss-dsi-v-front-porch = <8>;
		qcom,mdss-dsi-v-pulse-width = <1>;
		qcom,mdss-dsi-h-sync-pulse = <0>;
		qcom,mdss-dsi-panel-framerate = <40>;
		qcom,mdss-dsi-on-command =
		[/* exit sleep mode, wait 0ms */
		05 01 00 00 00 00 01 29];
		qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
		qcom,mdss-dsi-off-command =
		[05 01 00 00 32 00 02 28 00
		05 01 00 00 78 00 02 10 00];
		[05 01 00 00 00 00 02 28 00
		05 01 00 00 00 00 02 10 00];
		qcom,mdss-dsi-off-command-state = "dsi_hs_mode";
		};
		};

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,30 @@
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_sim_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_sim_vid {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_dual_sim_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_dual_sim_vid {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_dual_nt35597_truly_video {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,30 @@
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_sim_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_sim_vid {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_dual_sim_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_dual_sim_vid {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,platform-reset-gpio = <&tlmm 6 0>;
		};

		&dsi_dual_nt35597_truly_video {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

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

+20 −20

Original line number	Diff line number	Diff line
		@@ -508,12 +508,12 @@
		};

		&dsi_sim_vid {
		qcom,mdss-dsi-t-clk-post = <0x0d>;
		qcom,mdss-dsi-t-clk-pre = <0x2d>;
		qcom,mdss-dsi-t-clk-post = <0x15>;
		qcom,mdss-dsi-t-clk-pre = <0x12>;
		qcom,mdss-dsi-display-timings {
		timing@0{
		qcom,mdss-dsi-panel-phy-timings = [01 03 01 00 01 01 01
		01 00 03 04 00 03 04];
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 03 04 00 18 17];
		qcom,display-topology = <1 0 1>,
		<2 0 1>;
		qcom,default-topology-index = <0>;
		@@ -522,12 +522,12 @@
		};

		&dsi_dual_sim_vid {
		qcom,mdss-dsi-t-clk-post = <0x0d>;
		qcom,mdss-dsi-t-clk-pre = <0x2d>;
		qcom,mdss-dsi-t-clk-post = <0x15>;
		qcom,mdss-dsi-t-clk-pre = <0x12>;
		qcom,mdss-dsi-display-timings {
		timing@0{
		qcom,mdss-dsi-panel-phy-timings = [00 13 03 03 05 06 03
		03 02 03 04 00 10 06];
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 03 04 00 18 17];
		qcom,display-topology = <2 0 2>,
		<1 0 2>;
		qcom,default-topology-index = <0>;
		@@ -536,12 +536,12 @@
		};

		&dsi_sim_cmd {
		qcom,mdss-dsi-t-clk-post = <0x0d>;
		qcom,mdss-dsi-t-clk-pre = <0x2d>;
		qcom,mdss-dsi-t-clk-post = <0x15>;
		qcom,mdss-dsi-t-clk-pre = <0x12>;
		qcom,mdss-dsi-display-timings {
		timing@0{
		qcom,mdss-dsi-panel-phy-timings = [00 03 01 00 01 01 02
		01 00 03 04 00 03 04];
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 03 04 00 18 17];
		qcom,display-topology = <1 0 1>,
		<2 0 1>;
		qcom,default-topology-index = <0>;
		@@ -550,25 +550,25 @@
		};

		&dsi_dual_sim_cmd {
		qcom,mdss-dsi-t-clk-post = <0x0d>;
		qcom,mdss-dsi-t-clk-pre = <0x2d>;
		qcom,mdss-dsi-t-clk-post = <0x15>;
		qcom,mdss-dsi-t-clk-pre = <0x12>;
		qcom,mdss-dsi-display-timings {
		timing@0{
		qcom,mdss-dsi-panel-phy-timings = [00 13 03 03 05 06 03
		03 02 03 04 00 10 06];
		qcom,mdss-dsi-panel-phy-timings = [00 24 09 09 26 24 09
		09 06 03 04 00];
		qcom,display-topology = <2 0 2>;
		qcom,default-topology-index = <0>;
		};
		timing@1{
		qcom,mdss-dsi-panel-phy-timings = [00 13 03 03 05 06 03
		03 02 03 04 00 10 06];
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 03 04 00 18 17];
		qcom,display-topology = <2 0 2>,
		<1 0 2>;
		qcom,default-topology-index = <0>;
		};
		timing@2{
		qcom,mdss-dsi-panel-phy-timings = [00 13 03 03 05 06 03
		03 02 03 04 00 10 06];
		qcom,mdss-dsi-panel-phy-timings = [00 1e 08 07 24 22 08
		08 05 03 04 00 19 18];
		qcom,display-topology = <2 0 2>;
		qcom,default-topology-index = <0>;
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@

		qcom,sde-intf-off = <0x6b000 0x6b800
		0x6c000 0x6c800>;
		qcom,sde-intf-size = <0x280>;
		qcom,sde-intf-size = <0x2b8>;
		qcom,sde-intf-type = "dp", "dsi", "dsi", "dp";

		qcom,sde-pp-off = <0x71000 0x71800