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

Commit 98025eec 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 support for msmcobalt v2"

parents e5ca458c 5e1ddb44

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

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,8 @@ compatible = "qcom,msm8996-mtp" 
compatible = "qcom,msm8996-adp"

compatible = "qcom,msmcobalt-sim"

compatible = "qcom,msmcobalt-rumi"

compatible = "qcom,msmcobalt-cdp"

compatible = "qcom,msmcobalt-mtp"

compatible = "qcom,msm8952-rumi"

compatible = "qcom,msm8952-sim"

compatible = "qcom,msm8952-qrd"

arch/arm/boot/dts/qcom/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -89,7 +89,13 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ 
	apq8096-v3-pmi8996-dragonboard.dtb



dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \

	msmcobalt-rumi.dtb

	msmcobalt-rumi.dtb \

	msmcobalt-cdp.dtb \

	msmcobalt-mtp.dtb \

	msmcobalt-v2-sim.dtb \

	msmcobalt-v2-rumi.dtb \

	msmcobalt-v2-mtp.dtb \

	msmcobalt-v2-cdp.dtb



dtb-$(CONFIG_ARCH_MDM9640) += mdm9640-sim.dtb \

	mdm9640-rumi.dtb \

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

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

#include "msmcobalt-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM cobalt";

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

	qcom,board-id = <1 0>;

};

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

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

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

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

#include "msmcobalt-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM cobalt v1";

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

	qcom,board-id = <8 0>;

};