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

Commit 206f048e 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 the parent supply for CX GDSC for sdm845/670"

parents 0a88c535 4abca30d

arch/arm64/boot/dts/qcom/qcs605-lc.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -212,6 +212,11 @@ 
	vdd_gfx-supply = <&pm8005_s3_level>;

};



&gpu_cx_gdsc {

	/delete-property/ parent-supply;

	parent-supply = <&pm8005_s1_level>;

};



&gpu_gx_gdsc {

	/delete-property/ parent-supply;

	parent-supply = <&pm8005_s3_level>;

arch/arm64/boot/dts/qcom/qcs605-pm660-pm8005-regulator.dtsi

+5 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, 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
@@ -102,7 +102,8 @@ 
		pm8005_s1_level: regulator-pm8005-s1-level {

			regulator-name = "pm8005_s1_level";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;

			regulator-min-microvolt

				= <RPMH_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;

			qcom,min-dropout-voltage-level = <(-1)>;

		};
@@ -110,7 +111,8 @@ 
		pm8005_s1_level_ao: regulator-pm8005-s1-level-ao {

			regulator-name = "pm8005_s1_level_ao";

			qcom,set = <RPMH_REGULATOR_SET_ACTIVE>;

			regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;

			regulator-min-microvolt

				= <RPMH_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;

			qcom,min-dropout-voltage-level = <(-1)>;

		};

arch/arm64/boot/dts/qcom/sdm670-regulator.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ 
		pm660l_s3_level: regulator-pm660l-s3-level {

			regulator-name = "pm660l_s3_level";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;

			regulator-min-microvolt

				= <RPMH_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;

			qcom,min-dropout-voltage-level = <(-1)>;

		};
@@ -141,7 +142,8 @@ 
		pm660l_s3_level_ao: regulator-pm660l-s3-level-ao {

			regulator-name = "pm660l_s3_level_ao";

			qcom,set = <RPMH_REGULATOR_SET_ACTIVE>;

			regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;

			regulator-min-microvolt

				= <RPMH_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;

			qcom,min-dropout-voltage-level = <(-1)>;

		};

arch/arm64/boot/dts/qcom/sdm670.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2969,6 +2969,7 @@ 
};



&gpu_cx_gdsc {

	parent-supply = <&pm660l_s3_level>;

	status = "ok";

};

arch/arm64/boot/dts/qcom/sdm845-interposer-pm660.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -265,6 +265,10 @@ 
	/delete-property/ vdd_mx-supply;

};



&gpu_cx_gdsc {

	/delete-property/ parent-supply;

};



&gpu_gx_gdsc {

	/delete-property/ parent-supply;

};