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

Commit 2f78c8b0 authored by Todd Kjos's avatar Todd Kjos
Browse files

Merge remote-tracking branch 'aosp/android-4.19' into android-4.19-stable



Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
Change-Id: Ic799a450164a77a90bf1f0941f0b52ab538ab73e
parents 2b82910d 33442ca1
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ PROPERTIES
		Usage: required
		Definition: See soc/fsl/qman.txt and soc/fsl/bman.txt

- fsl,erratum-a050385
		Usage: optional
		Value type: boolean
		Definition: A boolean property. Indicates the presence of the
		erratum A050385 which indicates that DMA transactions that are
		split can result in a FMan lock.

=============================================================================
FMan MURAM Node

+32 −0
Original line number Diff line number Diff line
Regulator Proxy Consumer Bindings

Regulator proxy consumers provide a means to use a default regulator state
during bootup only which is removed at the end of boot.  This feature can be
used in situations where a shared regulator can be scaled between several
possible voltages and hardware requires that it be at a high level at the
beginning of boot before the consumer device responsible for requesting the
high level has probed.

Optional properties:
proxy-supply:			phandle of the regulator's own device node.
				This property is required if any of the three
				properties below are specified.
qcom,proxy-consumer-enable:	Boolean indicating that the regulator must be
				kept enabled during boot.
qcom,proxy-consumer-voltage:	List of two integers corresponding the minimum
				and maximum voltage allowed during boot in
				microvolts.
qcom,proxy-consumer-current:	Minimum current in microamps required during
				boot.

Example:

	foo_vreg: regulator@0 {
		regulator-name = "foo";
		regulator-min-microvolt = <1000000>;
		regulator-max-microvolt = <2000000>;
		proxy-supply = <&foo_vreg>;
		qcom,proxy-consumer-voltage = <1500000 2000000>;
		qcom,proxy-consumer-current = <25000>;
		qcom,proxy-consumer-enable;
	};
+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,9 @@ Optional property:
  Type: bool		thresholds, so the governors may mitigate by ensuring
			timing closures and other low temperature operating
			issues.
- wake-capable-sensor:	Set to true if thermal zone sensor is wake up capable
  Type: bool		and cooling devices binded to this thermal zone are not
  Size: none		affected during suspend.

Note: The delay properties are bound to the maximum dT/dt (temperature
derivative over time) in two situations for a thermal zone:
+18 −0
Original line number Diff line number Diff line
@@ -43,6 +43,17 @@ registered notifiers are called only if the target value is now different.
Clients of pm_qos need to save the returned handle for future use in other
pm_qos API functions.

The handle is a pm_qos_request object. By default the request object sets the
request type to PM_QOS_REQ_ALL_CORES, in which case, the PM QoS request
applies to all cores. However, the driver can also specify a request type to
be either of
        PM_QOS_REQ_ALL_CORES,
        PM_QOS_REQ_AFFINE_CORES,
        PM_QOS_REQ_AFFINE_IRQ,

Specify the cpumask when type is set to PM_QOS_REQ_AFFINE_CORES and specify
the IRQ number with PM_QOS_REQ_AFFINE_IRQ.

void pm_qos_update_request(handle, new_target_value):
Will update the list element pointed to by the handle with the new target value
and recompute the new aggregated target, calling the notification tree if the
@@ -56,6 +67,13 @@ the request.
int pm_qos_request(param_class):
Returns the aggregated value for a given PM QoS class.

int pm_qos_request_for_cpu(param_class, cpu):
Returns the aggregated value for a given PM QoS class for the specified cpu.

int pm_qos_request_for_cpumask(param_class, cpumask):
Returns the aggregated value for a given PM QoS class for the specified
cpumask.

int pm_qos_request_active(handle):
Returns if the request is still active, i.e. it has not been removed from a
PM QoS class constraints list.
+2 −2
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 19
SUBLEVEL = 113
SUBLEVEL = 114
EXTRAVERSION =
NAME = "People's Front"

@@ -827,7 +827,7 @@ LD_FLAGS_LTO_CLANG := -mllvm -import-instr-limit=5
KBUILD_LDFLAGS += $(LD_FLAGS_LTO_CLANG)
KBUILD_LDFLAGS_MODULE += $(LD_FLAGS_LTO_CLANG)

KBUILD_LDFLAGS_MODULE += -T $(srctree)/scripts/module-lto.lds
KBUILD_LDFLAGS_MODULE += -T scripts/module-lto.lds

# allow disabling only clang LTO where needed
DISABLE_LTO_CLANG := -fno-lto
Loading