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

Commit 6410843d 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 initial support for msm8996 DTP EVT1 board"

parents 7d2ebcf9 4aee441e

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

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ compatible = "qcom,msm8994-sim" 
compatible = "qcom,msm8996-rumi"

compatible = "qcom,msm8996-sim"

compatible = "qcom,msm8996-cdp"

compatible = "qcom,msm8996-dtp"

compatible = "qcom,msm8996-fluid"

compatible = "qcom,msm8996-liquid"

compatible = "qcom,msm8996-mtp"

arch/arm/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ 
	msm8996-v2-pmi8994-pm8004-pmk8001-mtp.dtb \

	msm8996-v2-fluid.dtb \

	msm8996-v2-liquid.dtb \

	msm8996-v2-dtp.dtb \

	msm8996-v3-pmi8994-cdp.dtb \

	msm8996-v3-pmi8994-mtp.dtb \

	msm8996-v3-pmi8994-pmk8001-cdp.dtb \

arch/arm/boot/dts/qcom/msm8996-dtp.dtsi

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



/ {

	model = "Qualcomm Technologies, Inc. MSM8996 DTP";

	compatible = "qcom,msm8996-dtp", "qcom,msm8996", "qcom,qrd";

};



&uartblsp2dm1 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};

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

#include "msm8996-dtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8996 V2 DTP";

	compatible = "qcom,msm8996-dtp", "qcom,msm8996", "qcom,qrd";

	qcom,board-id= <0x1000b 0>;

};