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

Commit def0cbe9 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: disable removable UFS card slot for sdm845"

parents 21864791 d6b5188e

arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi

+0 −28
Original line number Diff line number Diff line
@@ -132,34 +132,6 @@ 
	status = "ok";

};



&ufsphy_card {

	compatible = "qcom,ufs-phy-qmp-v3";



	vdda-phy-supply = <&pm8998_l1>; /* 0.88v */

	vdda-pll-supply = <&pm8998_l26>; /* 1.2v */

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

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



	status = "ok";

};



&ufshc_card {

	vdd-hba-supply = <&ufs_card_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8998_l21>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&pm8998_s4>;

	vcc-max-microamp = <300000>;

	vccq2-max-microamp = <300000>;



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

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



	extcon = <&extcon_storage_cd>;



	status = "ok";

};



&sdhc_2 {

	vdd-supply = <&pm8998_l21>;

	qcom,vdd-voltage-level = <2950000 2960000>;

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

+0 −11
Original line number Diff line number Diff line
@@ -84,17 +84,6 @@ 
	/delete-property/ qcom,vddp-ref-clk-supply;

};



&ufsphy_card {

	/delete-property/ vdda-phy-supply;

	/delete-property/ vdda-pll-supply;

};



&ufshc_card {

	/delete-property/ vcc-supply;

	/delete-property/ vccq2-supply;

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

};



&sdhc_2 {

	/delete-property/ vdd-supply;

	/delete-property/ vdd-io-supply;

arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi

+0 −28
Original line number Diff line number Diff line
@@ -220,34 +220,6 @@ 
	status = "ok";

};



&ufsphy_card {

	compatible = "qcom,ufs-phy-qmp-v3";



	vdda-phy-supply = <&pm8998_l1>; /* 0.88v */

	vdda-pll-supply = <&pm8998_l26>; /* 1.2v */

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

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



	status = "ok";

};



&ufshc_card {

	vdd-hba-supply = <&ufs_card_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8998_l21>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&pm8998_s4>;

	vcc-max-microamp = <300000>;

	vccq2-max-microamp = <300000>;



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

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



	extcon = <&extcon_storage_cd>;



	status = "ok";

};



&sdhc_2 {

	vdd-supply = <&pm8998_l21>;

	qcom,vdd-voltage-level = <2950000 2960000>;

arch/arm64/boot/dts/qcom/sdm845-qrd.dtsi

+0 −28
Original line number Diff line number Diff line
@@ -137,34 +137,6 @@ 
	status = "ok";

};



&ufsphy_card {

	compatible = "qcom,ufs-phy-qmp-v3";



	vdda-phy-supply = <&pm8998_l1>; /* 0.88v */

	vdda-pll-supply = <&pm8998_l26>; /* 1.2v */

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

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



	status = "ok";

};



&ufshc_card {

	vdd-hba-supply = <&ufs_card_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8998_l21>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&pm8998_s4>;

	vcc-max-microamp = <300000>;

	vccq2-max-microamp = <300000>;



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

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



	extcon = <&extcon_storage_cd>;



	status = "ok";

};



&sdhc_2 {

	vdd-supply = <&pm8998_l21>;

	qcom,vdd-voltage-level = <2950000 2960000>;

arch/arm64/boot/dts/qcom/sdm845-rumi.dtsi

+0 −32
Original line number Diff line number Diff line
@@ -140,38 +140,6 @@ 
	qcom,cpr-ignore-invalid-fuses;

};



&ufsphy_card {

	compatible = "qcom,ufs-phy-qrbtc-sdm845";



	vdda-phy-supply = <&pm8998_l1>; /* 0.88v */

	vdda-pll-supply = <&pm8998_l26>; /* 1.2v */

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

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



	status = "ok";

};



&ufshc_card {

	limit-tx-hs-gear = <1>;

	limit-rx-hs-gear = <1>;



	vdd-hba-supply = <&ufs_card_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8998_l21>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&pm8998_s4>;

	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>;

	status = "ok";

};



&pmi8998_charger {

	qcom,suspend-input;

};