Merge "ARM: dts: apq: Support DragonBoard-v3 with PMI8996" (e31fee99) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,8 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
		apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dtb \
		apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dtb \
		apq8096-v3-pmi8996-mdm9x55-i2s-mtp.dtb \
		apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dtb
		apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dtb \
		apq8096-v3-pmi8996-dragonboard.dtb

		dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \
		msmcobalt-rumi.dtb

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,8 @@
		model = "Qualcomm Technologies, Inc. APQ8096v3 + PMI8994 DragonBoard";
		compatible = "qcom,apq8096-dragonboard", "qcom,msm8996",
		"qcom,apq8096", "qcom,dragonboard";
		qcom,msm-id = <246 0x30000>, <291 0x30000>;
		qcom,msm-id = <246 0x30000>, <291 0x30000>,
		<246 0x30001>, <291 0x30001>;
		qcom,board-id = <10 0>;
		};

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, 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 "apq8096-v3.dtsi"
		#include "msm-pmi8996.dtsi"
		#include "apq8096-dragonboard.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ8096v3 + PMI8996 DragonBoard";
		compatible = "qcom,apq8096-dragonboard", "qcom,msm8996",
		"qcom,apq8096", "qcom,dragonboard";
		qcom,msm-id = <246 0x30000>, <291 0x30000>,
		<246 0x30001>, <291 0x30001>;
		qcom,board-id = <10 0>;
		};