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

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

Merge "ARM: dts: msm: Add support for various platforms on atollp"

parents c0cecf74 cde21207

Documentation/devicetree/bindings/arm/msm/msm.txt

+4 −0
Original line number Diff line number Diff line
@@ -233,5 +233,9 @@ compatible = "qcom,atoll-rumi" 
compatible = "qcom,atoll-idp"

compatible = "qcom,atoll-atp"

compatible = "qcom,atoll-qrd"

compatible = "qcom,atollp"

compatible = "qcom,atollp-idp"

compatible = "qcom,atollp-atp"

compatible = "qcom,atollp-qrd"

compatible = "qcom,qcs610-iot"

compatible = "qcom,qcs410-iot"

arch/arm64/boot/dts/qcom/Makefile

+11 −2
Original line number Diff line number Diff line
@@ -252,7 +252,10 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		atoll-qrd-overlay.dtbo\

		atoll-wcd937x-idp-overlay.dtbo\

		atoll-usbc-idp-overlay.dtbo\

		atoll-rumi-overlay.dtbo

		atoll-rumi-overlay.dtbo\

		atollp-idp-overlay.dtbo \

		atollp-atp-overlay.dtbo \

		atollp-qrd-overlay.dtbo



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

atoll-atp-overlay.dtbo-base := atoll.dtb
@@ -260,13 +263,19 @@ atoll-qrd-overlay.dtbo-base := atoll.dtb 
atoll-rumi-overlay.dtbo-base := atoll.dtb

atoll-wcd937x-idp-overlay.dtbo-base := atoll.dtb

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

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

atollp-atp-overlay.dtbo-base := atollp.dtb

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

else

dtb-$(CONFIG_ARCH_ATOLL)	+= atoll-idp.dtb\

	atoll-atp.dtb\

	atoll-qrd.dtb\

	atoll-wcd937x-idp.dtb\

	atoll-usbc-idp.dtb\

	atoll-rumi.dtb

	atoll-rumi.dtb\

	atollp-idp.dtb\

	atollp-atp.dtb\

	atollp-qrd.dtb

endif



dtb-$(CONFIG_ARCH_SDXPRAIRIE) += sdxprairie-rumi.dtb \

arch/arm64/boot/dts/qcom/atollp-atp-overlay.dts

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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 "atoll-atp.dtsi"



/ {

	model = "ATP";

	compatible = "qcom,atollp-atp", "qcom,atollp", "qcom,atp";

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

	qcom,board-id = <33 0>;

};

arch/arm64/boot/dts/qcom/atollp-atp.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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 "atollp.dtsi"

#include "atoll-atp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. ATOLLP PM6150 ATP";

	compatible = "qcom,atollp-idp", "qcom,atollp", "qcom,idp", "qcom,atp";

	qcom,board-id = <33 0>;

};

arch/arm64/boot/dts/qcom/atollp-idp-overlay.dts

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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 "atoll-idp.dtsi"

#include "atoll-audio-overlay.dtsi"



/ {

	model = "IDP";

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

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

	qcom,board-id = <34 0>;

};



&dsi_rm69299_visionox_amoled_vid_display {

	qcom,dsi-display-active;

};