Merge "ARM: dts: add support for mdm9630 v2" (93b7ba65) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/Makefile

+4 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,10 @@ dtb-$(CONFIG_ARCH_FSM9900) += fsm9900-rumi.dtb \
		fsm9900-cdp.dtb \
		fsm9900-mtp.dtb
		dtb-$(CONFIG_ARCH_MDM9630) += mdm9630-sim.dtb \
		mdm9630-cdp.dtb \
		mdm9630-mtp.dtb
		mdm9630-v1-cdp.dtb \
		mdm9630-v1-mtp.dtb \
		mdm9630-v2-cdp.dtb \
		mdm9630-v2-mtp.dtb
		dtb-$(CONFIG_ARCH_MSMZIRC) += msmzirc-sim.dtb
		dtb-$(CONFIG_ARCH_APQ8084) += apq8084-v1.0-old-pwr-grid-liquid.dtb \
		apq8084-v1.1-old-pwr-grid-liquid.dtb \

+3 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,9 @@
		* GNU General Public License for more details.
		*/

		#include "mdm9630-display.dtsi"
		#include "qpic-panel-ili-qvga.dtsi"

		&soc {
		};

+0 −2

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@

		#include "mdm9630.dtsi"
		#include "mdm9630-cdp.dtsi"
		#include "mdm9630-display.dtsi"
		#include "qpic-panel-ili-qvga.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MDM 9630 CDP";

+0 −0

File moved.

0 → 100644

+22 −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 "mdm9630-v2.dtsi"
		#include "mdm9630-cdp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. MDM 9630 v2 CDP";
		compatible = "qcom,mdm9630-cdp", "qcom,mdm9630", "qcom,cdp";
		qcom,board-id = <1 0>;
		};