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

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

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

parents c2116960 110de73a

arch/arm64/boot/dts/qcom/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -163,7 +163,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-atp-overlay.dtbo-base := sdmmagpie.dtb
@@ -173,6 +174,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 \
@@ -181,7 +183,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
+31 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, 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_video_display {

	qcom,dsi-display-active;

};

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

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

};