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

Commit ccdc1194 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: Split the dts file of MSMGOLD for pmi8937/pmi8950"

parents c72cb46e e342398a

arch/arm/boot/dts/qcom/Makefile

+10 −5
Original line number Diff line number Diff line
@@ -107,11 +107,16 @@ dtb-$(CONFIG_ARCH_MSM8937) += msm8937-rumi.dtb \ 
	apq8037-pmi8937-mtp.dtb



dtb-$(CONFIG_ARCH_MSMGOLD) += msmgold-rumi.dtb \

	msmgold-cdp.dtb \

	msmgold-mtp.dtb \

	msmgold-rcm.dtb \

	apqgold-cdp.dtb \

	apqgold-mtp.dtb

	apqgold-pmi8937-cdp.dtb \

	apqgold-pmi8937-mtp.dtb \

	apqgold-pmi8950-cdp.dtb \

	apqgold-pmi8950-mtp.dtb \

	msmgold-pmi8937-cdp.dtb \

	msmgold-pmi8937-mtp.dtb \

	msmgold-pmi8950-cdp.dtb \

	msmgold-pmi8950-mtp.dtb \

	msmgold-pmi8937-rcm.dtb \

	msmgold-pmi8950-rcm.dtb



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

	msmtitanium-rumi.dtb \

arch/arm/boot/dts/qcom/apqgold-cdp.dts→arch/arm/boot/dts/qcom/apqgold-pmi8937-cdp.dts

+3 −2
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ 
/dts-v1/;



#include "apqgold.dtsi"

#include "msmgold-cdp.dtsi"

#include "msmgold-pmi8937-cdp.dtsi"



/ {

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

	model = "Qualcomm Technologies, Inc. APQGOLD-PMI8937 CDP";

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

	qcom,board-id= <1 0>;

	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;

};

arch/arm/boot/dts/qcom/apqgold-mtp.dts→arch/arm/boot/dts/qcom/apqgold-pmi8937-mtp.dts

+3 −2
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ 
/dts-v1/;



#include "apqgold.dtsi"

#include "msmgold-mtp.dtsi"

#include "msmgold-pmi8937-mtp.dtsi"



/ {

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

	model = "Qualcomm Technologies, Inc. APQGOLD-PMI8937 MTP";

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

	qcom,board-id= <8 0>;

	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;

};

arch/arm/boot/dts/qcom/apqgold-pmi8950-cdp.dts

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

#include "msmgold-pmi8950-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQGOLD-PMI8950 CDP";

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

	qcom,board-id= <1 0>;

	qcom,pmic-id = <0x10019 0x020011 0x0 0x0>;

};

arch/arm/boot/dts/qcom/apqgold-pmi8950-mtp.dts

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

#include "msmgold-pmi8950-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQGOLD-PMI8950 MTP";

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

	qcom,board-id= <8 0>;

	qcom,pmic-id = <0x10019 0x020011 0x0 0x0>;

};