Merge "ARM: dts: msm: Change Truly FHD ctrl and phy index" (ce9c96e5) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm64/boot/dts/qcom/dsi-panel-nt35695b-truly-fhd-cmd.dtsi

+4 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
		*/

		&mdss_mdp {
		@@ -9,9 +9,9 @@
		"nt35695b truly fhd command mode dsi panel";
		qcom,mdss-dsi-panel-type = "dsi_cmd_mode";

		qcom,dsi-ctrl-num = <1>;
		qcom,dsi-phy-num = <1>;
		qcom,dsi-select-clocks = "src_byte_clk1", "src_pixel_clk1";
		qcom,dsi-ctrl-num = <0>;
		qcom,dsi-phy-num = <0>;
		qcom,dsi-select-clocks = "src_byte_clk0", "src_pixel_clk0";

		qcom,mdss-dsi-virtual-channel-id = <0>;
		qcom,mdss-dsi-stream = <0>;

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

+53 −0

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

		&dsi_sw43404_amoled_fhd_plus_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <1023>;
		qcom,mdss-brightness-max-level = <255>;
		qcom,platform-te-gpio = <&tlmm 66 0>;
		qcom,platform-reset-gpio = <&tlmm 75 0>;
		};

		&dsi_sharp_4k_dsc_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply_avdd>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external";
		@@ -191,6 +201,49 @@
		qcom,platform-en-gpio = <&tlmm 60 0>;
		};

		&dsi_sharp_1080_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply_avdd>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,platform-te-gpio = <&tlmm 66 0>;
		qcom,platform-reset-gpio = <&tlmm 75 0>;
		};

		&dsi_dual_nt35597_truly_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply_avdd>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,platform-te-gpio = <&tlmm 66 0>;
		qcom,platform-reset-gpio = <&tlmm 75 0>;
		};

		&dsi_dual_nt35597_truly_video {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply_avdd>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,platform-reset-gpio = <&tlmm 75 0>;
		};

		&dsi_nt35695b_truly_fhd_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply_avdd>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,platform-te-gpio = <&tlmm 66 0>;
		qcom,platform-reset-gpio = <&tlmm 75 0>;
		};

		&dsi_nt35695b_truly_fhd_video {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply_avdd>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,platform-reset-gpio = <&tlmm 75 0>;
		};

		&sde_dsi {
		qcom,dsi-default-panel = <&dsi_sw43404_amoled_cmd>;
		};

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

+10 −0

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

		&dsi_sw43404_amoled_fhd_plus_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <1023>;
		qcom,mdss-brightness-max-level = <255>;
		qcom,platform-te-gpio = <&tlmm 66 0>;
		qcom,platform-reset-gpio = <&tlmm 75 0>;
		};

		&sde_dsi {
		qcom,dsi-default-panel = <&dsi_sw43404_amoled_cmd>;
		};

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

+74 −0

Original line number	Diff line number	Diff line
		@@ -5,8 +5,14 @@

		#include "dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi"
		#include "dsi-panel-sw43404-amoled-dsc-wqhd-video.dtsi"
		#include "dsi-panel-sw43404-amoled-dsc-fhd-plus-cmd.dtsi"
		#include "dsi-panel-sharp-dsc-4k-cmd.dtsi"
		#include "dsi-panel-sharp-dsc-4k-video.dtsi"
		#include "dsi-panel-sharp-1080p-cmd.dtsi"
		#include "dsi-panel-nt35597-truly-dualmipi-wqxga-cmd.dtsi"
		#include "dsi-panel-nt35597-truly-dualmipi-wqxga-video.dtsi"
		#include "dsi-panel-nt35695b-truly-fhd-cmd.dtsi"
		#include "dsi-panel-nt35695b-truly-fhd-video.dtsi"
		#include <dt-bindings/clock/mdss-7nm-pll-clk.h>

		&tlmm {
		@@ -148,6 +154,7 @@
		connectors = <&sde_wb &sde_dsi>;
		};

		/* PHY TIMINGS REVISION W */
		&dsi_sw43404_amoled_cmd {
		qcom,mdss-dsi-display-timings {
		timing@0 {
		@@ -170,6 +177,17 @@
		};
		};

		&dsi_sw43404_amoled_fhd_plus_cmd {
		qcom,mdss-dsi-display-timings {
		timing@0 {
		qcom,mdss-dsi-panel-phy-timings = [00 12 04 04 1e 1e 04
		05 02 03 04 00 11 14];
		qcom,display-topology = <2 2 1>;
		qcom,default-topology-index = <0>;
		};
		};
		};

		&dsi_sharp_4k_dsc_cmd {
		qcom,mdss-dsi-display-timings {
		timing@0 {
		@@ -191,3 +209,59 @@
		};
		};
		};

		&dsi_sharp_1080_cmd {
		qcom,mdss-dsi-display-timings {
		timing@0 {
		qcom,mdss-dsi-panel-phy-timings = [00 1E 08 08 24 22 08
		08 05 02 04 00 19 18];
		qcom,display-topology = <1 0 1>;
		qcom,default-topology-index = <0>;
		qcom,mdss-dsi-panel-clockrate = <900000000>;
		};
		};
		};

		&dsi_dual_nt35597_truly_cmd {
		qcom,mdss-dsi-display-timings {
		timing@0 {
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 02 04 00 18 17];
		qcom,display-topology = <2 2 2>;
		qcom,default-topology-index = <0>;
		};
		};
		};

		&dsi_dual_nt35597_truly_video {
		qcom,mdss-dsi-display-timings {
		timing@0 {
		qcom,mdss-dsi-panel-phy-timings = [00 1c 08 07 23 22 07
		07 05 02 04 00 18 17];
		qcom,display-topology = <2 2 2>;
		qcom,default-topology-index = <0>;
		};
		};
		};

		&dsi_nt35695b_truly_fhd_cmd {
		qcom,mdss-dsi-display-timings {
		timing@0 {
		qcom,mdss-dsi-panel-phy-timings = [00 1e 08 07 24 22
		08 08 05 02 04 00 19 17];
		qcom,display-topology = <1 0 1>;
		qcom,default-topology-index = <0>;
		};
		};
		};

		&dsi_nt35695b_truly_fhd_video {
		qcom,mdss-dsi-display-timings {
		timing@0 {
		qcom,mdss-dsi-panel-phy-timings = [00 1e 08 07 24 22
		08 08 05 02 04 00 19 17];
		qcom,display-topology = <1 0 1>;
		qcom,default-topology-index = <0>;
		};
		};
		};