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

Commit 7edbcc6a 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: Update energy costs for sdm439 and sdm429 targets"

parents 32854fd3 d8005471

arch/arm64/boot/dts/qcom/msm8937-cpu.dtsi

+18 −18
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
			reg = <0x100>;

			enable-method = "psci";

			efficiency = <1126>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_1>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L2_1: l2-cache {
@@ -83,7 +83,7 @@ 
			reg = <0x101>;

			enable-method = "psci";

			efficiency = <1126>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_1>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_101: l1-icache {
@@ -102,7 +102,7 @@ 
			reg = <0x102>;

			enable-method = "psci";

			efficiency = <1126>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_1>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_102: l1-icache {
@@ -121,7 +121,7 @@ 
			reg = <0x103>;

			enable-method = "psci";

			efficiency = <1126>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_1>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_103: l1-icache {
@@ -140,7 +140,7 @@ 
			reg = <0x0>;

			enable-method = "psci";

			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_0>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_1>;

			next-level-cache = <&L2_0>;

			#cooling-cells = <2>;

			L2_0: l2-cache {
@@ -164,7 +164,7 @@ 
			reg = <0x1>;

			enable-method = "psci";

			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_0>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_1>;

			next-level-cache = <&L2_0>;

			#cooling-cells = <2>;

			L1_I_1: l1-icache {
@@ -183,7 +183,7 @@ 
			reg = <0x2>;

			enable-method = "psci";

			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_0>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_1>;

			next-level-cache = <&L2_0>;

			#cooling-cells = <2>;

			L1_I_2: l1-icache {
@@ -202,7 +202,7 @@ 
			reg = <0x3>;

			enable-method = "psci";

			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_0>;

			sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_1>;

			next-level-cache = <&L2_0>;

			#cooling-cells = <2>;

			L1_I_3: l1-icache {
@@ -245,11 +245,11 @@ 
		};

		CLUSTER_COST_0: cluster-cost0 {

			busy-cost-data = <

				 500000  19

				 800000  29

				 900000  36

				1000000  46

				1100000  55

				 700000  85

				1000000  126

				1100000  152

				1250000  197

				1400000  239

			>;

			idle-cost-data = <

				4 3 2 1
@@ -257,11 +257,11 @@ 
		};

		CLUSTER_COST_1: cluster-cost1 {

			busy-cost-data = <

				 700000  85

				1000000  126

				1100000  152

				1250000  197

				1400000  239

				 500000  19

				 800000  29

				 900000  36

				1000000  46

				1100000  55

			>;

			idle-cost-data = <

				4 3 2 1

arch/arm64/boot/dts/qcom/sdm429-cpu.dtsi

+39 −4
Original line number Diff line number Diff line
@@ -13,16 +13,13 @@ 


/ {

	/delete-node/ cpus;

	/delete-node/ energy-costs;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		cpu-map {



			cluster0 {

			};



			cluster1 {

				core0 {

					cpu = <&CPU0>;

				};
@@ -44,6 +41,8 @@ 
			reg = <0x100>;

			enable-method = "psci";

			cpu-release-addr = <0x0 0x90000000>;

			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L2_1: l2-cache {
@@ -68,6 +67,8 @@ 
			reg = <0x101>;

			enable-method = "psci";

			cpu-release-addr = <0x0 0x90000000>;

			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_101: l1-icache {
@@ -86,6 +87,8 @@ 
			reg = <0x102>;

			enable-method = "psci";

			cpu-release-addr = <0x0 0x90000000>;

			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_102: l1-icache {
@@ -104,6 +107,8 @@ 
			reg = <0x103>;

			enable-method = "psci";

			cpu-release-addr = <0x0 0x90000000>;

			efficiency = <1024>;

			sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;

			next-level-cache = <&L2_1>;

			#cooling-cells = <2>;

			L1_I_103: l1-icache {
@@ -118,4 +123,34 @@ 


	};



	energy_costs: energy-costs {

		compatible = "sched-energy";



		CPU_COST_0: core-cost0 {

			busy-cost-data = <

				 800000	137

				1001600	165

				1305600	207

				1497600	256

				1708800	327

				1958400	445

			>;

			idle-cost-data = <

				100 80 60 40

			>;

		};

		CLUSTER_COST_0: cluster-cost0 {

			busy-cost-data = <

				 800000	49

				1001600	53

				1305600	61

				1497600	71

				1708800	85

				1958400	110

			>;

			idle-cost-data = <

				4 3 2 1

			>;

		};

	};

};

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

+55 −0
Original line number Diff line number Diff line
@@ -32,3 +32,58 @@ 
		/delete-property/ qcom,mipi-csi-vdd-supply;

	};

};



&energy_costs {

	compatible = "sched-energy";



	CPU_COST_0: core-cost0 {

		busy-cost-data = <

			8000000	137

			1001600	165

			1305600	207

			1497600	256

			1708800	327

			1958400	445

		>;

		idle-cost-data = <

			100 80 60 40

		>;

	};

	CPU_COST_1: core-cost1 {

		busy-cost-data = <

			8000000	45

			1001600	56

			1171200	71

			1305600	89

			1459200	120

		>;

		idle-cost-data = <

			40 20 10 8

		>;

	};

	CLUSTER_COST_0: cluster-cost0 {

			busy-cost-data = <

			8000000	49

			1001600	53

			1305600	61

			1497600	71

			1708800	85

			1958400	110

		>;

		idle-cost-data = <

			4 3 2 1

		>;

	};

	CLUSTER_COST_1: cluster-cost1 {

			busy-cost-data = <

			8000000	9

			1001600	10

			1171200	13

			1305600	15

			1459200	20

		>;

		idle-cost-data = <

			4 3 2 1

		>;

	};

};