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

Commit 0a72f7d6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: dts: msm: latencies and affinity masks for 8994 and 8992""

parents d15c24a4 3068ba70

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

+6 −12
Original line number Diff line number Diff line
@@ -1678,12 +1678,9 @@ 
		interrupt-names = "hc_irq", "pwr_irq";



		qcom,bus-width = <8>;

		qcom,num-pm-qos-configs = <3>;

		qcom,cpu-dma-latency-us = <70 70 70>, <70 70 70>, <301 301 301>;

		qcom,cpu-affinity = "affine_cores", "affine_cores", "irq";

		qcom,cpu-affinity-mask = <0x0f 0x30 0x00>;

		qcom,default-rd-pm-qos = "cpu";

		qcom,default-wr-pm-qos = "cpu";

		qcom,cpu-dma-latency-us = <301>;

		qcom,cpu-affinity = "affine_cores";

		qcom,cpu-affinity-mask = <0x0f>;

		qcom,wakeup-on-idle;



		qcom,msm-bus,name = "sdhc1";
@@ -1721,12 +1718,9 @@ 
			 <&clock_gcc clk_gcc_sdcc2_apps_clk>;



		qcom,bus-width = <4>;

		qcom,num-pm-qos-configs = <3>;

		qcom,cpu-dma-latency-us = <70 70 70>, <70 70 70>, <301 301 301>;

		qcom,cpu-affinity = "affine_cores", "affine_cores", "irq";

		qcom,cpu-affinity-mask = <0x0f 0x30 0x00>;

		qcom,default-rd-pm-qos = "cpu";

		qcom,default-wr-pm-qos = "cpu";

		qcom,cpu-dma-latency-us = <301>;

		qcom,cpu-affinity = "affine_cores";

		qcom,cpu-affinity-mask = <0x0f>;

		qcom,wakeup-on-idle;



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

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

+9 −18
Original line number Diff line number Diff line
@@ -1102,12 +1102,9 @@ 
		interrupt-names = "hc_irq", "pwr_irq";



		qcom,bus-width = <8>;

		qcom,num-pm-qos-configs = <3>;

		qcom,cpu-dma-latency-us = <70 70 70>, <70 70 70>, <301 301 301>;

		qcom,cpu-affinity = "affine_cores", "affine_cores", "irq";

		qcom,cpu-affinity-mask = <0x0f 0xf0 0x00>;

		qcom,default-rd-pm-qos = "cpu";

		qcom,default-wr-pm-qos = "cpu";

		qcom,cpu-dma-latency-us = <301>;

		qcom,cpu-affinity = "affine_cores";

		qcom,cpu-affinity-mask = <0x0f>;

		qcom,wakeup-on-idle;



		qcom,msm-bus,name = "sdhc1";
@@ -1145,12 +1142,9 @@ 
			 <&clock_gcc clk_gcc_sdcc2_apps_clk>;



		qcom,bus-width = <4>;

		qcom,num-pm-qos-configs = <3>;

		qcom,cpu-dma-latency-us = <70 70 70>, <70 70 70>, <301 301 301>;

		qcom,cpu-affinity = "affine_cores", "affine_cores", "irq";

		qcom,cpu-affinity-mask = <0x0f 0xf0 0x00>;

		qcom,default-rd-pm-qos = "cpu";

		qcom,default-wr-pm-qos = "cpu";

		qcom,cpu-dma-latency-us = <301>;

		qcom,cpu-affinity = "affine_cores";

		qcom,cpu-affinity-mask = <0x0f>;

		qcom,wakeup-on-idle;



		qcom,msm-bus,name = "sdhc2";
@@ -1183,12 +1177,9 @@ 
			 <&clock_gcc clk_gcc_sdcc3_apps_clk>;



		qcom,bus-width = <4>;

		qcom,num-pm-qos-configs = <3>;

		qcom,cpu-dma-latency-us = <70 70 70>, <70 70 70>, <301 301 301>;

		qcom,cpu-affinity = "affine_cores", "affine_cores", "irq";

		qcom,cpu-affinity-mask = <0x0f 0xf0 0x00>;

		qcom,default-rd-pm-qos = "cpu";

		qcom,default-wr-pm-qos = "cpu";

		qcom,cpu-dma-latency-us = <301>;

		qcom,cpu-affinity = "affine_cores";

		qcom,cpu-affinity-mask = <0x0f>;

		qcom,wakeup-on-idle;



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