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

Commit 4c89c66e 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: Support boards with PMI8996 and PMK8001 PMICs for msm8996v3"

parents 9813116f 7ac7a120

arch/arm/boot/dts/qcom/Makefile

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

	msm8996-v3-pmi8996-cdp.dtb \

	msm8996-v3-pmi8996-mtp.dtb \

	msm8996-v3-pmi8996-pmk8001-cdp.dtb \

	msm8996-v3-pmi8996-pmk8001-mtp.dtb \

	msm8996-v3-fluid.dtb \

	msm8996-v3-liquid.dtb \

	msm8996-v3-dtp.dtb \

arch/arm/boot/dts/qcom/msm8996-pm8994-pmi8996-pmk8001.dtsi

0 → 100644
+31 −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.

 */



/*

 * As a general rule, only chipset-specific property overrides should be placed

 * inside this file.

 */



#include "msm-pmi8996.dtsi"

#include "msm-pmk8001.dtsi"



/ {

	qcom,pmic-id = <0x20009 0x10013 0x10012 0x0>;

};



/*

 * Override PM8994 resources with proper PMK8001 resources for MSM8996 with

 * PMK8001.

 */

&pm8994_rtc {

	status = "disabled";

};

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

#include "msm8996-pm8994-pmi8996-pmk8001.dtsi"

#include "msm8996-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3 + PM8994 + PMI8996 + PMK8001 CDP";

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

	qcom,board-id = <1 0>;

};

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

#include "msm8996-pm8994-pmi8996-pmk8001.dtsi"

#include "msm8996-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 v3 + PM8994 + PMI8996 + PMK8001 MTP";

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

	qcom,board-id = <8 0>;

};