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

Commit fb030197 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: qcom: defer ufs frequency table according to msm8994 version"

parents 4b248104 8c6c27a9

arch/arm/boot/dts/qcom/msm8994-v1.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ 
	regulator-max-microvolt = <1225000>;

};



&ufs1 {

	freq-table-hz =

	<100000000 171430000>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>;

};



&mem_acc0_vreg_corner {

	regulator-min-microvolt = <1>;

	regulator-max-microvolt = <3>;

arch/arm/boot/dts/qcom/msm8994-v2.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -336,6 +336,11 @@ 
	};

};



&ufs1 {

	freq-table-hz =

	<100000000 200000000>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>;

};



/* MDSS driver overrides */

&mdss_mdp {

	qcom,mdp-settings = <0x0117c 0x0000ffff>,

arch/arm/boot/dts/qcom/msm8994.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -1089,8 +1089,6 @@ 
			<&clock_gcc clk_gcc_ufs_tx_symbol_0_clk>,

			<&clock_gcc clk_gcc_ufs_rx_symbol_1_clk>,

			<&clock_gcc clk_gcc_ufs_tx_symbol_1_clk>;

			freq-table-hz =

			<100000000 171430000>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>, <0 0>;

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

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

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