Merge "DOWNSTREAM: Merge AU267 commit... (e075e04f) · Commits · e / devices / android_kernel_fairphone_FP3

.gitignore

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -114,3 +114,6 @@ all.config

	# Kdevelop4		# Kdevelop4
	*.kdev4		*.kdev4

			# fetched Android config fragments
			kernel/configs/android-*.cfg

Documentation/devicetree/bindings/arm/msm/mdm-modem.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -110,6 +110,10 @@ Optional driver parameters:
	on behalf of the subsystem driver.		on behalf of the subsystem driver.
	- qcom,mdm-link-info: a string indicating additional info about the physical link.		- qcom,mdm-link-info: a string indicating additional info about the physical link.
	For example: "devID_domain.bus.slot" in case of PCIe.		For example: "devID_domain.bus.slot" in case of PCIe.
			- qcom,mdm-auto-boot: Boolean. To indicate this instance of esoc boots independently.
			- qcom,mdm-statusline-not-a-powersource: Boolean. If set, status line to esoc device is not a
			power source.
			- qcom,mdm-userspace-handle-shutdown: Boolean. If set, userspace handles shutdown requests.

	Example:		Example:
	mdm0: qcom,mdm0 {		mdm0: qcom,mdm0 {

Documentation/devicetree/bindings/arm/msm/msm_core.txt

deleted100644 → 0

+0 −71

Original line number	Original line	Diff line number	Diff line
	MSM Core Energy Aware driver

	The Energy Aware driver provides per core power and temperature
	information to the scheduler for it to make more power efficient
	scheduling decision.

	The required properties for the Energy-aware driver are:

	- compatible: "qcom,apss-core-ea"
	- reg: Physical address mapped to this device

	Required nodes:
	- ea@X: Parent node that has the sensor mapping for each cpu.
	This node's phandle is provided within cpu node
	to invoke/probe energy-aware only for available cpus.
	There should be one such node present for each cpu.

	Optional properties:
	- qcom,low-hyst-temp: Degrees C below which the power numbers
	need to be recomputed for the cores and reset
	the threshold. If this is not present, the default
	value is 10C.
	- qcom,high-hyst-temp: Degrees C above which the power numbers
	need to be recomputed for the cores and reset
	the threshold. If this property is not present,
	the default value is 5C.
	- qcom,polling-interval: Interval for which the power numbers
	need to be recomputed for the cores if there
	is no change in threshold. If this property is not
	present, the power is recalculated only on
	temperature threshold notifications.
	-qcom,throttling-temp: Temperature threshold for cpu frequency mitigation.
	The value should be set same as the threshold temperature
	in thermal module - 5 C, such that there is a bandwidth to
	control the cores before frequency mitigation happens.

	[Second level nodes]
	Require properties to define per core characteristics:
	- sensor: Sensor phandle to map a particular sensor to the core.
	If this property is not present, then the core is assumed
	to be at 40C for all the power estimations. No sensor
	threshold is set. This phandle's compatible property is
	"qcom,sensor-information". This driver relies on the
	sensor-type and scaling-factor information provided in this
	phandle.

	Example

	qcom,msm-core@0xfc4b0000 {
	compatible = "qcom,apss-core-ea";
	reg = <0xfc4b0000 0x1000>;
	qcom,low-hyst-temp = <10>;
	qcom,high-hyst-temp = <5>;
	qcom,polling-interval = <50>;

	ea0: ea0 {
	sensor = <&sensor_information0>;
	};

	ea1: ea1 {
	sensor = <&sensor_information1>;
	};

	};

	CPU0: cpu@0 {
	device_type = "cpu";
	compatible = "arm,cortex-a53";
	reg = <0x0>;
	qcom,ea = <&ea0>;
	};

Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt

0 → 100644

+46 −0

Original line number	Original line	Diff line number	Diff line
			THS8135 Video DAC
			-----------------

			This is the binding for Texas Instruments THS8135 Video DAC bridge.

			Required properties:

			- compatible: Must be "ti,ths8135"

			Required nodes:

			This device has two video ports. Their connections are modelled using the OF
			graph bindings specified in Documentation/devicetree/bindings/graph.txt.

			- Video port 0 for RGB input
			- Video port 1 for VGA output

			Example
			-------

			vga-bridge {
			compatible = "ti,ths8135";
			#address-cells = <1>;
			#size-cells = <0>;

			ports {
			#address-cells = <1>;
			#size-cells = <0>;

			port@0 {
			reg = <0>;

			vga_bridge_in: endpoint {
			remote-endpoint = <&lcdc_out_vga>;
			};
			};

			port@1 {
			reg = <1>;

			vga_bridge_out: endpoint {
			remote-endpoint = <&vga_con_in>;
			};
			};
			};
			};

Documentation/devicetree/bindings/display/msm/sde.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -366,6 +366,8 @@ Optional properties:
	- qcom,sde-cdp-setting: Array of 2 cell property, with a format of		- qcom,sde-cdp-setting: Array of 2 cell property, with a format of
	<read enable, write enable> for cdp use cases in		<read enable, write enable> for cdp use cases in
	order of <real_time>, and <non_real_time>.		order of <real_time>, and <non_real_time>.
			- qcom,sde-qos-cpu-mask: A u32 value indicating desired PM QoS CPU affine mask.
			- qcom,sde-qos-cpu-dma-latency: A u32 value indicating desired PM QoS CPU DMA latency in usec.
	- qcom,sde-inline-rot-xin: An integer array of xin-ids related to inline		- qcom,sde-inline-rot-xin: An integer array of xin-ids related to inline
	rotation.		rotation.
	- qcom,sde-inline-rot-xin-type: A string array indicating the type of xin,		- qcom,sde-inline-rot-xin-type: A string array indicating the type of xin,
	@@ -611,6 +613,9 @@ Example:

	qcom,sde-cdp-setting = <1 1>, <1 0>;		qcom,sde-cdp-setting = <1 1>, <1 0>;

			qcom,sde-qos-cpu-mask = <0x3>;
			qcom,sde-qos-cpu-dma-latency = <300>;

	qcom,sde-vbif-off = <0 0>;		qcom,sde-vbif-off = <0 0>;
	qcom,sde-vbif-id = <0 1>;		qcom,sde-vbif-id = <0 1>;
	qcom,sde-vbif-default-ot-rd-limit = <32>;		qcom,sde-vbif-default-ot-rd-limit = <32>;