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

Commit 61b3df7a 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 MSM8994 CDP / MTP device trees"

parents 5c78f732 0a8fc10c

arch/arm/boot/dts/qcom/Makefile

+4 −2
Original line number Original line Diff line number Diff line
@@ -139,8 +139,10 @@ dtb-$(CONFIG_ARCH_APQ8084) += apq8084-v1.0-old-pwr-grid-liquid.dtb \ 
	apq8084-v1.1-old-pwr-grid-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-old-pwr-grid-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-sbc.dtb

	apq8084-v1.1-sbc.dtb

dtb-$(CONFIG_ARCH_MSM8994) += msm8994-sim.dtb

dtb-$(CONFIG_ARCH_MSM8994) += msm8994-sim.dtb \

dtb-$(CONFIG_ARCH_MSM8994) += msm8994-rumi.dtb

	msm8994-rumi.dtb \

	msm8994-cdp.dtb \

	msm8994-mtp.dtb





DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

ifneq ($(DTB_NAMES),)

ifneq ($(DTB_NAMES),)

arch/arm/boot/dts/qcom/msm8994-cdp.dts

0 → 100644
+24 −0
Original line number Original line 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 "msm8994.dtsi"

#include "msm8994-pinctrl.dtsi"

#include "msm8994-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8994 CDP";

	compatible = "qcom,msm8994-cdp", "qcom,msm8994", "qcom,cdp";

	qcom,board-id = <1 0>;

};
 
 No newline at end of file

arch/arm/boot/dts/qcom/msm8994-mtp.dts

0 → 100644
+24 −0
Original line number Original line 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 "msm8994.dtsi"

#include "msm8994-pinctrl.dtsi"

#include "msm8994-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8994 MTP";

	compatible = "qcom,msm8994-mtp", "qcom,msm8994", "qcom,mtp";

	qcom,board-id = <8 0>;

};
 
 No newline at end of file