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

Commit 4531a2ec authored by David Collins's avatar David Collins
Browse files

ARM: dts: msm: add device trees for APQ8084 boards with new power grid 



Add device trees which are specific to APQ8084 boards which
utilize the new power grid.  The new power grid differs from the
older power grid in that the consumers and constraints of PMA8084
LDO 3 and LDO 4 have been swapped.  Since the new power grid will
be used by all boards going forward, treat it as a default.
Therefore, rename all dts files which correspond to boards using
the old power grid.

Change-Id: I35caccedcee59c303695fd96d3c1aae97da6fe68
Signed-off-by: default avatarDavid Collins <collinsd@codeaurora.org>
parent d2ba32f7

arch/arm/boot/dts/qcom/Makefile

+18 −10
Original line number Diff line number Diff line
@@ -96,23 +96,31 @@ dtb-$(CONFIG_ARCH_MPQ8092) += mpq8092-sim.dtb \ 
	mpq8092-cdp.dtb \

	mpq8092-dtv.dtb \

	mpq8092-dma.dtb

dtb-$(CONFIG_ARCH_APQ8084) += apq8084-v1.0-liquid.dtb \

dtb-$(CONFIG_ARCH_APQ8084) += apq8084-v1.0-old-pwr-grid-liquid.dtb \

	apq8084-v1.1-old-pwr-grid-liquid.dtb \

	apq8084-v1.1-liquid.dtb \

	apq8084-v1.0-smb1357-cdp.dtb \

	apq8084-v1.0-old-pwr-grid-smb1357-cdp.dtb \

	apq8084-v1.1-old-pwr-grid-smb1357-cdp.dtb \

	apq8084-v1.1-smb1357-cdp.dtb \

	apq8084-v1.0-smb1357-mtp.dtb \

	apq8084-v1.0-old-pwr-grid-smb1357-mtp.dtb \

	apq8084-v1.1-old-pwr-grid-smb1357-mtp.dtb \

	apq8084-v1.1-smb1357-mtp.dtb \

	apq8084-v1.0-smb1359-mdm9x35-alt-mtp.dtb \

	apq8084-v1.0-old-pwr-grid-smb1359-mdm9x35-alt-mtp.dtb \

	apq8084-v1.1-old-pwr-grid-smb1359-mdm9x35-alt-mtp.dtb \

	apq8084-v1.1-smb1359-mdm9x35-alt-mtp.dtb \

	apq8084-smb349-cdp.dtb \

	apq8084-smb349-mtp.dtb \

	apq8084-v1.0-smb1357-mdm9x35-alt-rcm.dtb \

	apq8084-old-pwr-grid-smb349-cdp.dtb \

	apq8084-old-pwr-grid-smb349-mtp.dtb \

	apq8084-v1.0-old-pwr-grid-smb1357-mdm9x35-alt-rcm.dtb \

	apq8084-v1.1-old-pwr-grid-smb1357-mdm9x35-alt-rcm.dtb \

	apq8084-v1.1-smb1357-mdm9x35-alt-rcm.dtb \

	apq8084-v1.0-smb1357-mdm9x35-mtp.dtb \

	apq8084-v1.0-old-pwr-grid-smb1357-mdm9x35-mtp.dtb \

	apq8084-v1.1-old-pwr-grid-smb1357-mdm9x35-mtp.dtb \

	apq8084-v1.1-smb1357-mdm9x35-mtp.dtb \

	apq8084-v1.0-smb1357-mdm9x35-cdp.dtb \

	apq8084-v1.0-old-pwr-grid-smb1357-mdm9x35-cdp.dtb \

	apq8084-v1.1-old-pwr-grid-smb1357-mdm9x35-cdp.dtb \

	apq8084-v1.1-smb1357-mdm9x35-cdp.dtb \

	apq8084-v1.0-mdm9x35-alt-cdp.dtb \

	apq8084-v1.0-old-pwr-grid-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-old-pwr-grid-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-mdm9x35-alt-cdp.dtb \

	apq8084-v1.1-sbc.dtb

dtb-$(CONFIG_ARCH_MSM) += msmplutonium-sim.dtb

arch/arm/boot/dts/qcom/apq8084-smb349-cdp.dts→arch/arm/boot/dts/qcom/apq8084-old-pwr-grid-smb349-cdp.dts

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



#include "apq8084.dtsi"

#include "apq8084-old-pwr-grid.dtsi"

#include "apq8084-cdp.dtsi"



/ {

	model = "Qualcomm APQ 8084, SMB349 CDP";

	model = "Qualcomm APQ 8084, Old Pwr Grid, SMB349 CDP";

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

	qcom,board-id = <1 0>,

			<1 1>,

arch/arm/boot/dts/qcom/apq8084-smb349-mtp.dts→arch/arm/boot/dts/qcom/apq8084-old-pwr-grid-smb349-mtp.dts

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



#include "apq8084.dtsi"

#include "apq8084-old-pwr-grid.dtsi"

#include "apq8084-mtp.dtsi"



/ {

	model = "Qualcomm APQ 8084, SMB349 MTP";

	model = "Qualcomm APQ 8084, Old Pwr Grid, SMB349 MTP";

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

	qcom,board-id = <8 1>;

};

arch/arm/boot/dts/qcom/apq8084-old-pwr-grid.dtsi

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

 */



/*

 * The consumers and constraints of PMA8084 LDO 3 and LDO 4 are swapped on

 * boards utilizing the old power grid.  This file should be included within

 * the dts file corresponding to any board utilizing the old power grid.  It

 * overrides property values found in apq8084.dtsi and apq8084-regulator.dtsi.

 */



&pma8084_l3 {

	regulator-min-microvolt = <1225000>;

	regulator-max-microvolt = <1225000>;

	qcom,init-voltage = <1225000>;

	qcom,init-current = <200>;

};



&pma8084_l4 {

	regulator-min-microvolt = <1000000>;

	regulator-max-microvolt = <1000000>;

	qcom,init-voltage = <1000000>;

	qcom,init-current = <50>;

};



&pcie0 {

	vreg-0.9-supply = <&pma8084_l4>;

};



&pcie1 {

	vreg-0.9-supply = <&pma8084_l4>;

};



&ufsphy1 {

	vdda-phy-supply = <&pma8084_l4>;

};



&sataphy0 {

	vdda-phy-supply = <&pma8084_l4>;

};



&ufs1 {

	vccq-supply = <&pma8084_l3>;

	vccq-max-microamp = <200000>;

};
 
 No newline at end of file

arch/arm/boot/dts/qcom/apq8084-regulator.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -173,10 +173,10 @@ 
	rpm-regulator-ldoa3 {

		status = "okay";

		pma8084_l3: regulator-l3 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

			qcom,init-voltage = <1225000>;

			qcom,init-current = <200>;

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

			qcom,init-voltage = <1000000>;

			qcom,init-current = <50>;

			regulator-boot-on;

			status = "okay";

		};
@@ -185,10 +185,10 @@ 
	rpm-regulator-ldoa4 {

		status = "okay";

		pma8084_l4: regulator-l4 {

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

			qcom,init-voltage = <1000000>;

			qcom,init-current = <50>;

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

			qcom,init-voltage = <1225000>;

			qcom,init-current = <450>;

			regulator-boot-on;

			status = "okay";

		};