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

Commit 0bdfb613 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 ufs regulators for msmfalcon interposer"

parents 072148d6 9931a7ca

arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon-cdp.dtsi

+7 −9
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ 
};



&ufsphy1 {

	vdda-phy-supply = <&pmcobalt_l1>;

	vdda-pll-supply = <&pmcobalt_l2>;

	vddp-ref-clk-supply = <&pmcobalt_l26>;

	vdda-phy-supply = <&pm2falcon_l1>;

	vdda-pll-supply = <&pmfalcon_l1>;

	vddp-ref-clk-supply = <&pmfalcon_l1>;

	vdda-phy-max-microamp = <51400>;

	vdda-pll-max-microamp = <14600>;

	vddp-ref-clk-max-microamp = <100>;
@@ -57,12 +57,10 @@ 
&ufs1 {

	vdd-hba-supply = <&gdsc_ufs>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pmcobalt_l20>;

	vccq-supply = <&pmcobalt_l26>;

	vccq2-supply = <&pmcobalt_s4>;

	vcc-max-microamp = <750000>;

	vccq-max-microamp = <560000>;

	vccq2-max-microamp = <750000>;

	vcc-supply = <&pm2falcon_l4>;

	vccq2-supply = <&pmfalcon_l8>;

	vcc-max-microamp = <500000>;

	vccq2-max-microamp = <600000>;

	status = "ok";

};

arch/arm/boot/dts/qcom/msmcobalt-interposer-msmfalcon-mtp.dtsi

+7 −9
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ 
};



&ufsphy1 {

	vdda-phy-supply = <&pmcobalt_l1>;

	vdda-pll-supply = <&pmcobalt_l2>;

	vddp-ref-clk-supply = <&pmcobalt_l26>;

	vdda-phy-supply = <&pm2falcon_l1>;

	vdda-pll-supply = <&pmfalcon_l1>;

	vddp-ref-clk-supply = <&pmfalcon_l1>;

	vdda-phy-max-microamp = <51400>;

	vdda-pll-max-microamp = <14600>;

	vddp-ref-clk-max-microamp = <100>;
@@ -58,12 +58,10 @@ 
&ufs1 {

	vdd-hba-supply = <&gdsc_ufs>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pmcobalt_l20>;

	vccq-supply = <&pmcobalt_l26>;

	vccq2-supply = <&pmcobalt_s4>;

	vcc-max-microamp = <750000>;

	vccq-max-microamp = <560000>;

	vccq2-max-microamp = <750000>;

	vcc-supply = <&pm2falcon_l4>;

	vccq2-supply = <&pmfalcon_l8>;

	vcc-max-microamp = <500000>;

	vccq2-max-microamp = <600000>;

	status = "ok";

};

arch/arm/boot/dts/qcom/msmcobalt-interposer-pmfalcon.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -81,18 +81,6 @@ 
	/delete-property/qca,bt-chip-pwd-supply;

};



&ufsphy1 {

	/delete-property/vdda-phy-supply;

	/delete-property/vdda-pll-supply;

	/delete-property/vddp-ref-clk-supply;

};



&ufs1 {

	/delete-property/vcc-supply;

	/delete-property/vccq-supply;

	/delete-property/vccq2-supply;

};



&sdhc_2 {

	/delete-property/vdd-supply;

	/delete-property/vdd-io-supply;