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

Commit bfa7ac3c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: Add v2 overlay for 4k devices on sdm845 and sda845"

parents d0807d61 ba820fe4

arch/arm64/boot/dts/qcom/Makefile

+25 −12
Original line number Diff line number Diff line
@@ -8,21 +8,27 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdm845-mtp-overlay.dtbo \

		sdm845-qrd-overlay.dtbo \

		sdm845-qvr-overlay.dtbo \

		sdm845-v2-cdp-overlay.dtbo \

		sdm845-v2-mtp-overlay.dtbo \

		sdm845-v2-qrd-overlay.dtbo \

		sdm845-4k-panel-mtp-overlay.dtbo \

		sdm845-4k-panel-cdp-overlay.dtbo \

		sdm845-4k-panel-qrd-overlay.dtbo \

		sdm845-v2-cdp-overlay.dtbo \

		sdm845-v2-mtp-overlay.dtbo \

		sdm845-v2-qrd-overlay.dtbo \

		sdm845-v2-4k-panel-mtp-overlay.dtbo \

		sdm845-v2-4k-panel-cdp-overlay.dtbo \

		sdm845-v2-4k-panel-qrd-overlay.dtbo \

		sda845-cdp-overlay.dtbo \

		sda845-mtp-overlay.dtbo \

		sda845-qrd-overlay.dtbo \

		sda845-v2-cdp-overlay.dtbo \

		sda845-v2-mtp-overlay.dtbo \

		sda845-v2-qrd-overlay.dtbo \

		sda845-4k-panel-mtp-overlay.dtbo \

		sda845-4k-panel-cdp-overlay.dtbo \

		sda845-4k-panel-qrd-overlay.dtbo \

		sda845-v2-cdp-overlay.dtbo \

		sda845-v2-mtp-overlay.dtbo \

		sda845-v2-qrd-overlay.dtbo \

		sda845-v2-4k-panel-mtp-overlay.dtbo \

		sda845-v2-4k-panel-cdp-overlay.dtbo \

		sda845-v2-4k-panel-qrd-overlay.dtbo \

		sdm845-interposer-sdm670-cdp-overlay.dtbo \

		sdm845-interposer-sdm670-mtp-overlay.dtbo
@@ -30,21 +36,28 @@ sdm845-cdp-overlay.dtbo-base := sdm845.dtb 
sdm845-mtp-overlay.dtbo-base := sdm845.dtb

sdm845-qrd-overlay.dtbo-base := sdm845.dtb

sdm845-qvr-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-cdp-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-mtp-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-qrd-overlay.dtbo-base := sdm845-v2.dtb

sdm845-qvr-overlay.dtbo-base := sdm845.dtb

sdm845-4k-panel-mtp-overlay.dtbo-base := sdm845.dtb

sdm845-4k-panel-cdp-overlay.dtbo-base := sdm845.dtb

sdm845-4k-panel-qrd-overlay.dtbo-base := sdm845.dtb

sdm845-v2-cdp-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-mtp-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-qrd-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-4k-panel-mtp-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-4k-panel-cdp-overlay.dtbo-base := sdm845-v2.dtb

sdm845-v2-4k-panel-qrd-overlay.dtbo-base := sdm845-v2.dtb

sda845-cdp-overlay.dtbo-base := sda845.dtb

sda845-mtp-overlay.dtbo-base := sda845.dtb

sda845-qrd-overlay.dtbo-base := sda845.dtb

sda845-v2-cdp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-mtp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-qrd-overlay.dtbo-base := sda845-v2.dtb

sda845-4k-panel-mtp-overlay.dtbo-base := sda845.dtb

sda845-4k-panel-cdp-overlay.dtbo-base := sda845.dtb

sda845-4k-panel-qrd-overlay.dtbo-base := sda845.dtb

sda845-v2-cdp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-mtp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-qrd-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-4k-panel-mtp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-4k-panel-cdp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-4k-panel-qrd-overlay.dtbo-base := sda845-v2.dtb

sdm845-interposer-sdm670-cdp-overlay.dtbo-base := sdm845-interposer-sdm670.dtb

sdm845-interposer-sdm670-mtp-overlay.dtbo-base := sdm845-interposer-sdm670.dtb

else

arch/arm64/boot/dts/qcom/sda845-v2-4k-panel-cdp-overlay.dts

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */





/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm845-sde-display.dtsi"

#include "sdm845-cdp.dtsi"

#include "sdm845-cdp-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. sda845 v2 4K Display Panel CDP";

	compatible = "qcom,sda845-cdp", "qcom,sda845", "qcom,cdp";

	qcom,msm-id = <341 0x20000>;

	qcom,board-id = <1 1>;

};



&dsi_nt35597_truly_dsc_cmd_display {

	/delete-property/ qcom,dsi-display-active;

};



&mdss_mdp {

	connectors = <&sde_rscc &sde_wb>;

};



&dsi_sharp_4k_dsc_video {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 52 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 6 0>;

};



&dsi_sharp_4k_dsc_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 52 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 6 0>;

};



&dsi_sharp_4k_dsc_video_display {

	qcom,dsi-display-active;

};

arch/arm64/boot/dts/qcom/sda845-v2-4k-panel-mtp-overlay.dts

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */





/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm845-sde-display.dtsi"

#include "sdm845-mtp.dtsi"

#include "sdm845-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. sda845 v2 4K Display Panel MTP";

	compatible = "qcom,sda845-mtp", "qcom,sda845", "qcom,mtp";

	qcom,msm-id = <341 0x20000>;

	qcom,board-id = <8 1>;

};



&dsi_nt35597_truly_dsc_cmd_display {

	/delete-property/ qcom,dsi-display-active;

};



&mdss_mdp {

	connectors = <&sde_rscc &sde_wb &sde_dp>;

};



&dsi_sharp_4k_dsc_video {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 52 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 6 0>;

};



&dsi_sharp_4k_dsc_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 52 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 6 0>;

};



&dsi_sharp_4k_dsc_video_display {

	qcom,dsi-display-active;

};

arch/arm64/boot/dts/qcom/sda845-v2-4k-panel-qrd-overlay.dts

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */





/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm845-sde-display.dtsi"

#include "sdm845-qrd.dtsi"

#include "sdm845-qrd-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. sda845 v2 4K Display Panel QRD";

	compatible = "qcom,sda845-qrd", "qcom,sda845", "qcom,qrd";

	qcom,msm-id = <341 0x20000>;

	qcom,board-id = <11 1>;

};



&dsi_nt35597_truly_dsc_cmd_display {

	/delete-property/ qcom,dsi-display-active;

};



&dsi_sharp_4k_dsc_video {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 52 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 6 0>;

	qcom,mdss-dsi-panel-orientation = "180";

};



&dsi_sharp_4k_dsc_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 52 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 6 0>;

	qcom,mdss-dsi-panel-orientation = "180";

};



&dsi_sharp_4k_dsc_video_display {

	qcom,dsi-display-active;

};

arch/arm64/boot/dts/qcom/sdm845-v2-4k-panel-cdp-overlay.dts

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */





/dts-v1/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sdm845-sde-display.dtsi"

#include "sdm845-cdp.dtsi"

#include "sdm845-cdp-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. sdm845 v2 4K Display Panel CDP";

	compatible = "qcom,sdm845-cdp", "qcom,sdm845", "qcom,cdp";

	qcom,msm-id = <321 0x20000>;

	qcom,board-id = <1 1>;

};



&dsi_nt35597_truly_dsc_cmd_display {

	/delete-property/ qcom,dsi-display-active;

};



&mdss_mdp {

	connectors = <&sde_rscc &sde_wb>;

};



&dsi_sharp_4k_dsc_video {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 52 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 6 0>;

};



&dsi_sharp_4k_dsc_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-mode-sel-gpio-state = "dual_port";

	qcom,panel-mode-gpio = <&tlmm 52 0>;

	qcom,platform-te-gpio = <&tlmm 10 0>;

	qcom,platform-reset-gpio = <&tlmm 6 0>;

};



&dsi_sharp_4k_dsc_video_display {

	qcom,dsi-display-active;

};