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

Commit 79d7ef25 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 APQTHORIUM"

parents a3f3361b 2567a600

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

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ SoCs: 
- APQ8096

  compatible = "qcom,apq8096"



- APQTHORIUM

  compatible = "qcom,apqthorium"



- MDM9630

  compatible = "qcom,mdm9630"
@@ -151,6 +154,8 @@ compatible = "qcom,apq8096-cdp" 
compatible = "qcom,apq8096-mtp"

compatible = "qcom,apq8096-dragonboard"

compatible = "qcom,apq8096-liquid"

compatible = "qcom,apqthorium-cdp"

compatible = "qcom,apqthorium-mtp"

compatible = "qcom,mdm9630-cdp"

compatible = "qcom,mdm9630-mtp"

compatible = "qcom,mdm9630-sim"

arch/arm/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -88,7 +88,9 @@ dtb-$(CONFIG_ARCH_MDMCALIFORNIUM) += mdmcalifornium-sim.dtb \ 
dtb-$(CONFIG_ARCH_MSMTHORIUM) += msmthorium-rumi.dtb \

	msmthorium-cdp.dtb \

	msmthorium-mtp.dtb \

	msmthorium-rcm.dtb

	msmthorium-rcm.dtb \

	apqthorium-cdp.dtb \

	apqthorium-mtp.dtb



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

	msmtitanium-rumi.dtb

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

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

#include "msmthorium-cdp.dtsi"



/ {

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

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

	qcom,board-id= <1 0>;

};

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

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

#include "msmthorium-mtp.dtsi"



/ {

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

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

	qcom,board-id= <8 0>;

};

arch/arm/boot/dts/qcom/apqthorium.dtsi

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

/ {

	model = "Qualcomm Technologies, Inc. APQ Thorium";

	compatible = "qcom,apqthorium";

	qcom,msm-id = <295 0x0>;

};