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

Commit 64315e66 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 MSMTITANIUM QRD SKU3"

parents 8834c693 5bded6da

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

+2 −0
Original line number Diff line number Diff line
@@ -264,6 +264,8 @@ compatible = "qcom,msmtitanium-rumi" 
compatible = "qcom,msmtitanium-sim"

compatible = "qcom,msmtitanium-cdp"

compatible = "qcom,msmtitanium-mtp"

compatible = "qcom,msmtitanium-qrd"

compatible = "qcom,msmtitanium-qrd-sku3"

compatible = "qcom,mdm9640-cdp"

compatible = "qcom,mdm9640-mtp"

compatible = "qcom,mdm9640-rumi"

arch/arm/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ dtb-$(CONFIG_ARCH_MSMTITANIUM) += msmtitanium-sim.dtb \ 
	msmtitanium-cdp.dtb \

	msmtitanium-mtp.dtb \

	msmtitanium-ext-codec-mtp.dtb \

	msmtitanium-qrd-sku3.dtb \

	msmtitanium-rcm.dtb \

	msmtitanium-ext-codec-rcm.dtb \

	apqtitanium-cdp.dtb \

arch/arm/boot/dts/qcom/msmtitanium-qrd-sku3.dts

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.

 */



/dts-v1/;



#include "msmtitanium.dtsi"

#include "msmtitanium-qrd-sku3.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSMTITANIUM QRD SKU3";

	compatible = "qcom,msmtitanium-qrd-sku3",

		   "qcom,msmtitanium-qrd", "qcom,msmtitanium", "qcom,qrd";

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

};

arch/arm/boot/dts/qcom/msmtitanium-qrd-sku3.dtsi

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

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

0 → 100644
+20 −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"



&blsp1_uart0 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};