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

Commit 7bac004c 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 support for 8x16 variants"

parents a98113ff 5cc69937
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \
	msm8916-qrd-skuhf.dtb \
	msm8916-qrd-skui.dtb \
	msm8916-512mb-qrd-skuh.dtb \
	apq8016-mtp.dtb \
	msm8939-sim.dtb \
	msm8939-rumi.dtb \
	msm8939-qrd-skuk.dtb \
+23 −0
Original line number Diff line number Diff line
/* Copyright (c) 2014, 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 "msm8916-mtp.dtsi"
#include "msm8916-memory.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ 8016 MTP";
	compatible = "qcom,apq8016", "qcom,mtp";
	qcom,msm-id = <247 0>;
	qcom,board-id = <8 0>;
};
+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@
/ {
	model = "Qualcomm Technologies, Inc. MSM8916";
	compatible = "qcom,msm8916";
	qcom,msm-id = <206 0>;
	qcom,msm-id =	<206 0>,
			<248 0>,
			<249 0>,
			<250 0>;

	interrupt-parent = <&intc>;
	aliases {
+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ static void __init msm8916_init(void)

static const char *msm8916_dt_match[] __initconst = {
	"qcom,msm8916",
	"qcom,apq8016",
	NULL
};