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

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

parents c0ff00fe 1e588c1c

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

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ compatible = "qcom,msm8916-qrd-skuid" 
compatible = "qcom,msm8916-qrd-skut1"

compatible = "qcom,msm8916-rumi"

compatible = "qcom,msm8916-sim"

compatible = "qcom,msmgold-cdp"

compatible = "qcom,msmgold-mtp"

compatible = "qcom,msmgold-rumi"

compatible = "qcom,msm8926-cdp"

compatible = "qcom,msm8926-mtp"

arch/arm/boot/dts/qcom/Makefile

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

	apq8037-pmi8937-mtp.dtb



dtb-$(CONFIG_ARCH_MSMGOLD) += msmgold-rumi.dtb

dtb-$(CONFIG_ARCH_MSMGOLD) += msmgold-rumi.dtb \

	msmgold-cdp.dtb \

	msmgold-mtp.dtb \

	msmgold-rcm.dtb



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

	msmtitanium-rumi.dtb \

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

#include "msmgold-cdp.dtsi"



/ {

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

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

	qcom,board-id= <1 0>;

};

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

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.

 */



#include "msmgold-pinctrl.dtsi"



&soc {

};



&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};

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

#include "msmgold-mtp.dtsi"



/ {

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

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

	qcom,board-id= <8 0>;

};