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

Commit e2caec41 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: move UFS ref clk pad supply to controller node in SDM845" into msm-4.9

parents fd5106f4 05480177
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -74,11 +74,8 @@

	vdda-phy-supply = <&pm8998_l1>; /* 0.88v */
	vdda-pll-supply = <&pm8998_l26>; /* 1.2v */
	vddp-ref-clk-supply = <&pm8998_l2>;
	vdda-phy-max-microamp = <62900>;
	vdda-pll-max-microamp = <18300>;
	vddp-ref-clk-max-microamp = <100>;
	vddp-ref-clk-always-on;

	status = "ok";
};
@@ -91,6 +88,9 @@
	vcc-max-microamp = <600000>;
	vccq2-max-microamp = <600000>;

	qcom,vddp-ref-clk-supply = <&pm8998_l2>;
	qcom,vddp-ref-clk-max-microamp = <100>;

	status = "ok";
};

@@ -99,11 +99,8 @@

	vdda-phy-supply = <&pm8998_l1>; /* 0.88v */
	vdda-pll-supply = <&pm8998_l26>; /* 1.2v */
	vddp-ref-clk-supply = <&pm8998_l2>;
	vdda-phy-max-microamp = <62900>;
	vdda-pll-max-microamp = <18300>;
	vddp-ref-clk-max-microamp = <100>;
	vddp-ref-clk-always-on;

	status = "ok";
};
@@ -116,5 +113,8 @@
	vcc-max-microamp = <300000>;
	vccq2-max-microamp = <300000>;

	qcom,vddp-ref-clk-supply = <&pm8998_l2>;
	qcom,vddp-ref-clk-max-microamp = <100>;

	status = "ok";
};
+6 −6
Original line number Diff line number Diff line
@@ -59,11 +59,8 @@

	vdda-phy-supply = <&pm8998_l1>; /* 0.88v */
	vdda-pll-supply = <&pm8998_l26>; /* 1.2v */
	vddp-ref-clk-supply = <&pm8998_l2>;
	vdda-phy-max-microamp = <62900>;
	vdda-pll-max-microamp = <18300>;
	vddp-ref-clk-max-microamp = <100>;
	vddp-ref-clk-always-on;

	status = "ok";
};
@@ -76,6 +73,9 @@
	vcc-max-microamp = <600000>;
	vccq2-max-microamp = <600000>;

	qcom,vddp-ref-clk-supply = <&pm8998_l2>;
	qcom,vddp-ref-clk-max-microamp = <100>;

	status = "ok";
};

@@ -84,11 +84,8 @@

	vdda-phy-supply = <&pm8998_l1>; /* 0.88v */
	vdda-pll-supply = <&pm8998_l26>; /* 1.2v */
	vddp-ref-clk-supply = <&pm8998_l2>;
	vdda-phy-max-microamp = <62900>;
	vdda-pll-max-microamp = <18300>;
	vddp-ref-clk-max-microamp = <100>;
	vddp-ref-clk-always-on;

	status = "ok";
};
@@ -101,5 +98,8 @@
	vcc-max-microamp = <300000>;
	vccq2-max-microamp = <300000>;

	qcom,vddp-ref-clk-supply = <&pm8998_l2>;
	qcom,vddp-ref-clk-max-microamp = <100>;

	status = "ok";
};
+6 −6
Original line number Diff line number Diff line
@@ -17,11 +17,8 @@

	vdda-phy-supply = <&pm8998_l1>;
	vdda-pll-supply = <&pm8998_l2>;
	vddp-ref-clk-supply = <&pm8998_l26>;
	vdda-phy-max-microamp = <44000>;
	vdda-pll-max-microamp = <14600>;
	vddp-ref-clk-max-microamp = <100>;
	vddp-ref-clk-always-on;

	status = "ok";
};
@@ -38,6 +35,9 @@
	vcc-max-microamp = <600000>;
	vccq2-max-microamp = <600000>;

	qcom,vddp-ref-clk-supply = <&pm8998_l26>;
	qcom,vddp-ref-clk-max-microamp = <100>;

	qcom,disable-lpm;
	rpm-level = <0>;
	spm-level = <0>;
@@ -122,11 +122,8 @@

	vdda-phy-supply = <&pm8998_l1>; /* 0.88v */
	vdda-pll-supply = <&pm8998_l26>; /* 1.2v */
	vddp-ref-clk-supply = <&pm8998_l2>;
	vdda-phy-max-microamp = <62900>;
	vdda-pll-max-microamp = <18300>;
	vddp-ref-clk-max-microamp = <100>;
	vddp-ref-clk-always-on;

	status = "ok";
};
@@ -142,6 +139,9 @@
	vcc-max-microamp = <300000>;
	vccq2-max-microamp = <300000>;

	qcom,vddp-ref-clk-supply = <&pm8998_l2>;
	qcom,vddp-ref-clk-max-microamp = <100>;

	qcom,disable-lpm;
	rpm-level = <0>;
	spm-level = <0>;