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

Commit e7d41171 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 initial overlay for QRD on SDM845"

parents 094061db 958c8196

arch/arm64/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ dtb-$(CONFIG_ARCH_SDM845) += sdm845-sim.dtb \ 
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SDM845) += \

		sdm845-cdp-overlay.dtbo \

		sdm845-mtp-overlay.dtbo

		sdm845-mtp-overlay.dtbo \

		sdm845-qrd-overlay.dtbo



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

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

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

endif



dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \

arch/arm64/boot/dts/qcom/sdm845-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-sdm845.h>

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

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

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



#include "sdm845-qrd.dtsi"



/ {

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

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

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

	qcom,board-id = <11 0>;

};

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

+0 −8
Original line number Diff line number Diff line
@@ -40,14 +40,6 @@ 
		#include "fg-gen3-batterydata-itech-3000mah.dtsi"

		#include "fg-gen3-batterydata-ascent-3450mah.dtsi"

	};



	aliases {

		serial0 = &qupv3_se9_2uart;

		spi0 = &qupv3_se8_spi;

		i2c0 = &qupv3_se10_i2c;

		i2c1 = &qupv3_se3_i2c;

		hsuart0 = &qupv3_se6_4uart;

	};

};



&qupv3_se9_2uart {