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

Commit 1514e371 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 of PM3FALCON based MSMFALCON platform"

parents 5d267dee babcc512

arch/arm/boot/dts/qcom/Makefile

+17 −5
Original line number Diff line number Diff line
@@ -135,17 +135,29 @@ dtb-$(CONFIG_ARCH_MSM8998) += msm8998-sim.dtb \ 
dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb



dtb-$(CONFIG_ARCH_MSMFALCON) += msmfalcon-sim.dtb \

	msmfalcon-rumi.dtb \

	msmfalcon-cdp.dtb \

	msmfalcon-internal-codec-cdp.dtb \

	msmfalcon-mtp.dtb \

	msmfalcon-internal-codec-mtp.dtb \

	msmfalcon-rcm.dtb \

	msmfalcon-internal-codec-rcm.dtb \

	msmfalcon-cdp.dtb \

	msmfalcon-mtp.dtb \

	msmfalcon-qrd.dtb \

	msmfalcon-rcm.dtb \

	msmfalcon-rumi.dtb \

	msmfalcon-pm3falcon-cdp.dtb \

	msmfalcon-pm3falcon-mtp.dtb \

	msmfalcon-pm3falcon-qrd.dtb \

	msmfalcon-pm3falcon-rcm.dtb \

	msmfalcon-pm3falcon-rumi.dtb \

	msmfalcon-internal-codec-pm3falcon-cdp.dtb \

	msmfalcon-internal-codec-pm3falcon-mtp.dtb \

	msmfalcon-internal-codec-pm3falcon-rcm.dtb \

	msmfalcon-pm3falcon-sim.dtb \

	apqfalcon-cdp.dtb \

	apqfalcon-mtp.dtb \

	apqfalcon-rcm.dtb

	apqfalcon-rcm.dtb \

	apqfalcon-pm3falcon-cdp.dtb \

	apqfalcon-pm3falcon-mtp.dtb \

	apqfalcon-pm3falcon-rcm.dtb



dtb-$(CONFIG_ARCH_MSMTRITON) += msmtriton-rumi.dtb

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

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
#include "msmfalcon-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ FALCON CDP";

	model = "Qualcomm Technologies, Inc. APQ FALCON PMFALCON + PM2FALCON CDP";

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

	qcom,board-id = <1 0>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

			<0x0001001b 0x0201011a 0x0 0x0>;

};

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

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
#include "msmfalcon-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ FALCON MTP";

	model = "Qualcomm Technologies, Inc. APQ FALCON PMFALCON + PM2FALCON MTP";

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

	qcom,board-id = <8 0>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

			<0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm/boot/dts/qcom/apqfalcon-pm3falcon-cdp.dts

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

#include "msmfalcon-cdp.dtsi"

#include "msm-pm3falcon.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ FALCON PMFALCON + PM3FALCON CDP";

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

	qcom,board-id = <1 0>;

	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;

};

arch/arm/boot/dts/qcom/apqfalcon-pm3falcon-mtp.dts

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

#include "msmfalcon-mtp.dtsi"

#include "msm-pm3falcon.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ FALCON PMFALCON + PM3FALCON MTP";

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

	qcom,board-id = <8 0>;

	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;

};