From f427c0f8334b6770c8a70054cc656808fc970e86 Mon Sep 17 00:00:00 2001 From: wangyq13 Date: Mon, 28 Feb 2022 15:10:05 +0800 Subject: [PATCH] arm/dt: rhodec: enable exponential backlight - enable exponential backlight - format panel dtsi - delete unused panel configs Change-Id: Ic890e4ff5bd76897dcbc7a8a3c22bce6337321d3 Signed-off-by: wangyq13 Reviewed-on: https://gerrit.mot.com/2203088 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- ...t-tianma-nt36672c-645-1080x2400-video.dtsi | 11 +- ...-mot-txd-ili7807s-645-1080x2400-video.dtsi | 24 ++-- qcom/rhodec-display.dtsi | 104 ++++-------------- 3 files changed, 38 insertions(+), 101 deletions(-) diff --git a/qcom/dsi-panel-mot-tianma-nt36672c-645-1080x2400-video.dtsi b/qcom/dsi-panel-mot-tianma-nt36672c-645-1080x2400-video.dtsi index a63c293e66cc..30e13c971b2f 100644 --- a/qcom/dsi-panel-mot-tianma-nt36672c-645-1080x2400-video.dtsi +++ b/qcom/dsi-panel-mot-tianma-nt36672c-645-1080x2400-video.dtsi @@ -19,15 +19,12 @@ qcom,mdss-dsi-dma-trigger = "trigger_sw"; qcom,mdss-dsi-mdp-trigger = "none"; qcom,mdss-dsi-lp11-init; - //qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_i2c"; qcom,mdss-dsi-reset-sequence = <1 10>, <0 10>, <1 10>; qcom,mdss-dsi-tx-eot-append; qcom,adjust-timer-wakeup-ms = <1>; - //qcom,mdss-dsi-panel-hdr-enabled; - //qcom,mdss-dsi-panel-hdr-color-primaries = <15000 16000 33750 - // 15800 13250 34450 7500 3000>; - //qcom,mdss-dsi-panel-peak-brightness = <6450000>; - //qcom,mdss-dsi-panel-blackness-level = <4961>; + + qcom,mdss-pan-physical-width-dimension = <68>; + qcom,mdss-pan-physical-height-dimension = <150>; qcom,mdss-dsi-cabc-mv-command = [15 01 00 00 00 00 02 55 03]; qcom,mdss-dsi-cabc-mv-command-state = "dsi_hs_mode"; @@ -48,8 +45,6 @@ qcom,mdss-dsi-v-front-porch = <54>; qcom,mdss-dsi-v-pulse-width = <4>; qcom,mdss-dsi-panel-framerate = <120>; - qcom,mdss-pan-physical-width-dimension = <68>; - qcom,mdss-pan-physical-height-dimension = <150>; qcom,mdss-dsi-on-command = [ 15 00 00 00 00 00 02 FF 10 15 00 00 00 00 00 02 FB 01 diff --git a/qcom/dsi-panel-mot-txd-ili7807s-645-1080x2400-video.dtsi b/qcom/dsi-panel-mot-txd-ili7807s-645-1080x2400-video.dtsi index 2b22729d1b28..757cf5213f08 100644 --- a/qcom/dsi-panel-mot-txd-ili7807s-645-1080x2400-video.dtsi +++ b/qcom/dsi-panel-mot-txd-ili7807s-645-1080x2400-video.dtsi @@ -26,8 +26,8 @@ qcom,mdss-dsi-mdp-trigger = "none"; qcom,mdss-dsi-lp11-init; qcom,mdss-dsi-reset-sequence = <1 4>, <0 1>, <1 12>; - qcom,mdss-pan-physical-width-dimension = <69>; - qcom,mdss-pan-physical-height-dimension = <158>; + qcom,mdss-pan-physical-width-dimension = <68>; + qcom,mdss-pan-physical-height-dimension = <150>; qcom,mdss-dsi-cabc-mv-command = [15 01 00 00 00 00 02 55 03]; qcom,mdss-dsi-cabc-mv-command-state = "dsi_hs_mode"; @@ -57,16 +57,16 @@ qcom,mdss-dsi-on-command = [ - 39 01 00 00 00 00 04 FF 78 07 06 - 39 01 00 00 00 00 02 3E E2 - 39 01 00 00 00 00 02 80 00 - 39 01 00 00 00 00 04 FF 78 07 00 - 39 01 00 00 00 00 03 51 03 FF - 39 01 00 00 00 00 02 53 2C - 39 01 00 00 00 00 02 55 03 - 39 01 00 00 78 00 02 11 00 - 39 01 00 00 14 00 02 29 00 - 39 01 00 00 00 00 02 35 00 + 39 00 00 00 00 00 04 FF 78 07 06 + 15 00 00 00 00 00 02 3E E2 + 15 00 00 00 00 00 02 80 00 + 39 00 00 00 00 00 04 FF 78 07 00 + 39 00 00 00 00 00 03 51 06 66 + 15 00 00 00 00 00 02 53 2C + 15 00 00 00 00 00 02 55 01 + 15 00 00 00 00 00 02 35 00 + 05 01 00 00 78 00 01 11 + 05 01 00 00 14 00 01 29 ]; qcom,mdss-dsi-off-command = [ 05 01 00 00 32 00 01 28 diff --git a/qcom/rhodec-display.dtsi b/qcom/rhodec-display.dtsi index 292b5b2ecf13..fa35849ceb30 100644 --- a/qcom/rhodec-display.dtsi +++ b/qcom/rhodec-display.dtsi @@ -1,6 +1,4 @@ #include "dsi-panel-mot-dummy-qhd-video.dtsi" -#include "dsi-panel-mot-tianma-ili7807s-678-1080x2460-video.dtsi" -#include "dsi-panel-mot-csot-ili7807s-678-1080x2460-video.dtsi" #include "dsi-panel-mot-tianma-nt36672c-645-1080x2400-video.dtsi" #include "dsi-panel-mot-txd-ili7807s-645-1080x2400-video.dtsi" @@ -182,6 +180,7 @@ qcom,mdss-dsi-bl-default-level = <1024>; qcom,mdss-brightness-max-level = <2047>; qcom,mdss-dsi-no-panel-on-read-support; + qcom,mdss-dsi-panel-supplier = "tm"; qcom,esd-check-enabled; qcom,mdss-dsi-panel-status-check-mode = "reg_read"; @@ -236,7 +235,7 @@ qcom,mdss-dsi-panel-on-check-value = <0x9c>; qcom,mdss-dsi-panel-status-read-length = <1>; qcom,mdss-dsi-no-panel-on-read-support; - qcom,mdss-dsi-panel-supplier = "tm"; + qcom,mdss-dsi-panel-supplier = "txd"; qcom,mdss-dsi-hbm-on-command = [15 01 00 00 00 00 02 51 FF]; qcom,mdss-dsi-hbm-on-command-state = "dsi_lp_mode"; @@ -253,16 +252,11 @@ qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp"; qcom,dsi-supported-dfps-list = <60 90 120>; - //qcom,mdss-dsi-panel-hdr-enabled; - //qcom,mdss-dsi-panel-hdr-color-primaries = <15115 15895 32830 - // 16770 15010 32385 7770 1830>; - //qcom,mdss-dsi-panel-peak-brightness = <4500000>; - //qcom,mdss-dsi-panel-blackness-level = <3000>; qcom,mdss-dsi-hbm-type = "lcd-dcs-gpio"; qcom,platform-hbm-en-gpio = <&tlmm 50 0>; - qcom,mdss-dsi-hbm-on-command = [39 01 00 00 00 00 03 51 03 33]; - qcom,mdss-dsi-hbm-off-command = [39 01 00 00 00 00 03 51 03 33]; + qcom,mdss-dsi-hbm-on-command = [39 01 00 00 00 00 03 51 07 FF]; + qcom,mdss-dsi-hbm-off-command = [39 01 00 00 00 00 03 51 06 66]; qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; qcom,mdss-dsi-t-clk-post = <0x0C>; @@ -277,57 +271,6 @@ }; }; -&dsi_csot_ili7807s_678_fhd_video { - qcom,platform-te-gpio = <&tlmm 23 0>; - qcom,platform-reset-gpio = <&pmr735a_gpios 2 0>; - - qcom,panel-supply-entries = <&dsi_panel_pwr_supply_rhodec>; - - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,bklt-dcs-2bytes-enabled; - - qcom,mdss-dsi-bl-min-level = <8>; - qcom,mdss-dsi-bl-max-level = <1023>; - qcom,mdss-dsi-bl-default-level = <512>; - qcom,mdss-brightness-max-level = <1023>; - - qcom,esd-check-enabled; - qcom,mdss-dsi-panel-status-check-mode = "reg_read"; - qcom,mdss-dsi-panel-status-command = [06 01 00 01 00 00 01 0a]; - qcom,mdss-dsi-panel-status-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-panel-status-value = <0x9c>; - qcom,mdss-dsi-panel-on-check-value = <0x9c>; - qcom,mdss-dsi-panel-status-read-length = <1>; - qcom,mdss-dsi-no-panel-on-read-support; - qcom,mdss-dsi-panel-supplier = "tm"; - - qcom,suspend-ulps-enabled; - - qcom,tp_state_check_enable; - qcom,platform-need-execute-shutdown; - - qcom,mdss-dsi-pan-enable-dynamic-fps; - qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp"; - qcom,dsi-supported-dfps-list = <60 90 120>; - - qcom,mdss-dsi-hbm-type = "lcd-dcs-gpio"; - qcom,platform-hbm-en-gpio = <&tlmm 50 0>; - qcom,mdss-dsi-hbm-on-command = [39 01 00 00 00 00 03 51 03 33]; - qcom,mdss-dsi-hbm-off-command = [39 01 00 00 00 00 03 51 03 33]; - - qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; - qcom,mdss-dsi-t-clk-post = <0x0C>; - qcom,mdss-dsi-t-clk-pre = <0x30>; - qcom,mdss-dsi-display-timings { - timing@0 { - qcom,mdss-dsi-panel-phy-timings = [00 1B 06 06 22 20 07 - 07 07 02 04 00]; - qcom,display-topology = <1 1 1>; - qcom,default-topology-index = <0>; - }; - }; -}; - &mot_dummy_vid_qhd { qcom,platform-te-gpio = <&tlmm 23 0>; qcom,platform-reset-gpio = <&pmr735a_gpios 2 0>; @@ -348,6 +291,7 @@ }; }; }; + &qupv3_se10_i2c { status = "ok"; @@ -355,32 +299,30 @@ compatible = "awinic,aw99703-bl","sm-sm5350"; reg = <0x36>; hwen-gpio = <&tlmm 60 1>; - /* brightness map level 1:256,2:1024,3:2048 */ - aw99703,bl-map = <3>; - aw99703,using-lsb; - aw99703,ovp-level = <2>; /* 31V */ - aw99703,ocp-level = <1>; /* 1.8A */ - aw99703,switch-freq = <1>; /* 1000kHz(default) */ - aw99703,auto-freq-high = <0x10>; - aw99703,auto-freq-low = <0x05>; - aw99703,bl-fscal-led = <0x19>; /* 24.8mA */ - aw99703,bl-channel = <3>; - aw99703,turn-on-ramp = <0x04>; - aw99703,turn-off-ramp = <0x04>; - aw99703,pwm-trans-dim = <0>; /* 2ms */ - aw99703,i2c-trans-dim = <0x00>; - aw99703,pwm-mode = <1>; /* 0 pwm disble,1 PWM enable */ - aw99703,map-type = <4>; /* linear */ - aw99703,work-mode = <1>; /* backlight */ - aw99703,flash-timeout-time = <0x05>; /* 500ms(default) */ - aw99703,flash-current = <0x08>; /* 59.2mA(default) */ - aw99703,efuse-config = <0x1C 0x61 0x61 0x4C 0x2C 0xC0 0x08 0x00 0x01 0x80 0x00 0x00 0x00>; + aw99703,bl-map = <3>; /* brightness map level 1:256,2:1024,3:2048 */ + aw99703,using-lsb; + aw99703,ovp-level = <2>; /* 0:17.5V, 1:24V, 2:31V, 3:38V, 4:41.5V */ + aw99703,ocp-level = <1>; /* 0:0.9A, 1:1.8A, 2:2.7A, 3:3.4A */ + aw99703,switch-freq = <1>; /* 1000kHz(default) */ + aw99703,auto-freq-high = <0x10>; + aw99703,auto-freq-low = <0x05>; + aw99703,bl-fscal-led = <0x19>; /* 24.8mA */ + aw99703,bl-channel = <3>; + aw99703,turn-on-ramp = <0x00>; /* 512us */ + aw99703,turn-off-ramp = <0x04>; /* 8ms */ + aw99703,pwm-trans-dim = <0>; /* 2ms */ + aw99703,i2c-trans-dim = <1>; /* 128ms */ + aw99703,pwm-mode = <1>; /* 1 pwm enable,0 PWM disable */ + aw99703,map-type = <0>; /* 0 exponential, 4 linear */ + aw99703,work-mode = <1>; /* backlight */ + aw99703,default-brightness = <1810>; status = "okay"; pwm-cfg = <0x0C>; boost-ctl = <0x03>; ctl-bank-en = <0x02>; full-scale-current = <0x0A>; + map-mode = <0>; /* 0 exponential, 1 linear */ }; ocp2138@3e {