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

Commit 65f1b8e1 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: remove mem_acc regulators from APC CPR regulators on msm8992"

parents 9caf9570 3cf0387b

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -577,6 +577,7 @@ 
		qcom,corner-acc-map = <1 1 0 0>;

		qcom,corner-acc-map = <1 1 0 0>;

		qcom,acc-sel-l1-bit-pos = <0>;

		qcom,acc-sel-l1-bit-pos = <0>;

		qcom,acc-sel-l1-bit-size = <1>;

		qcom,acc-sel-l1-bit-size = <1>;

		status = "disabled";

	};

	};





	mem_acc1_vreg_corner: mem-acc1-regulator {

	mem_acc1_vreg_corner: mem-acc1-regulator {
@@ -589,6 +590,7 @@ 
		qcom,corner-acc-map = <1 1 0 0>;

		qcom,corner-acc-map = <1 1 0 0>;

		qcom,acc-sel-l1-bit-pos = <1>;

		qcom,acc-sel-l1-bit-pos = <1>;

		qcom,acc-sel-l1-bit-size = <1>;

		qcom,acc-sel-l1-bit-size = <1>;

		status = "disabled";

	};

	};





	apc0_vreg_corner: regulator@f9019000 {

	apc0_vreg_corner: regulator@f9019000 {
@@ -610,8 +612,6 @@ 
		qcom,vdd-mx-vmin-method = <4>;

		qcom,vdd-mx-vmin-method = <4>;

		vdd-mx-supply = <&pm8994_s2_corner_ao>;

		vdd-mx-supply = <&pm8994_s2_corner_ao>;





		mem-acc-supply = <&mem_acc0_vreg_corner>;



		qcom,cpr-ref-clk = <19200>;

		qcom,cpr-ref-clk = <19200>;

		qcom,cpr-timer-delay = <5000>;

		qcom,cpr-timer-delay = <5000>;

		qcom,cpr-timer-cons-up = <0>;

		qcom,cpr-timer-cons-up = <0>;
@@ -706,8 +706,6 @@ 
		qcom,vdd-mx-vmin-method = <4>;

		qcom,vdd-mx-vmin-method = <4>;

		vdd-mx-supply = <&pm8994_s2_corner_ao>;

		vdd-mx-supply = <&pm8994_s2_corner_ao>;





		mem-acc-supply = <&mem_acc1_vreg_corner>;



		qcom,cpr-ref-clk = <19200>;

		qcom,cpr-ref-clk = <19200>;

		qcom,cpr-timer-delay = <5000>;

		qcom,cpr-timer-delay = <5000>;

		qcom,cpr-timer-cons-up = <0>;

		qcom,cpr-timer-cons-up = <0>;