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

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

parents a5ab98c2 340f730b

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

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ compatible = "qcom,apq8052-mtp" 
compatible = "qcom,msmtitanium-rumi"

compatible = "qcom,msmtitanium-sim"

compatible = "qcom,msmthorium-rumi"

compatible = "qcom,msmthorium-cdp"

compatible = "qcom,msmthorium-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
@@ -85,7 +85,10 @@ dtb-$(CONFIG_ARCH_MDMCALIFORNIUM) += mdmcalifornium-sim.dtb \ 
	mdmcalifornium-nand-cdp.dtb \

	mdmcalifornium-mtp.dtb



dtb-$(CONFIG_ARCH_MSMTHORIUM) += msmthorium-rumi.dtb

dtb-$(CONFIG_ARCH_MSMTHORIUM) += msmthorium-rumi.dtb \

	msmthorium-cdp.dtb \

	msmthorium-mtp.dtb \

	msmthorium-rcm.dtb



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

	msmtitanium-rumi.dtb

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

#include "msmthorium-cdp.dtsi"



/ {

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

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

	qcom,board-id= <1 0>;

};

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



&soc {

};



&blsp1_uart2 {

	status = "ok";

};

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

#include "msmthorium-mtp.dtsi"



/ {

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

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

	qcom,board-id= <8 0>;

};