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

Commit f4fb569e 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 APQTITANIUM"

parents 718f48a0 44aa8a9e

Documentation/devicetree/bindings/arm/msm/msm.txt

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ SoCs: 
- APQ8937

  compatible = "qcom,apq8037"



- APQTITANIUM

  compatible = "qcom,apqtitanium"



- MDM9630

  compatible = "qcom,mdm9630"
@@ -159,6 +162,8 @@ compatible = "qcom,apq8096-dragonboard" 
compatible = "qcom,apq8096-liquid"

compatible = "qcom,apq8037-cdp"

compatible = "qcom,apq8037-mtp"

compatible = "qcom,apqtitanium-cdp"

compatible = "qcom,apqtitanium-mtp"

compatible = "qcom,mdm9630-cdp"

compatible = "qcom,mdm9630-mtp"

compatible = "qcom,mdm9630-sim"

arch/arm/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -108,7 +108,9 @@ dtb-$(CONFIG_ARCH_MSMTITANIUM) += msmtitanium-sim.dtb \ 
	msmtitanium-rumi.dtb \

	msmtitanium-cdp.dtb \

	msmtitanium-mtp.dtb \

	msmtitanium-rcm.dtb

	msmtitanium-rcm.dtb \

	apqtitanium-cdp.dtb \

	apqtitanium-mtp.dtb



dtb-$(CONFIG_ARCH_MDMFERMIUM) += mdmfermium-rumi.dtb \

	mdmfermium-cdp.dtb \

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

0 → 100644
+23 −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 "apqtitanium.dtsi"

#include "msmtitanium-cdp.dtsi"



/ {

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

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

	qcom,board-id= <1 0>;

};

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

0 → 100644
+23 −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 "apqtitanium.dtsi"

#include "msmtitanium-mtp.dtsi"



/ {

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

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

	qcom,board-id= <8 0>;

};

arch/arm/boot/dts/qcom/apqtitanium.dtsi

0 → 100644
+19 −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.

 */



#include "msmtitanium.dtsi"

/ {

	model = "Qualcomm Technologies, Inc. APQ Titanium";

	compatible = "qcom,apqtitanium";

	qcom,msm-id = <304 0x0>;

};