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

Commit 91b31f1e authored by David Collins's avatar David Collins
Browse files

ARM: dts: qcom: add VDD_MX and CX subnodes for MMCX dependencies on Kona 

Add VDD_MX and VDD_CX rpmh-regulator subnodes which are used by
the VDD_MMCX regulator device.  Configure these sub nodes so that
a request for VDD_CX = minimum operating level is present any
time that VDD_MMCX is enabled.

This ensures that multimedia hardware blocks are not accidentally
reset due to VDD_MMCX being enabled when VDD_CX is not enabled.

Change-Id: I96156b47b941a6fed92516388556cbdd196905fe
parent 957b4c8f

qcom/kona-regulators.dtsi

+30 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
	rpmh-regulator-mxlvl {

		compatible = "qcom,rpmh-arc-regulator";

		qcom,resource-name = "mx.lvl";

		pm8150a_s3_mmcx_sup_level-parent-supply =

						<&VDD_CX_MMCX_SUPPLY_LEVEL>;



		VDD_MX_LEVEL: S3C_LEVEL:

		pm8150a_s3_level: regulator-pm8150a-s3-level {
@@ -30,6 +32,17 @@ 
			qcom,init-voltage-level =

				<RPMH_REGULATOR_LEVEL_RETENTION>;

		};



		VDD_MX_MMCX_SUPPLY_LEVEL: regulator-pm8150a-s3-mmcx-sup-level {

			regulator-name = "pm8150a_s3_mmcx_sup_level";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt =

				<RPMH_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

				<RPMH_REGULATOR_LEVEL_MAX>;

			qcom,init-voltage-level =

				<RPMH_REGULATOR_LEVEL_RETENTION>;

		};

	};



	/* PM8150 S3 + S2 + S1 = VDD_CX supply */
@@ -38,6 +51,7 @@ 
		qcom,resource-name = "cx.lvl";

		pm8150_s3_level-parent-supply = <&VDD_MX_LEVEL>;

		pm8150_s3_level_ao-parent-supply = <&VDD_MX_LEVEL_AO>;

		proxy-supply = <&VDD_CX_MMCX_SUPPLY_LEVEL>;



		VDD_CX_LEVEL: S3A_LEVEL:

		pm8150_s3_level: regulator-pm8150-s3-level {
@@ -64,6 +78,21 @@ 
				<RPMH_REGULATOR_LEVEL_RETENTION>;

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

		};



		VDD_CX_MMCX_SUPPLY_LEVEL: regulator-pm8150-s3-mmcx-sup-level {

			regulator-name = "pm8150_s3_mmcx_sup_level";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt =

				<RPMH_REGULATOR_LEVEL_MIN_SVS>;

			regulator-max-microvolt =

				<RPMH_REGULATOR_LEVEL_MAX>;

			qcom,init-voltage-level =

				<RPMH_REGULATOR_LEVEL_MIN_SVS>;

			qcom,proxy-consumer-enable;

			qcom,proxy-consumer-voltage

				= <RPMH_REGULATOR_LEVEL_TURBO

				   RPMH_REGULATOR_LEVEL_MAX>;

		};

	};



	rpmh-regulator-smpa4 {
@@ -454,7 +483,7 @@ 
	rpmh-regulator-mmcxlvl {

		compatible = "qcom,rpmh-arc-regulator";

		qcom,resource-name = "mmcx.lvl";

		pm8150a_s4_level-parent-supply = <&VDD_MX_LEVEL>;

		pm8150a_s4_level-parent-supply = <&VDD_MX_MMCX_SUPPLY_LEVEL>;

		pm8150a_s4_level_ao-parent-supply = <&VDD_MX_LEVEL_AO>;

		proxy-supply = <&VDD_MMCX_LEVEL>;