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

Commit ffcd5aa6 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 MSMGOLD QRD board"

parents b7ca2f4c dcf14462

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

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ compatible = "qcom,msm8916-sim" 
compatible = "qcom,msmgold-cdp"

compatible = "qcom,msmgold-mtp"

compatible = "qcom,msmgold-rumi"

compatible = "qcom,msmgold-qrd"

compatible = "qcom,msmgold-qrd-sku5"

compatible = "qcom,msm8926-cdp"

compatible = "qcom,msm8926-mtp"

compatible = "qcom,msm8926-qrd"

arch/arm/boot/dts/qcom/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ dtb-$(CONFIG_ARCH_MSMGOLD) += msmgold-rumi.dtb \ 
	msmgold-pmi8950-ext-codec-cdp.dtb \

	msmgold-pmi8950-mtp.dtb \

	msmgold-pmi8937-rcm.dtb \

	msmgold-pmi8950-rcm.dtb

	msmgold-pmi8950-rcm.dtb \

	msmgold-pmi8937-qrd-sku5.dtb



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

	msmtitanium-rumi.dtb \

arch/arm/boot/dts/qcom/msmgold-pmi8937-qrd-sku5.dts

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, 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-pmi8937-qrd-sku5.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSMGOLD-PMI8937 QRD SKU5";

	compatible = "qcom,msmgold-qrd-sku5", "qcom,msmgold-qrd",

		   "qcom,msmgold", "qcom,qrd";

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

};

arch/arm/boot/dts/qcom/msmgold-pmi8937-qrd-sku5.dtsi

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, 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 "msm-pmi8937.dtsi"

#include "msmgold-qrd.dtsi"

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

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, 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"



&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

};