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

Commit 65d6b8b3 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 dts support for QM215 SMB1360 QRD" into kernel.lnx.4.9.r12-rel

parents 765a8623 2925b0f0
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ dtbo-$(CONFIG_ARCH_MSM8917) += msm8917-mtp-overlay.dtbo \
	apq8017-cdp-wcd-rome-overlay.dtbo

dtbo-$(CONFIG_ARCH_QM215) +=qm215-qrd-overlay.dtbo
dtbo-$(CONFIG_ARCH_QM215) +=qm215-qrd-smb1360-overlay.dtbo

dtbo-$(CONFIG_ARCH_MSM8953) += msm8953-mtp-overlay.dtbo \
	msm8953-cdp-overlay.dtbo \
@@ -420,6 +421,7 @@ apq8017-cdp-wcd-rome-overlay.dtbo-base := apq8017-pmi8950.dtb \
	apq8017-pmi8937.dtb

qm215-qrd-overlay.dtbo-base := qm215.dtb
qm215-qrd-smb1360-overlay.dtbo-base := qm215.dtb

msm8953-mtp-overlay.dtbo-base := sdm450.dtb \
	msm8953.dtb \
@@ -558,6 +560,7 @@ dtb-$(CONFIG_ARCH_MSM8917) += msm8917-pmi8950-mtp.dtb \
	msm8917-pmi8940-rcm.dtb

dtb-$(CONFIG_ARCH_QM215) += qm215-qrd.dtb
dtb-$(CONFIG_ARCH_QM215) += qm215-qrd-smb1360.dtb

dtb-$(CONFIG_ARCH_MSM8909) += sdw3100-msm8909w-wtp.dtb \
	sdw3100-apq8009w-wtp.dtb \
@@ -608,7 +611,8 @@ dtb-$(CONFIG_ARCH_SDM439) += sdm439-mtp.dtb \
	sda439-cdp.dtb \
	sdm439-external-codec-mtp.dtb \
	sdm439-rcm.dtb \
	qm215-qrd.dtb
	qm215-qrd.dtb \
	qm215-qrd-smb1360.dtb

dtb-$(CONFIG_ARCH_SDM429) += sdm429-mtp.dtb \
	sdm429-cdp.dtb \
+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/;
/plugin/;

#include "qm215-qrd-smb1360.dtsi"

/ {
	model = "QRD + SMB1360";
	qcom,board-id = <0x0b 5>;
};
+24 −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 "qm215.dtsi"
#include "qm215-pm8916.dtsi"
#include "qm215-qrd-smb1360.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. qm215 SMB1360 QRD";
	compatible = "qcom,qm215-qrd", "qcom,qm215", "qcom,qrd";
	qcom,board-id = <0x0b 5>;
};
+13 −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.
 */

#include "qm215-qrd.dtsi"