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

Commit 3bd248f0 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 8992 CDP/MTP device tree files"

parents e2633e6a 4006f6a6

arch/arm/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -207,7 +207,9 @@ dtb-$(CONFIG_ARCH_MSM8994) += msm8994-v1-sim.dtb \ 
	apq8094-v2-fluid.dtb



dtb-$(CONFIG_ARCH_MSM8992) += msm8992-sim.dtb \

	msm8992-rumi.dtb

	msm8992-rumi.dtb \

	msm8992-cdp.dtb \

	msm8992-mtp.dtb



DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

ifneq ($(DTB_NAMES),)

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

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

#include "msm8992-pinctrl.dtsi"

#include "msm8992-cdp.dtsi"



/ {

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

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

	qcom,board-id = <1 0>;

};

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

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



&blsp1_uart2 {

	status= "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

};



&spi_0 {

	status = "disabled";

};

arch/arm/boot/dts/qcom/msm8992-mtp.dts

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

#include "msm8992-pinctrl.dtsi"

#include "msm8992-mtp.dtsi"



/ {

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

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

	qcom,board-id = <8 0>;

};

arch/arm/boot/dts/qcom/msm8992-mtp.dtsi

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



&blsp1_uart2 {

	status= "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

};



&spi_0 {

	status = "disabled";

};