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

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

Merge changes I76281d2c,I2bba50da,I796e4648 into msm-next 

* changes:
  defconfig: sdm855: Enable APPENDED_DTB for sdm855
  ARM: dts: msm: add /vendor node in SDM855
  ARM: dts: msm: Add overlay files for SDM855 v1
parents 30e0af15 60006411

arch/arm64/boot/dts/qcom/Makefile

+15 −1
Original line number Diff line number Diff line
@@ -4,11 +4,25 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SDM855) += \

		sdm855-cdp-overlay.dtbo \

		sdm855-mtp-overlay.dtbo \

		sdm855-rumi-overlay.dtbo \

		sdm855-qrd-overlay.dtbo \



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

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

sdm855-rumi-overlay.dtbo-base := sdm855.dtb

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

else

dtb-$(CONFIG_ARCH_SDM855)	+= sdm855-rumi.dtb \

	sdm855-mtp.dtb \

	sdm855-cdp.dtb \

	sdm855-qrd.dtb

endif



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

clean-files	:= *.dtb
 
clean-files	:= *.dtb *.dtbo

arch/arm64/boot/dts/qcom/sdm855-cdp-overlay.dts

0 → 100644
+28 −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-sdm855.h>

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

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

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



#include "sdm855-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 CDP";

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

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

	qcom,board-id = <1 0>;

};

arch/arm64/boot/dts/qcom/sdm855-mtp-overlay.dts

0 → 100644
+28 −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-sdm855.h>

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

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

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



#include "sdm855-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 MTP";

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

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

	qcom,board-id = <8 0>;

};

arch/arm64/boot/dts/qcom/sdm855-qrd-overlay.dts

0 → 100644
+28 −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-sdm855.h>

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

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

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



#include "sdm855-qrd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 QRD";

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

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

	qcom,board-id = <1 0>;

};

arch/arm64/boot/dts/qcom/sdm855-rumi-overlay.dts

0 → 100644
+27 −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-sdm855.h>

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

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

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



#include "sdm855-rumi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 RUMI";

	compatible = "qcom,sdm855-rumi", "qcom,sdm855", "qcom,rumi";

	qcom,board-id = <15 0>;

};