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

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

Merge "rpm-smd: Remove redundant spinlocks which are not required"

parents 886868d7 7fbf64f4
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Properties:
		"qcom,mpm-gic-trinket"
		"qcom,mpm-gic-mdm9607"
		"qcom,mpm-gic-sdm660"
		"qcom,mpm-gic-sdm429"

- interrupts:
	Usage: required
@@ -85,6 +86,7 @@ properties:
		"qcom,mpm-gpio-trinket",
		"qcom,mpm-gpio-mdm9607"
		"qcom,mpm-gpio-sdm660"
		"qcom,mpm-gpio-sdm429"

- interrupt-parent:
	Usage: required
+2 −0
Original line number Diff line number Diff line
@@ -521,6 +521,8 @@ CONFIG_QCOM_RUN_QUEUE_STATS=y
CONFIG_QCOM_QMI_HELPERS=y
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMD_RPM=y
CONFIG_MSM_SPM=y
CONFIG_MSM_L2_SPM=y
CONFIG_QCOM_MEMORY_DUMP_V2=y
CONFIG_QCOM_WATCHDOG_V2=y
CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
+2 −0
Original line number Diff line number Diff line
@@ -539,6 +539,8 @@ CONFIG_QCOM_RUN_QUEUE_STATS=y
CONFIG_QCOM_QMI_HELPERS=y
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMD_RPM=y
CONFIG_MSM_SPM=y
CONFIG_MSM_L2_SPM=y
CONFIG_QCOM_MEMORY_DUMP_V2=y
CONFIG_QCOM_WATCHDOG_V2=y
CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
+2 −0
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@
		compatible = "qcom,sdm429w-pinctrl";
		reg = <0x1000000 0x300000>;
		reg-names = "pinctrl";
		interrupts-extended = <&wakegic GIC_SPI 208 IRQ_TYPE_NONE>;
		gpio-controller;
		#gpio-cells = <2>;
		interrupt-controller;
		interrupt-parent = <&wakegpio>;
		#interrupt-cells = <2>;

		pmx-uartconsole {
+166 −0
Original line number Diff line number Diff line
/* Copyright (c) 2020, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

#include <dt-bindings/msm/pm.h>

&soc {
	qcom,spm@b1d2000 {
		compatible = "qcom,spm-v2";
		#address-cells = <1>;
		#size-cells = <1>;
		reg = <0xb1d2000 0x1000>;
		qcom,name = "system-cci";
		qcom,saw2-ver-reg = <0xfd0>;
		qcom,saw2-cfg = <0x14>;
		qcom,saw2-spm-dly= <0x3C102800>;
		qcom,saw2-spm-ctl = <0xe>;
		qcom,cpu-vctl-list = <&CPU0 &CPU1 &CPU2 &CPU3>;
		qcom,vctl-timeout-us = <500>;
		qcom,vctl-port = <0x0>;
		qcom,vctl-port-ub = <0x1>;
		qcom,pfm-port = <0x2>;
	};

	qcom,lpm-levels {
		compatible = "qcom,lpm-levels";
		qcom,use-psci;
		#address-cells = <1>;
		#size-cells = <0>;

		qcom,pm-cluster@0 {
			reg = <0>;
			#address-cells = <1>;
			#size-cells = <0>;
			label = "system";
			qcom,psci-mode-shift = <8>;
			qcom,psci-mode-mask = <0xf>;

			qcom,pm-cluster-level@1{
				reg = <0>;
				label = "system-wfi";
				qcom,psci-mode = <1>;
				qcom,entry-latency-us = <575>;
				qcom,exit-latency-us = <475>;
				qcom,min-residency-us = <1250>;
				qcom,min-child-idx = <1>;
			};

			qcom,pm-cluster-level@2{
				reg = <2>;
				label = "system-ret";
				qcom,psci-mode = <2>;
				qcom,entry-latency-us = <350>;
				qcom,exit-latency-us = <900>;
				qcom,min-residency-us = <2339>;
				qcom,min-child-idx = <1>;
			};

			qcom,pm-cluster-level@3{
				reg = <3>;
				label = "system-pc";
				qcom,psci-mode = <3>;
				qcom,entry-latency-us = <644>;
				qcom,exit-latency-us = <10782>;
				qcom,min-residency-us = <5339>;
				qcom,min-child-idx = <2>;
				qcom,notify-rpm;
				qcom,is-reset;
			};

			qcom,pm-cluster@0{
				reg = <0>;
				#address-cells = <1>;
				#size-cells = <0>;
				label = "perf";
				qcom,psci-mode-shift = <4>;
				qcom,psci-mode-mask = <0xf>;

				qcom,pm-cluster-level@0{
					reg = <0>;
					label = "perf-l2-wfi";
					qcom,psci-mode = <1>;
					qcom,entry-latency-us = <210>;
					qcom,exit-latency-us = <116>;
					qcom,min-residency-us = <400>;
				};

				qcom,pm-cluster-level@1{
					reg = <1>;
					label = "perf-l2-gdhs";
					qcom,psci-mode = <4>;
					qcom,exit-latency-us = <267>;
					qcom,entry-latency-us = <360>;
					qcom,min-residency-us = <966>;
					qcom,min-child-idx = <1>;
				};

				qcom,pm-cluster-level@2{
					reg = <2>;
					label = "perf-l2-pc";
					qcom,psci-mode = <5>;
					qcom,exit-latency-us = <305>;
					qcom,entry-latency-us = <574>;
					qcom,min-residency-us = <3116>;
					qcom,min-child-idx = <1>;
					qcom,is-reset;
				};

				qcom,pm-cpu {
					#address-cells = <1>;
					#size-cells = <0>;
					qcom,psci-mode-shift = <0>;
					qcom,psci-mode-mask = <0xf>;
					qcom,cpu = <&CPU0 &CPU1 &CPU2 &CPU3>;

					qcom,pm-cpu-level@0 {
						reg = <0>;
						qcom,psci-cpu-mode = <0>;
						label = "wfi";
						qcom,exit-latency-us = <1>;
						qcom,entry-latency-us = <66>;
						qcom,min-residency-us = <83>;
					};

					qcom,pm-cpu-level@1 {
						reg = <1>;
						qcom,psci-cpu-mode = <3>;
						label = "pc";
						qcom,exit-latency-us = <190>;
						qcom,entry-latency-us = <136>;
						qcom,min-residency-us = <900>;
						qcom,use-broadcast-timer;
						qcom,is-reset;
					};
				};
			};

		};
	};

	qcom,rpm-stats@200000 {
		compatible = "qcom,rpm-stats";
		reg = <0x200000 0x1000>,
		      <0x290014 0x4>,
		      <0x29001c 0x4>;
		reg-names = "phys_addr_base", "offset_addr",
						"heap_phys_addrbase";
		qcom,sleep-stats-version = <2>;
	};

	qcom,rpm-master-stats@60150 {
		compatible = "qcom,rpm-master-stats";
		reg = <0x60150 0x5000>;
		qcom,masters = "APSS", "MPSS", "PRONTO", "TZ", "LPASS";
		qcom,master-stats-version = <2>;
		qcom,master-offset = <4096>;
	};
};
Loading