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

Commit f3b76dcc 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: msm: Add device tree and overlay file for SDM845 V2 DVT"

parents 51766aa5 cf36cc26

arch/arm64/boot/dts/qcom/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdm845-4k-panel-mtp-overlay.dtbo \

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

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

		sdm845-v2-qvr-overlay.dtbo \

		sdm845-v2-qvr-evt-overlay.dtbo \

		sdm845-v2-qvr-dvt-overlay.dtbo \

		sdm845-v2-cdp-overlay.dtbo \

		sdm845-v2-mtp-overlay.dtbo \

		sdm845-v2-qrd-overlay.dtbo \
@@ -52,7 +53,8 @@ sdm845-qrd-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-qvr-overlay.dtbo-base := sdm845-v2.dtb

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

sdm845-v2-qvr-dvt-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
@@ -97,7 +99,8 @@ dtb-$(CONFIG_ARCH_SDM845) += sdm845-sim.dtb \ 
	sdm845-v2-cdp.dtb \

	sdm845-qrd.dtb \

	sdm845-v2-qrd.dtb \

	sdm845-v2-qvr.dtb \

	sdm845-v2-qvr-evt.dtb \

	sdm845-v2-qvr-dvt.dtb \

	sdm845-4k-panel-mtp.dtb \

	sdm845-4k-panel-cdp.dtb \

	sdm845-4k-panel-qrd.dtb \

arch/arm64/boot/dts/qcom/sda845-v2-hdk-overlay.dts

+2 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-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
@@ -13,14 +13,8 @@ 
/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 "sda845-v2-hdk.dtsi"

#include "sdm845-sde-display.dtsi"

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



/ {

arch/arm64/boot/dts/qcom/sdm845-qvr.dtsi

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

/* Copyright (c) 2017-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
@@ -10,6 +10,12 @@ 
 * GNU General Public License for more details.

 */



#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-pmic-overlay.dtsi"

#include "sdm845-pinctrl-overlay.dtsi"

#include "smb1355.dtsi"

arch/arm64/boot/dts/qcom/sdm845-v2-qvr-dvt-overlay.dts

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017-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 "sdm845-v2-qvr-dvt.dtsi"

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



/ {

	model = "Qualcomm Technologies, Inc. SDM845 V2 DVT QVR";

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

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

	qcom,board-id = <0x02000B 0x20>;

};

arch/arm64/boot/dts/qcom/sdm845-v2-qvr-dvt.dts

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

#include "sdm845-v2-qvr-dvt.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM845 V2 DVT QVR";

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

	qcom,board-id = <0x02000B 0x20>;

};