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

Commit 573d342b authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add display support for dual display platform on sdmmagpie"

parents 8551a12c 9a584618

arch/arm64/boot/dts/qcom/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdmmagpiep-idp-overlay.dtbo \

		sdmmagpiep-qrd-overlay.dtbo \

		sdmmagpie-external-codec-idp-overlay.dtbo \

		sdmmagpie-usbc-idp-overlay.dtbo

		sdmmagpie-usbc-idp-overlay.dtbo \

		sdmmagpie-dual-display-idp-overlay.dtbo



sdmmagpie-idp-overlay.dtbo-base := sdmmagpie.dtb

sdmmagpie-rumi-overlay.dtbo-base := sdmmagpie.dtb
@@ -159,6 +160,7 @@ sdmmagpiep-idp-overlay.dtbo-base := sdmmagpiep.dtb 
sdmmagpiep-qrd-overlay.dtbo-base := sdmmagpiep.dtb

sdmmagpie-external-codec-idp-overlay.dtbo-base := sdmmagpie.dtb

sdmmagpie-usbc-idp-overlay.dtbo-base := sdmmagpie.dtb

sdmmagpie-dual-display-idp-overlay.dtbo-base := sdmmagpie.dtb

else

dtb-$(CONFIG_ARCH_SDMMAGPIE)	+= sdmmagpie-rumi.dtb \

	sdmmagpie-idp.dtb \
@@ -166,7 +168,8 @@ dtb-$(CONFIG_ARCH_SDMMAGPIE) += sdmmagpie-rumi.dtb \ 
	sdmmagpiep-idp.dtb \

	sdmmagpiep-qrd.dtb \

	sdmmagpie-external-codec-idp.dtb \

	sdmmagpie-usbc-idp.dtb

	sdmmagpie-usbc-idp.dtb \

	sdmmagpie-dual-display-idp.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sdmmagpie-dual-display-idp-overlay.dts

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, 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/interrupt-controller/arm-gic.h>

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



#include "sdmmagpie-idp.dtsi"

#include "sdmmagpie-audio-overlay.dtsi"



/ {

	model = "Dual Display IDP";

	compatible = "qcom,sdmmagpie-idp", "qcom,sdmmagpie", "qcom,idp";

	qcom,msm-id = <365 0x0>;

	qcom,board-id = <34 3>;

};



&dsi_sw43404_amoled_fhd_plus_cmd_display {

	qcom,dsi-display-active;

};



&dsi_nt35695b_truly_fhd_cmd_sec_display {

	qcom,dsi-display-active;

};



&mdss_mdp {

	qcom,sde-mixer-display-pref = "primary", "none", "none",

				"none", "none", "none";

};

arch/arm64/boot/dts/qcom/sdmmagpie-dual-display-idp.dts

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, 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/;



#include "sdmmagpie.dtsi"

#include "sdmmagpie-idp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDMMAGPIE PM6150 Dual Display IDP";

	compatible = "qcom,sdmmagpie-idp", "qcom,sdmmagpie", "qcom,idp";

	qcom,board-id = <34 3>;

};



&dsi_sw43404_amoled_fhd_plus_cmd_display {

	qcom,dsi-display-active;

};



&dsi_nt35695b_truly_fhd_cmd_sec_display {

	qcom,dsi-display-active;

};



&mdss_mdp {

	qcom,sde-mixer-display-pref = "primary", "none", "none",

			"none", "none", "none";

};

arch/arm64/boot/dts/qcom/sdmmagpie-idp.dts

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, 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
@@ -20,3 +20,7 @@ 
	compatible = "qcom,sdmmagpie-idp", "qcom,sdmmagpie", "qcom,idp";

	qcom,board-id = <34 0>;

};



&dsi_sw43404_amoled_video_display {

	qcom,dsi-display-active;

};

arch/arm64/boot/dts/qcom/sdmmagpie-idp.dtsi

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, 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
@@ -226,6 +226,7 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;

	qcom,panel-sec-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;

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

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

	qcom,platform-reset-gpio = <&pm6150l_gpios 11 0>;

	qcom,platform-sec-reset-gpio = <&pm6150l_gpios 11 0>;

	qcom,platform-en-gpio = <&pm6150l_gpios 4 0>;
@@ -236,6 +237,7 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;

	qcom,panel-sec-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;

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

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

	qcom,platform-reset-gpio = <&pm6150l_gpios 11 0>;

	qcom,platform-sec-reset-gpio = <&pm6150l_gpios 11 0>;

	qcom,platform-en-gpio = <&pm6150l_gpios 4 0>;