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

Commit 66458514 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: Modify mdmcalifornium cpu power level in PC"

parents fe9e3e0a fdc449b2
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@
		startup-delay-us = <100>;
		gpio = <&tlmm_pinmux 99 0>;
		enable-active-high;
		regulator-always-on;
	};
};

@@ -362,13 +363,11 @@
	lsm330-gyro@6a {
		compatible = "st,lsm330-gyro";
		reg = <0x6a>;
		vdd-supply = <&gyro_vreg>;
	};

	lsm330-accel@1d {
		compatible = "st,lsm330-accel";
		reg = <0x1d>;
		vdd-supply = <&gyro_vreg>;
	};
};

+3 −3
Original line number Diff line number Diff line
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2015-2017, 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
@@ -75,7 +75,7 @@
				reg = <2>;
				label = "l2-pc";
				qcom,latency-us = <30000>;
				qcom,ss-power = <5000>;
				qcom,ss-power = <4999>;
				qcom,energy-overhead = <60350000>;
				qcom,time-overhead = <7300>;
				qcom,min-child-idx = <2>;
@@ -110,7 +110,7 @@
					reg = <2>;
					qcom,spm-cpu-mode = "pc";
					qcom,latency-us = <30000>;
					qcom,ss-power = <5000>;
					qcom,ss-power = <4999>;
					qcom,energy-overhead = <60350000>;
					qcom,time-overhead = <7300>;
					qcom,reset-level = <LPM_RESET_LVL_PC>;