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

Commit 6044c2fa 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 MTP and CDP dts files for msm8992 devices with PM8004"

parents ad04842a 6c5f3fcb

arch/arm/boot/dts/qcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -242,7 +242,9 @@ dtb-$(CONFIG_ARCH_MSM8994) += msm8994-v1-sim.dtb \ 
dtb-$(CONFIG_ARCH_MSM8992) += msm8992-sim.dtb \

	msm8992-rumi.dtb \

	msm8992-cdp.dtb \

	msm8992-mtp.dtb

	msm8992-mtp.dtb \

	msm8992-pmi8994-pm8004-cdp.dtb \

	msm8992-pmi8994-pm8004-mtp.dtb



DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

ifneq ($(DTB_NAMES),)

arch/arm/boot/dts/qcom/msm8992-pm8994-pmi8994-pm8004.dtsi

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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-pm8004.dtsi"



/ {

	qcom,pmic-id = <0x10009 0x1000A 0x1000C 0x0>;

};



&rpm_bus {

	rpm-regulator-smpb2 {

		status = "disabled";

	};



	rpm-regulator-smpc2 {

		status = "okay";

		regulator-s2-corner {

			status = "okay";

		};



		regulator-s2-floor-corner {

			status = "okay";

		};

	};

};



/*

 * Override PMI8994 resources with proper PM8004 resources for

 * MSM8992 with PM8004.

 */



&soc {

	qcom,msm-thermal {

		vdd-gfx-supply = <&pm8004_s2_floor_corner>;

	};

};



&gdsc_oxili_gx {

	parent-supply = <&pm8004_s2_corner>;

};

arch/arm/boot/dts/qcom/msm8992-pmi8994-pm8004-cdp.dts

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "msm8992.dtsi"

#include "msm8992-pm8994-pmi8994-pm8004.dtsi"

#include "msm8992-pinctrl.dtsi"

#include "msm8992-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8992 + PMI8994 + PM8004 CDP ";

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

	qcom,board-id = <1 0>;

};

arch/arm/boot/dts/qcom/msm8992-pmi8994-pm8004-mtp.dts

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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 "msm8992.dtsi"

#include "msm8992-pm8994-pmi8994-pm8004.dtsi"

#include "msm8992-pinctrl.dtsi"

#include "msm8992-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8992 + PMI8994 + PM8004 MTP";

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

	qcom,board-id = <8 0>;

};

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

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
	model = "Qualcomm Technologies, Inc. MSM 8992";

	compatible = "qcom,msm8992";

	qcom,msm-id = <251 0>, <252 0>;

	qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>;

	interrupt-parent = <&intc>;



	aliases {