Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 099aa2a0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: update LCD display properties for Kona LCD CDP"

parents dea3597c 8be2f793
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
        dtbo-$(CONFIG_ARCH_KONA) += \
                kona-cdp-overlay.dtbo \
                kona-cdp-lcd-overlay.dtbo \
                kona-mtp-overlay.dtbo \
                kona-rumi-overlay.dtbo \
                kona-qrd-overlay.dtbo

kona-cdp-overlay.dtbo-base := kona.dtb kona-v2.dtb
kona-cdp-lcd-overlay.dtbo-base := kona.dtb kona-v2.dtb
kona-mtp-overlay.dtbo-base := kona.dtb kona-v2.dtb
kona-rumi-overlay.dtbo-base := kona.dtb kona-v2.dtb
kona-qrd-overlay.dtbo-base := kona.dtb kona-v2.dtb
@@ -13,6 +15,7 @@ else
dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \
        kona-mtp.dtb \
        kona-cdp.dtb \
        kona-cdp-lcd.dtb \
        kona-qrd.dtb \
        kona-v2-rumi.dtb \
        kona-v2-mtp.dtb \
+2 −0
Original line number Diff line number Diff line
#include <dt-bindings/clock/qcom,camcc-kona.h>

&soc {
	led_flash_rear: qcom,camera-flash0 {
		cell-index = <0>;
+11 −0
Original line number Diff line number Diff line
/dts-v1/;
/plugin/;

#include "kona-cdp-lcd.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. kona CDP (LCD)";
	compatible = "qcom,kona-cdp", "qcom,kona", "qcom,cdp";
	qcom,board-id = <0x10101 0>;
};

qcom/kona-cdp-lcd.dts

0 → 100644
+10 −0
Original line number Diff line number Diff line
/dts-v1/;

#include "kona.dtsi"
#include "kona-cdp-lcd.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. kona CDP (LCD)";
	compatible = "qcom,kona-cdp", "qcom,kona", "qcom,cdp";
	qcom,board-id = <0x10101 0>;
};

qcom/kona-cdp-lcd.dtsi

0 → 100644
+72 −0
Original line number Diff line number Diff line
#include "kona-cdp.dtsi"

&pm8150a_amoled {
	status = "disabled";
};

&pm8150l_lcdb {
	status = "ok";
};

&pm8150l_wled {
	qcom,string-cfg = <7>;
	status = "ok";
};

&dsi_panel_pwr_supply_avdd {
	qcom,panel-supply-entry@1 {
		reg = <1>;
		qcom,supply-name = "lab";
		qcom,supply-min-voltage = <4600000>;
		qcom,supply-max-voltage = <6000000>;
		qcom,supply-enable-load = <100000>;
		qcom,supply-disable-load = <100>;
	};

	qcom,panel-supply-entry@2 {
		reg = <2>;
		qcom,supply-name = "ibb";
		qcom,supply-min-voltage = <4600000>;
		qcom,supply-max-voltage = <6000000>;
		qcom,supply-enable-load = <100000>;
		qcom,supply-disable-load = <100>;
		qcom,supply-post-on-sleep = <20>;
	};
};

&dsi_sharp_4k_dsc_cmd {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
	/delete-property/ qcom,platform-en-gpio;
};

&dsi_sharp_4k_dsc_video {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
	/delete-property/ qcom,platform-en-gpio;
};

&dsi_sharp_1080_cmd {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
};

&dsi_dual_nt35597_truly_cmd {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
};

&dsi_dual_nt35597_truly_video {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
};

&dsi_nt35695b_truly_fhd_cmd {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
};

&dsi_nt35695b_truly_fhd_video {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
};

&sde_dsi {
	/delete-property/ avdd-supply;
	lab-supply = <&lcdb_ldo_vreg>;
	ibb-supply = <&lcdb_ncp_vreg>;
	qcom,dsi-default-panel = <&dsi_sharp_4k_dsc_cmd>;
};