diff --git a/display/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi b/display/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi index 1c08e1931f81..a46f4e80548b 100644 --- a/display/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi +++ b/display/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi @@ -124,188 +124,6 @@ qcom,mdss-dsc-bit-per-pixel = <8>; qcom,mdss-dsc-block-prediction-enable; }; - - timing@1 { - qcom,mdss-dsi-panel-framerate = <50>; - qcom,mdss-dsi-panel-width = <1440>; - qcom,mdss-dsi-panel-height = <2880>; - qcom,mdss-dsi-h-front-porch = <60>; - qcom,mdss-dsi-h-back-porch = <30>; - qcom,mdss-dsi-h-pulse-width = <12>; - qcom,mdss-dsi-h-sync-skew = <0>; - qcom,mdss-dsi-v-back-porch = <10>; - qcom,mdss-dsi-v-front-porch = <8>; - qcom,mdss-dsi-v-pulse-width = <1>; - 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-jitter = <0x4 0x1>; - - qcom,mdss-dsi-timing-switch-command = [ - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 0c b1 a0 9f 4f 4f 63 0e 0a 10 0e 0a 10 - 39 01 00 00 00 00 07 e4 30 06 00 40 34 03 - ]; - - qcom,mdss-dsi-on-command = [ - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 03 5c 42 00 - 07 01 00 00 00 00 02 01 00 - 0a 01 00 00 00 00 80 11 00 00 89 30 80 - 0B 40 05 A0 05 A0 02 D0 02 D0 02 00 - 02 68 00 20 9A DB 00 0A 00 0C 00 12 - 00 0E 18 00 10 F0 03 0C 20 00 06 0B - 0B 33 0E 1C 2A 38 46 54 62 69 70 77 - 79 7B 7D 7E 01 02 01 00 09 40 09 BE - 19 FC 19 FA 19 F8 1A 38 1A 78 1A B6 - 2A F6 2B 34 2B 74 3B 74 6B F4 00 00 - 00 00 00 00 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 00 - 00 00 - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 09 F8 00 08 10 08 2D - 00 00 2D - 15 01 00 00 00 00 02 55 00 - 05 01 00 00 1e 00 02 11 00 - 39 01 00 00 00 00 03 b0 a5 00 - 15 01 00 00 00 00 02 e0 18 - 39 01 00 00 00 00 0c c0 00 53 6f 51 50 - 51 34 4f 5a 33 19 - 05 01 00 00 78 00 02 35 00 - 05 01 00 00 3c 00 02 29 00 - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 0c b1 a0 9f 4f 4f 63 0e 0a 10 0e 0a 10 - 39 01 00 00 00 00 07 e4 30 06 00 40 34 03 - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 0c b1 a0 9f 4f 4f 63 0e 0a 10 0e 0a 10 - 39 01 00 00 00 00 07 e4 30 06 00 40 34 03 - ]; - - qcom,mdss-dsi-off-command = [ - 05 01 00 00 14 00 02 28 00 - 05 01 00 00 78 00 02 10 00]; - qcom,mdss-dsi-on-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-off-command-state = "dsi_hs_mode"; - qcom,mdss-dsi-h-sync-pulse = <0>; - qcom,mdss-dsi-qsync-on-commands = - [15 01 00 00 00 00 02 5a 01]; - qcom,mdss-dsi-qsync-on-commands-state = - "dsi_lp_mode"; - qcom,mdss-dsi-qsync-off-commands = - [15 01 00 00 00 00 02 5a 00]; - qcom,mdss-dsi-qsync-off-commands-state = - "dsi_lp_mode"; - qcom,mdss-dsi-lp1-command = [ - 05 01 00 00 00 00 02 39 00 - ]; - qcom,mdss-dsi-lp1-command-state = - "dsi_lp_mode"; - qcom,mdss-dsi-nolp-command = [ - 05 01 00 00 00 00 02 38 00 - ]; - qcom,mdss-dsi-nolp-command-state = - "dsi_lp_mode"; - qcom,compression-mode = "dsc"; - qcom,mdss-dsc-slice-height = <180>; - qcom,mdss-dsc-slice-width = <720>; - qcom,mdss-dsc-slice-per-pkt = <1>; - qcom,mdss-dsc-bit-per-component = <8>; - qcom,mdss-dsc-bit-per-pixel = <8>; - qcom,mdss-dsc-block-prediction-enable; - }; - - timing@2 { - qcom,mdss-dsi-panel-framerate = <40>; - qcom,mdss-dsi-panel-width = <1440>; - qcom,mdss-dsi-panel-height = <2880>; - qcom,mdss-dsi-h-front-porch = <60>; - qcom,mdss-dsi-h-back-porch = <30>; - qcom,mdss-dsi-h-pulse-width = <12>; - qcom,mdss-dsi-h-sync-skew = <0>; - qcom,mdss-dsi-v-back-porch = <12>; - qcom,mdss-dsi-v-front-porch = <8>; - qcom,mdss-dsi-v-pulse-width = <1>; - 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-jitter = <0x4 0x1>; - - qcom,mdss-dsi-timing-switch-command = [ - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 0c b1 a0 9f 63 4f 63 0e 0a 10 0e 0a 10 - 39 01 00 00 00 00 07 e4 30 06 00 40 34 03 - ]; - - qcom,mdss-dsi-on-command = [ - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 03 5c 42 00 - 07 01 00 00 00 00 02 01 00 - 0a 01 00 00 00 00 80 11 00 00 89 30 80 - 0B 40 05 A0 05 A0 02 D0 02 D0 02 00 - 02 68 00 20 9A DB 00 0A 00 0C 00 12 - 00 0E 18 00 10 F0 03 0C 20 00 06 0B - 0B 33 0E 1C 2A 38 46 54 62 69 70 77 - 79 7B 7D 7E 01 02 01 00 09 40 09 BE - 19 FC 19 FA 19 F8 1A 38 1A 78 1A B6 - 2A F6 2B 34 2B 74 3B 74 6B F4 00 00 - 00 00 00 00 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 00 - 00 00 - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 09 F8 00 08 10 08 2D - 00 00 2D - 15 01 00 00 00 00 02 55 00 - 05 01 00 00 1e 00 02 11 00 - 39 01 00 00 00 00 03 b0 a5 00 - 15 01 00 00 00 00 02 e0 18 - 39 01 00 00 00 00 0c c0 00 53 6f 51 50 - 51 34 4f 5a 33 19 - 05 01 00 00 78 00 02 35 00 - 05 01 00 00 3c 00 02 29 00 - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 0c b1 a0 9f 4f 4f 63 0e 0a 10 0e 0a 10 - 39 01 00 00 00 00 07 e4 30 06 00 40 34 03 - 39 01 00 00 00 00 03 b0 a5 00 - 39 01 00 00 00 00 0c b1 a0 9f 63 4f 63 0e 0a 10 0e 0a 10 - 39 01 00 00 00 00 07 e4 30 06 00 40 34 03 - ]; - - qcom,mdss-dsi-off-command = [ - 05 01 00 00 14 00 02 28 00 - 05 01 00 00 78 00 02 10 00]; - qcom,mdss-dsi-on-command-state = "dsi_lp_mode"; - qcom,mdss-dsi-off-command-state = "dsi_hs_mode"; - qcom,mdss-dsi-h-sync-pulse = <0>; - qcom,mdss-dsi-qsync-on-commands = - [15 01 00 00 00 00 02 5a 01]; - qcom,mdss-dsi-qsync-on-commands-state = - "dsi_lp_mode"; - qcom,mdss-dsi-qsync-off-commands = - [15 01 00 00 00 00 02 5a 00]; - qcom,mdss-dsi-qsync-off-commands-state = - "dsi_lp_mode"; - qcom,mdss-dsi-lp1-command = [ - 05 01 00 00 00 00 02 39 00 - ]; - qcom,mdss-dsi-lp1-command-state = - "dsi_lp_mode"; - qcom,mdss-dsi-nolp-command = [ - 05 01 00 00 00 00 02 38 00 - ]; - qcom,mdss-dsi-nolp-command-state = - "dsi_lp_mode"; - qcom,compression-mode = "dsc"; - qcom,mdss-dsc-slice-height = <180>; - qcom,mdss-dsc-slice-width = <720>; - qcom,mdss-dsc-slice-per-pkt = <1>; - qcom,mdss-dsc-bit-per-component = <8>; - qcom,mdss-dsc-bit-per-pixel = <8>; - qcom,mdss-dsc-block-prediction-enable; - }; }; }; }; diff --git a/display/lahaina-sde-display-cdp.dtsi b/display/lahaina-sde-display-cdp.dtsi index 0876d9f6200b..806cea26659a 100644 --- a/display/lahaina-sde-display-cdp.dtsi +++ b/display/lahaina-sde-display-cdp.dtsi @@ -1,12 +1,31 @@ #include "lahaina-sde-display.dtsi" +&dsi_sw43404_amoled_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 82 0>; + qcom,platform-reset-gpio = <&tlmm 24 0>; +}; + +&dsi_sw43404_amoled_video { + 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-reset-gpio = <&tlmm 24 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 25 0>; + qcom,platform-reset-gpio = <&tlmm 24 0>; }; &sde_dsi { - qcom,dsi-default-panel = <&dsi_dual_sim_vid>; + qcom,dsi-default-panel = <&dsi_sw43404_amoled_cmd>; }; diff --git a/display/lahaina-sde-display-mtp.dtsi b/display/lahaina-sde-display-mtp.dtsi index df5b48fbbdea..efa951de57d4 100644 --- a/display/lahaina-sde-display-mtp.dtsi +++ b/display/lahaina-sde-display-mtp.dtsi @@ -1,11 +1,30 @@ #include "lahaina-sde-display.dtsi" +&dsi_sw43404_amoled_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 82 0>; + qcom,platform-reset-gpio = <&tlmm 24 0>; +}; + +&dsi_sw43404_amoled_video { + 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-reset-gpio = <&tlmm 24 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 25 0>; + qcom,platform-reset-gpio = <&tlmm 24 0>; }; &sde_dsi { - qcom,dsi-default-panel = <&dsi_dual_sim_vid>; + qcom,dsi-default-panel = <&dsi_sw43404_amoled_cmd>; }; diff --git a/display/lahaina-sde-display.dtsi b/display/lahaina-sde-display.dtsi index c0da7964ee10..41402d4a60aa 100644 --- a/display/lahaina-sde-display.dtsi +++ b/display/lahaina-sde-display.dtsi @@ -33,6 +33,28 @@ }; dsi_panel_pwr_supply: dsi_panel_pwr_supply { + #address-cells = <1>; + #size-cells = <0>; + + qcom,panel-supply-entry@0 { + reg = <0>; + qcom,supply-name = "vddio"; + qcom,supply-min-voltage = <1800000>; + qcom,supply-max-voltage = <1800000>; + qcom,supply-enable-load = <60700>; + qcom,supply-disable-load = <80>; + qcom,supply-post-on-sleep = <20>; + }; + + qcom,panel-supply-entry@1 { + reg = <1>; + qcom,supply-name = "vdd"; + qcom,supply-min-voltage = <3000000>; + qcom,supply-max-voltage = <3000000>; + qcom,supply-enable-load = <10000>; + qcom,supply-disable-load = <0>; + qcom,supply-post-on-sleep = <0>; + }; }; sde_dsi: qcom,dsi-display-primary { @@ -56,8 +78,11 @@ qcom,platform-te-gpio = <&tlmm 82 0>; qcom,panel-te-source = <0>; + vddio-supply = <&L12C>; + vdd-supply = <&L13C>; + qcom,mdp = <&mdss_mdp>; - qcom,dsi-default-panel = <&dsi_dual_sim_vid>; + qcom,dsi-default-panel = <&dsi_sw43404_amoled_cmd>; }; sde_wb: qcom,wb-display@0 { @@ -72,6 +97,32 @@ }; /* PHY TIMINGS REVISION YB */ +&dsi_sw43404_amoled_cmd { + qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; + + qcom,mdss-dsi-display-timings { + timing@0 { + qcom,mdss-dsi-panel-phy-timings = [00 11 05 05 08 08 05 + 05 03 02 04 00 0f 0a]; + qcom,display-topology = <2 2 1>; + qcom,default-topology-index = <0>; + }; + }; +}; + +&dsi_sw43404_amoled_video { + qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; + + qcom,mdss-dsi-display-timings { + timing@0 { + qcom,mdss-dsi-panel-phy-timings = [00 11 05 05 08 08 05 + 05 03 02 04 00 0f 0a]; + qcom,display-topology = <2 2 1>; + qcom,default-topology-index = <0>; + }; + }; +}; + &dsi_dual_sim_vid { qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; qcom,mdss-dsi-display-timings {