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

Commit 93438b82 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 device tree for MSM8916 CDP & MTP"

parents 1c1c945f 77d199d3

arch/arm/boot/dts/qcom/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -29,7 +29,11 @@ dtb-$(CONFIG_ARCH_MSM8974) += msm8974-v1-cdp.dtb \ 
	msm8974pro-ac-pm8941-mtp.dtb \

	msm8974pro-ac-pma8084-pm8941-mtp.dtb

dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \

	msm8916-rumi.dtb

	msm8916-rumi.dtb \

	msm8916-cdp.dtb \

	msm8916-cdp-smb1360.dtb \

	msm8916-mtp.dtb \

	msm8916-mtp-smb1360.dtb

dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \

	msm8226-fluid.dtb \

	msm8226-v1-cdp.dtb \

arch/arm/boot/dts/qcom/msm8916-cdp-smb1360.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "msm8916-cdp.dtsi"



/ {

	model = "Qualcomm MSM 8916 CDP";

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

	qcom,board-id = <1 1>;

};

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "msm8916-cdp.dtsi"



/ {

	model = "Qualcomm MSM 8916 CDP";

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

	qcom,board-id = <1 0>;

};

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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "msm8916.dtsi"

#include "msm8916-pinctrl.dtsi"



/ {

	aliases {

		serial0 = &blsp1_uart2;

	};

};



&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

};

arch/arm/boot/dts/qcom/msm8916-mtp-smb1360.dts

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "msm8916-mtp.dtsi"



/ {

	model = "Qualcomm MSM 8916 MTP";

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

	qcom,board-id = <8 1>;

};