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

Commit ebcb00d9 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable low voltage VCC support for UFS on sm8150"

parents ad3da909 9428bb77

Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ Optional properties: 
- vcc-supply            : phandle to VCC supply regulator node

- vcc-supply            : phandle to VCC supply regulator node

- vcc-voltage-level     : specifies voltage levels for VCC supply.

- vcc-voltage-level     : specifies voltage levels for VCC supply.

                          Should be specified in pairs (min, max), units uV.

                          Should be specified in pairs (min, max), units uV.

- vcc-low-voltage-sup	: If specified, treats min voltage from vcc-voltage-level as

			  low voltage level different from max voltage.

- vccq-supply           : phandle to VCCQ supply regulator node

- vccq-supply           : phandle to VCCQ supply regulator node

- vccq2-supply          : phandle to VCCQ2 supply regulator node

- vccq2-supply          : phandle to VCCQ2 supply regulator node

- vccq2-voltage-level   : specifies voltage levels for VCCQ2 supply.

- vccq2-voltage-level   : specifies voltage levels for VCCQ2 supply.
@@ -76,6 +78,7 @@ Optional properties: 
			  Defaults to 26 MHz if not specified.

			  Defaults to 26 MHz if not specified.

- extcon:       phandle to external connector (Refer Documentation/devicetree/bindings/extcon/extcon-gpio.txt for more details).

- extcon:       phandle to external connector (Refer Documentation/devicetree/bindings/extcon/extcon-gpio.txt for more details).

- non-removable		: defines if the connected ufs device is not removable

- non-removable		: defines if the connected ufs device is not removable

- force-g4		: forces UFS Host PHY to be initialized in HS-G4









Note: If above properties are not defined it can be assumed that the supply

Note: If above properties are not defined it can be assumed that the supply
@@ -92,6 +95,7 @@ Example: 
		vdd-hba-fixed-regulator;

		vdd-hba-fixed-regulator;

		vcc-supply = <&xxx_reg1>;

		vcc-supply = <&xxx_reg1>;

		vcc-supply-1p8;

		vcc-supply-1p8;

		vcc-low-voltage-sup;

		vccq-supply = <&xxx_reg2>;

		vccq-supply = <&xxx_reg2>;

		vccq2-supply = <&xxx_reg3>;

		vccq2-supply = <&xxx_reg3>;

		vcc-max-microamp = 500000;

		vcc-max-microamp = 500000;
@@ -108,6 +112,7 @@ Example: 
		rpm-level = <3>;

		rpm-level = <3>;

		spm-level = <5>;

		spm-level = <5>;

		dev-ref-clk-freq = <0>; /* reference clock freq: 19.2 MHz */

		dev-ref-clk-freq = <0>; /* reference clock freq: 19.2 MHz */

		force-g4;

	};

	};





==== MSM UFS platform driver properties =====

==== MSM UFS platform driver properties =====

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -301,9 +301,12 @@ 
	vdd-hba-supply = <&ufs_phy_gdsc>;

	vdd-hba-supply = <&ufs_phy_gdsc>;

	vdd-hba-fixed-regulator;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8150_l10>;

	vcc-supply = <&pm8150_l10>;

	vcc-voltage-level = <2950000 2960000>;

	vcc-voltage-level = <2504000 2950000>;

	vcc-low-voltage-sup;

	vccq-supply = <&pm8150_l9>;

	vccq2-supply = <&pm8150_s4>;

	vccq2-supply = <&pm8150_s4>;

	vcc-max-microamp = <750000>;

	vcc-max-microamp = <750000>;

	vccq-max-microamp = <700000>;

	vccq2-max-microamp = <750000>;

	vccq2-max-microamp = <750000>;





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

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

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -276,9 +276,12 @@ 
	vdd-hba-supply = <&ufs_phy_gdsc>;

	vdd-hba-supply = <&ufs_phy_gdsc>;

	vdd-hba-fixed-regulator;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8150_l10>;

	vcc-supply = <&pm8150_l10>;

	vcc-voltage-level = <2950000 2960000>;

	vcc-voltage-level = <2504000 2950000>;

	vcc-low-voltage-sup;

	vccq-supply = <&pm8150_l9>;

	vccq2-supply = <&pm8150_s4>;

	vccq2-supply = <&pm8150_s4>;

	vcc-max-microamp = <750000>;

	vcc-max-microamp = <750000>;

	vccq-max-microamp = <700000>;

	vccq2-max-microamp = <750000>;

	vccq2-max-microamp = <750000>;





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

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

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -240,9 +240,12 @@ 
	vdd-hba-supply = <&ufs_phy_gdsc>;

	vdd-hba-supply = <&ufs_phy_gdsc>;

	vdd-hba-fixed-regulator;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8150_l10>;

	vcc-supply = <&pm8150_l10>;

	vcc-voltage-level = <2950000 2960000>;

	vcc-voltage-level = <2504000 2950000>;

	vcc-low-voltage-sup;

	vccq-supply = <&pm8150_l9>;

	vccq2-supply = <&pm8150_s4>;

	vccq2-supply = <&pm8150_s4>;

	vcc-max-microamp = <750000>;

	vcc-max-microamp = <750000>;

	vccq-max-microamp = <700000>;

	vccq2-max-microamp = <750000>;

	vccq2-max-microamp = <750000>;





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

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

arch/arm64/boot/dts/qcom/sm8150.dtsi

+9 −5
Original line number Original line Diff line number Diff line
@@ -2314,7 +2314,7 @@ 
			<0 0>;

			<0 0>;





		qcom,msm-bus,name = "ufshc_mem";

		qcom,msm-bus,name = "ufshc_mem";

		qcom,msm-bus,num-cases = <22>;

		qcom,msm-bus,num-cases = <26>;

		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,vectors-KBps =

		qcom,msm-bus,vectors-KBps =

		/*

		/*
@@ -2339,12 +2339,15 @@ 
		<123 512 127796 0>, <1 757 1000 0>,  /* HS G1 RA */

		<123 512 127796 0>, <1 757 1000 0>,  /* HS G1 RA */

		<123 512 255591 0>, <1 757 1000 0>,  /* HS G2 RA */

		<123 512 255591 0>, <1 757 1000 0>,  /* HS G2 RA */

		<123 512 2097152 0>, <1 757 102400 0>,  /* HS G3 RA */

		<123 512 2097152 0>, <1 757 102400 0>,  /* HS G3 RA */

		<123 512 4194304 0>, <1 757 204800 0>,  /* HS G4 RA */

		<123 512 255591 0>, <1 757 1000 0>,  /* HS G1 RA L2 */

		<123 512 255591 0>, <1 757 1000 0>,  /* HS G1 RA L2 */

		<123 512 511181 0>, <1 757 1000 0>,  /* HS G2 RA L2 */

		<123 512 511181 0>, <1 757 1000 0>,  /* HS G2 RA L2 */

		<123 512 4194304 0>, <1 757 204800 0>, /* HS G3 RA L2 */

		<123 512 4194304 0>, <1 757 204800 0>, /* HS G3 RA L2 */

		<123 512 8388608 0>, <1 757 409600 0>, /* HS G4 RA L2 */

		<123 512 149422 0>, <1 757 1000 0>,  /* HS G1 RB */

		<123 512 149422 0>, <1 757 1000 0>,  /* HS G1 RB */

		<123 512 298189 0>, <1 757 1000 0>,  /* HS G2 RB */

		<123 512 298189 0>, <1 757 1000 0>,  /* HS G2 RB */

		<123 512 2097152 0>, <1 757 102400 0>,  /* HS G3 RB */

		<123 512 2097152 0>, <1 757 102400 0>,  /* HS G3 RB */

		<123 512 4194304 0>, <1 757 204800 0>,  /* HS G4 RB */

		<123 512 298189 0>, <1 757 1000 0>,  /* HS G1 RB L2 */

		<123 512 298189 0>, <1 757 1000 0>,  /* HS G1 RB L2 */

		<123 512 596378 0>, <1 757 1000 0>,  /* HS G2 RB L2 */

		<123 512 596378 0>, <1 757 1000 0>,  /* HS G2 RB L2 */

		/* As UFS working in HS G3 RB L2 mode, aggregated

		/* As UFS working in HS G3 RB L2 mode, aggregated
@@ -2354,15 +2357,16 @@ 
		 * bindwidth (IB) needs to be given a proper value too.

		 * bindwidth (IB) needs to be given a proper value too.

		 */

		 */

		<123 512 4194304 0>, <1 757 204800 409600>, /* HS G3 RB L2 */

		<123 512 4194304 0>, <1 757 204800 409600>, /* HS G3 RB L2 */

		<123 512 8388608 0>, <1 757 409600 409600>, /* HS G4 RB L2 */

		<123 512 7643136 0>, <1 757 307200 0>; /* Max. bandwidth */

		<123 512 7643136 0>, <1 757 307200 0>; /* Max. bandwidth */





		qcom,bus-vector-names = "MIN",

		qcom,bus-vector-names = "MIN",

		"PWM_G1_L1", "PWM_G2_L1", "PWM_G3_L1", "PWM_G4_L1",

		"PWM_G1_L1", "PWM_G2_L1", "PWM_G3_L1", "PWM_G4_L1",

		"PWM_G1_L2", "PWM_G2_L2", "PWM_G3_L2", "PWM_G4_L2",

		"PWM_G1_L2", "PWM_G2_L2", "PWM_G3_L2", "PWM_G4_L2",

		"HS_RA_G1_L1", "HS_RA_G2_L1", "HS_RA_G3_L1",

		"HS_RA_G1_L1", "HS_RA_G2_L1", "HS_RA_G3_L1", "HS_RA_G4_L1",

		"HS_RA_G1_L2", "HS_RA_G2_L2", "HS_RA_G3_L2",

		"HS_RA_G1_L2", "HS_RA_G2_L2", "HS_RA_G3_L2", "HS_RA_G4_L2",

		"HS_RB_G1_L1", "HS_RB_G2_L1", "HS_RB_G3_L1",

		"HS_RB_G1_L1", "HS_RB_G2_L1", "HS_RB_G3_L1", "HS_RB_G4_L1",

		"HS_RB_G1_L2", "HS_RB_G2_L2", "HS_RB_G3_L2",

		"HS_RB_G1_L2", "HS_RB_G2_L2", "HS_RB_G3_L2", "HS_RB_G4_L2",

		"MAX";

		"MAX";





		/* PM QoS */

		/* PM QoS */