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

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

Merge "ARM: dts: msm: Enable force stop notificaiton from HLOS to npu"

parents 1b6929a9 eae84a8c

qcom/kona-npu.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
				<&clock_npucc NPU_CC_DPM_TEMP_CLK>,

				<&clock_npucc NPU_CC_CAL_HM0_DPM_IP_CLK>,

				<&clock_npucc NPU_CC_CAL_HM1_DPM_IP_CLK>,

				<&clock_npucc NPU_CC_ATB_CLK>,

				<&clock_npucc NPU_CC_S2P_CLK>,

				<&clock_npucc NPU_CC_BWMON_CLK>,

				<&clock_npucc NPU_CC_CAL_HM0_PERF_CNT_CLK>,
@@ -68,7 +67,6 @@ 
				"dpm_temp_clk",

				"cal_hm0_dpm_ip_clk",

				"cal_hm1_dpm_ip_clk",

				"atb_clk",

				"s2p_clk",

				"bwmon_clk",

				"cal_hm0_perf_cnt_clk",
@@ -127,7 +125,6 @@ 
					50000000

					200000000

					200000000

					60000000

					50000000

					19200000

					300000000
@@ -161,7 +158,6 @@ 
					50000000

					466000000

					466000000

					120000000

					50000000

					19200000

					466000000
@@ -195,7 +191,6 @@ 
					50000000

					533000000

					533000000

					240000000

					50000000

					19200000

					533000000
@@ -229,7 +224,6 @@ 
					100000000

					850000000

					850000000

					240000000

					100000000

					19200000

					850000000
@@ -263,7 +257,6 @@ 
					100000000

					1000000000

					1000000000

					30000000

					100000000

					19200000

					1000000000

qcom/kona-v2.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ 
				50000000

				200000000

				200000000

				60000000

				50000000

				19200000

				300000000
@@ -240,7 +239,6 @@ 
				50000000

				406000000

				406000000

				120000000

				50000000

				19200000

				406000000
@@ -274,7 +272,6 @@ 
				50000000

				533000000

				533000000

				240000000

				50000000

				19200000

				533000000
@@ -308,7 +305,6 @@ 
				100000000

				730000000

				730000000

				240000000

				100000000

				19200000

				730000000
@@ -342,7 +338,6 @@ 
				100000000

				920000000

				920000000

				30000000

				100000000

				19200000

				920000000
@@ -376,7 +371,6 @@ 
				100000000

				1000000000

				1000000000

				30000000

				100000000

				19200000

				1000000000

qcom/kona.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -4134,6 +4134,10 @@ 
		qcom,pas-id = <23>;

		qcom,firmware-name = "npu";

		memory-region = <&pil_npu_mem>;



		/* Outputs to npu */

		qcom,smem-states = <&npu_smp2p_out 0>;

		qcom,smem-state-names = "qcom,force-stop";

	};



	qcom,smp2p_sleepstate {

qcom/lito.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -3585,6 +3585,10 @@ 
		qcom,pas-id = <23>;

		qcom,firmware-name = "npu";

		memory-region = <&pil_npu_mem>;



		/* Outputs to npu */

		qcom,smem-states = <&npu_smp2p_out 0>;

		qcom,smem-state-names = "qcom,force-stop";

	};



	qfprom: qfprom@780000 {