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

Commit 01364b5f authored by Matt Wagantall's avatar Matt Wagantall
Browse files

ARM: dts: msm: Split device trees for msm8996 v3.0 and msm8996 v3.1 



Separate device tree files for msm8996 v3.0 are introduced to
include overrides specific to this early version of msm8996 v3.
The v3.0 trees include the base configuration from msm8996-v3.dtsi.

msm8996 v3.1 and later will use device trees named "msm8996-v3-*"
directly.

v3.0 device trees are not created for board variants which are
known to not exist (ex. MTPs with pmk8001, and apq LiQUID and
FLUID variants).

Change-Id: Id64e19e979d7bc305edaceb9231045644c051376
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parent 456ea1ef

arch/arm/boot/dts/qcom/Makefile

+10 −2
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ 
	msm8996-v2-pmi8994-pm8004-mtp.dtb \

	msm8996-v2-pmi8994-pm8004-pmk8001-cdp.dtb \

	msm8996-v2-pmi8994-pm8004-pmk8001-mtp.dtb \

	msm8996-v2-fluid.dtb \

	msm8996-v2-liquid.dtb \

	msm8996-v3-pmi8994-cdp.dtb \

	msm8996-v3-pmi8994-mtp.dtb \

	msm8996-v3-pmi8994-pmk8001-cdp.dtb \
@@ -16,10 +18,16 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ 
	msm8996-v3-pmi8994-pm8004-mtp.dtb \

	msm8996-v3-pmi8994-pm8004-pmk8001-cdp.dtb \

	msm8996-v3-pmi8994-pm8004-pmk8001-mtp.dtb \

	msm8996-v2-fluid.dtb \

	msm8996-v3-fluid.dtb \

	msm8996-v2-liquid.dtb \

	msm8996-v3-liquid.dtb \

	msm8996-v3.0-pmi8994-cdp.dtb \

	msm8996-v3.0-pmi8994-mtp.dtb \

	msm8996-v3.0-pmi8994-pm8004-cdp.dtb \

	msm8996-v3.0-pmi8994-pm8004-mtp.dtb \

	msm8996-v3.0-pmi8994-pm8004-pmk8001-cdp.dtb \

	msm8996-v3.0-pmi8994-pmk8001-cdp.dtb \

	msm8996-v3.0-fluid.dtb \

	msm8996-v3.0-liquid.dtb \

	apq8096-v2-liquid.dtb \

	apq8096-v3-liquid.dtb \

	apq8096-v2-dragonboard.dtb \

arch/arm/boot/dts/qcom/msm8996-v3.0-fluid.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 "msm8996-v3.0.dtsi"

#include "msm8996-liquid.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3.0 FLUID";

	compatible = "qcom,msm8996-fluid", "qcom,msm8996", "qcom,fluid";

	qcom,board-id = <3 0>;

};

arch/arm/boot/dts/qcom/msm8996-v3.0-liquid.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 "msm8996-v3.0.dtsi"

#include "msm8996-liquid.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3.0 LiQUID";

	compatible = "qcom,msm8996-liquid", "qcom,msm8996", "qcom,liquid";

	qcom,board-id = <9 0>;

};

arch/arm/boot/dts/qcom/msm8996-v3.0-pmi8994-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 "msm8996-v3.0.dtsi"

#include "msm8996-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3.0 + PMI8994 CDP";

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

	qcom,board-id = <1 0>, <0x01000001 0>;

};

arch/arm/boot/dts/qcom/msm8996-v3.0-pmi8994-mtp.dts

0 → 100644
+33 −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 "msm8996-v3.0.dtsi"

#include "msm8996-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3.0 + PMI8994 MTP";

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

	qcom,board-id = <8 0>;

};



&i2c_7 {

	smb1351-charger@1d {

		compatible = "qcom,smb1351-charger";

		reg = <0x1d>;

		qcom,parallel-charger;

		qcom,float-voltage-mv = <4400>;

		qcom,recharge-mv = <100>;

	};

};