Merge 817e906297
on remote branch
Change-Id: I923285d5405a3450cae83c3ee32595e885894b96
This commit is contained in:
@@ -13,11 +13,13 @@
|
||||
reg = <0x0ae00000 0x93800>,
|
||||
<0x0aeb0000 0x2008>,
|
||||
<0x0af80000 0x7000>,
|
||||
<0x400000 0x2000>;
|
||||
<0x400000 0x2000>,
|
||||
<0x0af50000 0x140>;
|
||||
reg-names = "mdp_phys",
|
||||
"vbif_phys",
|
||||
"regdma_phys",
|
||||
"ipcc_reg";
|
||||
"ipcc_reg",
|
||||
"swfuse_phys";
|
||||
|
||||
/* interrupt config */
|
||||
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
@@ -228,7 +228,7 @@
|
||||
|
||||
qti,smmu-proxy-cb-id = <QTI_SMMU_PROXY_DISPLAY_CB>;
|
||||
|
||||
qcom,sde-vm-exclude-reg-names = "ipcc_reg";
|
||||
qcom,sde-vm-exclude-reg-names = "ipcc_reg", "swfuse_phys";
|
||||
|
||||
/* data and reg bus scale settings */
|
||||
interconnects = <&mmss_noc MASTER_MDP &gem_noc SLAVE_LLCC>,
|
||||
|
@@ -13,11 +13,13 @@
|
||||
reg = <0x0ae00000 0x93800>,
|
||||
<0x0aeb0000 0x2008>,
|
||||
<0x0af80000 0x7000>,
|
||||
<0x400000 0x2000>;
|
||||
<0x400000 0x2000>,
|
||||
<0x0af50000 0x140>;
|
||||
reg-names = "mdp_phys",
|
||||
"vbif_phys",
|
||||
"regdma_phys",
|
||||
"ipcc_reg";
|
||||
"ipcc_reg",
|
||||
"swfuse_phys";
|
||||
|
||||
/* interrupt config */
|
||||
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
@@ -5,6 +5,49 @@
|
||||
|
||||
#include "tuna-sde-display.dtsi"
|
||||
|
||||
&pm8550vs_g_gpios {
|
||||
lcd_backlight_ctrl {
|
||||
lcd_backlight_en_default: lcd_backlight_en_default {
|
||||
pins = "gpio4";
|
||||
function = "normal";
|
||||
input-disable;
|
||||
output-enable;
|
||||
bias-disable;
|
||||
power-source = <1>;
|
||||
qcom,drive-strength = <3>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&pm8550vs_f_gpios {
|
||||
display_panel_avdd_default: display_panel_avdd_default {
|
||||
pins = "gpio8";
|
||||
function = "normal";
|
||||
input-disable;
|
||||
output-enable;
|
||||
bias-disable;
|
||||
power-source = <1>;
|
||||
qcom,drive-strength = <3>;
|
||||
};
|
||||
};
|
||||
|
||||
&soc {
|
||||
display_panel_avdd: display_gpio_regulator@1 {
|
||||
compatible = "qti-regulator-fixed";
|
||||
regulator-name = "display_panel_avdd";
|
||||
regulator-min-microvolt = <5500000>;
|
||||
regulator-max-microvolt = <5500000>;
|
||||
regulator-enable-ramp-delay = <233>;
|
||||
gpio = <&pm8550vs_f_gpios 8 0>;
|
||||
enable-active-high;
|
||||
regulator-boot-on;
|
||||
proxy-supply = <&display_panel_avdd>;
|
||||
qcom,proxy-consumer-enable;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&display_panel_avdd_default>;
|
||||
};
|
||||
};
|
||||
|
||||
&dsi_vtdr6130_amoled_cmd {
|
||||
qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
|
||||
qcom,panel-sec-supply-entries = <&dsi_panel_pwr_supply>;
|
||||
@@ -216,6 +259,24 @@
|
||||
qcom,platform-sec-reset-gpio = <&tlmm 126 0>;
|
||||
};
|
||||
|
||||
&dsi_sharp_qhd_plus_dsc_cmd {
|
||||
qcom,panel-supply-entries = <&dsi_panel_pwr_supply_lcd>;
|
||||
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 14 0>;
|
||||
qcom,platform-bklight-en-gpio = <&pm8550vs_g_gpios 4 0>;
|
||||
};
|
||||
|
||||
&dsi_sharp_qhd_plus_dsc_video {
|
||||
qcom,panel-supply-entries = <&dsi_panel_pwr_supply_lcd>;
|
||||
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 14 0>;
|
||||
qcom,platform-bklight-en-gpio = <&pm8550vs_g_gpios 4 0>;
|
||||
};
|
||||
|
||||
&dsi_sim_cmd {
|
||||
qcom,panel-supply-entries = <&dsi_panel_pwr_supply_sim>;
|
||||
qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
|
||||
@@ -257,6 +318,7 @@
|
||||
};
|
||||
|
||||
&sde_dsi {
|
||||
avdd-supply = <&display_panel_avdd>;
|
||||
qcom,dsi-default-panel = <&dsi_nt37801_amoled_cmd>;
|
||||
};
|
||||
|
||||
|
@@ -18,6 +18,8 @@
|
||||
#include "dsi-panel-nt37801-dsc-fhd-plus-cmd.dtsi"
|
||||
#include "dsi-panel-nt37801-dsc-wqhd-plus-cmd-ddicspr.dtsi"
|
||||
#include "dsi-panel-nt37801-dsc-wqhd-plus-video-ddicspr.dtsi"
|
||||
#include "dsi-panel-sharp-dsc-qhd-plus-cmd.dtsi"
|
||||
#include "dsi-panel-sharp-dsc-qhd-plus-video.dtsi"
|
||||
#include "dsi-panel-sim-cmd-au.dtsi"
|
||||
#include "dsi-panel-sim-cmd.dtsi"
|
||||
#include "dsi-panel-sim-dsc-10bit-cmd.dtsi"
|
||||
@@ -88,6 +90,30 @@
|
||||
};
|
||||
};
|
||||
|
||||
dsi_panel_pwr_supply_lcd: dsi_panel_pwr_supply_lcd {
|
||||
#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 = <220000>;
|
||||
qcom,supply-disable-load = <8000>;
|
||||
qcom,supply-post-on-sleep = <20>;
|
||||
};
|
||||
|
||||
qcom,panel-supply-entry@1 {
|
||||
reg = <1>;
|
||||
qcom,supply-name = "avdd";
|
||||
qcom,supply-min-voltage = <4600000>;
|
||||
qcom,supply-max-voltage = <6000000>;
|
||||
qcom,supply-enable-load = <260000>;
|
||||
qcom,supply-disable-load = <100>;
|
||||
};
|
||||
};
|
||||
|
||||
sde_dsi: qcom,dsi-display-primary {
|
||||
compatible = "qcom,dsi-display";
|
||||
label = "primary";
|
||||
@@ -713,6 +739,32 @@
|
||||
};
|
||||
};
|
||||
|
||||
&dsi_sharp_qhd_plus_dsc_cmd {
|
||||
qcom,dsi-select-clocks = "pll_byte_clk0", "pll_dsi_clk0";
|
||||
|
||||
qcom,mdss-dsi-display-timings {
|
||||
timing@0 { /* 120 FPS */
|
||||
qcom,mdss-dsi-panel-phy-timings = [00 1a 07 06 16 15 07
|
||||
07 07 02 04 00 17 0c];
|
||||
qcom,display-topology = <2 2 2>;
|
||||
qcom,default-topology-index = <0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&dsi_sharp_qhd_plus_dsc_video {
|
||||
qcom,dsi-select-clocks = "pll_byte_clk0", "pll_dsi_clk0";
|
||||
|
||||
qcom,mdss-dsi-display-timings {
|
||||
timing@0 { /* 120 FPS */
|
||||
qcom,mdss-dsi-panel-phy-timings = [00 1a 07 06 16 15 07
|
||||
07 07 02 04 00 17 0c];
|
||||
qcom,display-topology = <2 2 2>;
|
||||
qcom,default-topology-index = <0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&dsi_sim_cmd {
|
||||
qcom,dsi-select-clocks = "pll_byte_clk0", "pll_dsi_clk0";
|
||||
|
||||
|
@@ -270,7 +270,7 @@
|
||||
|
||||
qti,smmu-proxy-cb-id = <QTI_SMMU_PROXY_DISPLAY_CB>;
|
||||
|
||||
qcom,sde-vm-exclude-reg-names = "ipcc_reg";
|
||||
qcom,sde-vm-exclude-reg-names = "ipcc_reg", "swfuse_phys";
|
||||
|
||||
/* data and reg bus scale settings */
|
||||
interconnects = <&mmss_noc MASTER_MDP &gem_noc SLAVE_LLCC>,
|
||||
|
Reference in New Issue
Block a user