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

Commit e95bedaa 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 msmtitanium CDP, MTP and RCM device tree files"

parents 5e81e974 abcbcd32

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

+4 −2
Original line number Diff line number Diff line
@@ -230,11 +230,13 @@ compatible = "qcom,msm8952-cdp" 
compatible = "qcom,msm8952-mtp"

compatible = "qcom,apq8052-cdp"

compatible = "qcom,apq8052-mtp"

compatible = "qcom,msmtitanium-rumi"

compatible = "qcom,msmtitanium-sim"

compatible = "qcom,msm8937-rumi"

compatible = "qcom,msm8937-cdp"

compatible = "qcom,msm8937-mtp"

compatible = "qcom,msmtitanium-rumi"

compatible = "qcom,msmtitanium-sim"

compatible = "qcom,msmtitanium-cdp"

compatible = "qcom,msmtitanium-mtp"

compatible = "qcom,mdm9640-cdp"

compatible = "qcom,mdm9640-mtp"

compatible = "qcom,mdm9640-rumi"

arch/arm/boot/dts/qcom/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -100,7 +100,10 @@ dtb-$(CONFIG_ARCH_MSM8937) += msm8937-rumi.dtb \ 
	apq8037-pmi8937-mtp.dtb



dtb-$(CONFIG_ARCH_MSMTITANIUM) += msmtitanium-sim.dtb \

	msmtitanium-rumi.dtb

	msmtitanium-rumi.dtb \

	msmtitanium-cdp.dtb \

	msmtitanium-mtp.dtb \

	msmtitanium-rcm.dtb



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

	mdmfermium-cdp.dtb \

arch/arm/boot/dts/qcom/msmtitanium-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 "msmtitanium.dtsi"

#include "msmtitanium-cdp.dtsi"



/ {

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

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

	qcom,board-id= <1 0>;

};

arch/arm/boot/dts/qcom/msmtitanium-cdp.dtsi

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



&soc {

};



&blsp1_uart2 {

	status = "ok";

};

arch/arm/boot/dts/qcom/msmtitanium-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 "msmtitanium.dtsi"

#include "msmtitanium-mtp.dtsi"



/ {

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

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

	qcom,board-id= <8 0>;

};