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

Commit 21bd85cd authored by Quentin Perret's avatar Quentin Perret
Browse files

Merge remote-tracking branch 'android-4.9' into 'android-4.9-eas-dev' 



Fixed merge conflicts caused by 8a174b47 ("sched/fair: prevent
possible infinite loop in sched_group_energy)

Change-Id: Iba35631a213b88f6361838f28573af3407568919
Signed-off-by: default avatarQuentin Perret <quentin.perret@arm.com>
parents b5ba569f 7595d550

Documentation/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -436,6 +436,8 @@ sysrq.txt 
	- info on the magic SysRq key.

target/

	- directory with info on generating TCM v4 fabric .ko modules

tee.txt

	- info on the TEE subsystem and drivers

this_cpu_ops.txt

	- List rationale behind and the way to use this_cpu operations.

thermal/

Documentation/ABI/testing/sysfs-devices-system-cpu

+16 −0
Original line number Diff line number Diff line
@@ -350,3 +350,19 @@ Contact: Linux ARM Kernel Mailing list <linux-arm-kernel@lists.infradead.org> 
Description:	AArch64 CPU registers

		'identification' directory exposes the CPU ID registers for

		 identifying model and revision of the CPU.



What:		/sys/devices/system/cpu/vulnerabilities

		/sys/devices/system/cpu/vulnerabilities/meltdown

		/sys/devices/system/cpu/vulnerabilities/spectre_v1

		/sys/devices/system/cpu/vulnerabilities/spectre_v2

Date:		January 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Information about CPU vulnerabilities



		The files are named after the code names of CPU

		vulnerabilities. The output of those files reflects the

		state of the CPUs in the system. Possible output values:



		"Not affected"	  CPU is not affected by the vulnerability

		"Vulnerable"	  CPU is affected and no mitigation in effect

		"Mitigation: $M"  CPU is affected and mitigation $M is in effect

Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
OP-TEE Device Tree Bindings



OP-TEE is a piece of software using hardware features to provide a Trusted

Execution Environment. The security can be provided with ARM TrustZone, but

also by virtualization or a separate chip.



We're using "linaro" as the first part of the compatible property for

the reference implementation maintained by Linaro.



* OP-TEE based on ARM TrustZone required properties:



- compatible     : should contain "linaro,optee-tz"



- method         : The method of calling the OP-TEE Trusted OS. Permitted

                   values are:



                   "smc" : SMC #0, with the register assignments specified

		           in drivers/tee/optee/optee_smc.h



                   "hvc" : HVC #0, with the register assignments specified

		           in drivers/tee/optee/optee_smc.h







Example:

	firmware {

		optee {

			compatible = "linaro,optee-tz";

			method = "smc";

		};

	};

Documentation/devicetree/bindings/hwmon/jc42.txt

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ Required properties: 


- reg: I2C address



Optional properties:

- smbus-timeout-disable: When set, the smbus timeout function will be disabled.

			 This is not supported on all chips.



Example:



temp-sensor@1a {

Documentation/devicetree/bindings/usb/usb-device.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Required properties: 
  be used, but a device adhering to this binding may leave out all except

  for usbVID,PID.

- reg: the port number which this device is connecting to, the range

  is 1-31.

  is 1-255.



Example: