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

Commit 675a2ae8 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 MTP and CDP support for mdmfermium"

parents bcc08bcd c5594597

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

+2 −0
Original line number Diff line number Diff line
@@ -232,5 +232,7 @@ compatible = "qcom,msmzirc-rumi" 
compatible = "qcom,msmzirc-sim"

compatible = "qcom,msmvpipa-sim"

compatible = "qcom,mdmfermium-rumi"

compatible = "qcom,mdmfermium-cdp"

compatible = "qcom,mdmfermium-mtp"

compatible = "qcom,mdmcalifornium-rumi"

compatible = "qcom,mdmcalifornium-sim"

arch/arm/boot/dts/qcom/Makefile

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

	msmtitanium-rumi.dtb



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

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

	mdmfermium-cdp.dtb \

	mdmfermium-mtp.dtb



dtb-$(CONFIG_ARCH_MSM8916) += msm8952-qrd-skum.dtb \

       msm8952-cdp.dtb \

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

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.

 */



/dts-v1/;



#include "mdmfermium-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM FERMIUM CDP";

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

	qcom,board-id = <1 0>;

};

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

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

#include "mdmfermium-pinctrl.dtsi"



&soc {

};



&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

};

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

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.

 */



/dts-v1/;



#include "mdmfermium-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MDM FERMIUM MTP";

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

	qcom,board-id = <8 0>;

};