Merge android-5.4 into android-5.4-stable (d55491aa) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/ABI/testing/procfs-concurrent_time

deleted100644 → 0

+0 −16

Original line number	Diff line number	Diff line
		What: /proc/uid_concurrent_active_time
		Date: December 2018
		Contact: Connor O'Brien <connoro@google.com>
		Description:
		The /proc/uid_concurrent_active_time file displays aggregated cputime
		numbers for each uid, broken down by the total number of cores that were
		active while the uid's task was running.

		What: /proc/uid_concurrent_policy_time
		Date: December 2018
		Contact: Connor O'Brien <connoro@google.com>
		Description:
		The /proc/uid_concurrent_policy_time file displays aggregated cputime
		numbers for each uid, broken down based on the cpufreq policy
		of the core used by the uid's task and the number of cores associated
		with that policy that were active while the uid's task was running.

+4 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,10 @@
		dynamic table installation which will install SSDT
		tables to /sys/firmware/acpi/tables/dynamic.

		acpi_no_watchdog [HW,ACPI,WDT]
		Ignore the ACPI-based watchdog interface (WDAT) and let
		a native driver control the watchdog device instead.

		acpi_rsdp= [ACPI,EFI,KEXEC]
		Pass the RSDP address to the kernel, mostly used
		on machines running EFI runtime service to boot the

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		Support usb hub and usb data role switch of Hisilicon HiKey960 Board.

		-----------------------------

		Required properties:
		- compatible: "hisilicon,gpio_hubv1"
		- typec-vbus-gpios: gpio to control the vbus of typeC port
		- otg-switch-gpios: gpio to switch DP & DM between the hub and typeC port
		- hub-vdd33-en-gpios: gpio to enable the power of hub
		- pinctrl-names: pin configuration state name ("default")
		- pinctrl-0: pinctrl config
		- usb-role-switch: flags the driver as a role switch provider
		- ports: two endpoints to connect the usb core role switch provider
		to the usb-c tcpm driver.

		Example
		-----
		hisi_hikey_usb: hisi_hikey_usb {
		compatible = "hisilicon,gpio_hubv1";
		typec-vbus-gpios = <&gpio25 2 GPIO_ACTIVE_HIGH>;
		otg-switch-gpios = <&gpio25 6 GPIO_ACTIVE_HIGH>;
		hub-vdd33-en-gpios = <&gpio5 6 GPIO_ACTIVE_HIGH>;
		pinctrl-names = "default";
		pinctrl-0 = <&usbhub5734_pmx_func>;
		usb-role-switch;

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

		hikey_usb_ep0: endpoint@0 {
		reg = <0>;
		remote-endpoint = <&dwc3_role_switch>;
		};
		hikey_usb_ep1: endpoint@1 {
		reg = <1>;
		remote-endpoint = <&rt1711h_ep>;
		};
		};
		};

+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

+5 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,10 @@ Optional Properties:
		for each of the battery capacity lookup table. The first temperature value
		specifies the OCV table 0, and the second temperature value specifies the
		OCV table 1, and so on.
		- resistance-temp-table: An array providing the temperature in degree Celsius
		and corresponding battery internal resistance percent, which is used to look
		up the resistance percent according to current temperature to get a accurate
		batterty internal resistance in different temperatures.

		Battery properties are named, where possible, for the corresponding
		elements in enum power_supply_property, defined in
		@@ -61,6 +65,7 @@ Example:
		ocv-capacity-table-0 = <4185000 100>, <4113000 95>, <4066000 90>, ...;
		ocv-capacity-table-1 = <4200000 100>, <4185000 95>, <4113000 90>, ...;
		ocv-capacity-table-2 = <4250000 100>, <4200000 95>, <4185000 90>, ...;
		resistance-temp-table = <20 100>, <10 90>, <0 80>, <(-10) 60>;
		};

		charger: charger@11 {