Commit 47247500 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-4.20/apple' into for-linus

Support for Apple Magic Trackpad 2
parents 712fca63 9d7b1866
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
Rémi Denis-Courmont <rdenis@simphalempin.com>
Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
Rudolf Marek <R.Marek@sh.cvut.cz>
Rui Saraiva <rmps@joel.ist.utl.pt>
Sachin P Sant <ssant@in.ibm.com>
+9 −0
Original line number Diff line number Diff line
@@ -73,3 +73,12 @@ KernelVersion: 3.0
Contact:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Description:
                Number of sectors written by the frontend.

What:		/sys/bus/xen-backend/devices/*/state
Date:		August 2018
KernelVersion:	4.19
Contact:	Joe Jin <joe.jin@oracle.com>
Description:
                The state of the device. One of: 'Unknown',
                'Initialising', 'Initialised', 'Connected', 'Closing',
                'Closed', 'Reconfiguring', 'Reconfigured'.
+78 −0
Original line number Diff line number Diff line
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
							asic_health

Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Description:	This file shows ASIC health status. The possible values are:
		0 - health failed, 2 - health OK, 3 - ASIC in booting state.

		The files are read only.

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
							cpld1_version
							cpld2_version

Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Description:	These files show with which CPLD versions have been burned
		on carrier and switch boards.

		The files are read only.

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/select_iio
Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Description:	This file allows iio devices selection.

		Attribute select_iio can be written with 0 or with 1. It
		selects which one of iio devices can be accessed.

		The file is read/write.

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/psu1_on
		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/psu2_on
		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_cycle
		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_down
Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Description:	These files allow asserting system power cycling, switching
		power supply units on and off and system's main power domain
		shutdown.
		Expected behavior:
		When pwr_cycle is written 1: auxiliary power domain will go
		down and after short period (about 1 second) up.
		When  psu1_on or psu2_on is written 1, related unit will be
		disconnected from the power source, when written 0 - connected.
		If both are written 1 - power supplies main power domain will
		go down.
		When pwr_down is written 1, system's main power domain will go
		down.

		The files are write only.

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
							reset_aux_pwr_or_ref
							reset_asic_thermal
							reset_hotswap_or_halt
							reset_hotswap_or_wd
							reset_fw_reset
							reset_long_pb
							reset_main_pwr_fail
							reset_short_pb
							reset_sw_reset
Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Description:	These files show the system reset cause, as following: power
		auxiliary outage or power refresh, ASIC thermal shutdown, halt,
		hotswap, watchdog, firmware reset, long press power button,
		short press power button, software reset. Value 1 in file means
		this is reset cause, 0 - otherwise. Only one of the above
		causes could be 1 at the same time, representing only last
		reset cause.

		The files are read only.
+10 −0
Original line number Diff line number Diff line
@@ -15,3 +15,13 @@ Description:
                blkback. If the frontend tries to use more than
                max_persistent_grants, the LRU kicks in and starts
                removing 5% of max_persistent_grants every 100ms.

What:           /sys/module/xen_blkback/parameters/persistent_grant_unused_seconds
Date:           August 2018
KernelVersion:  4.19
Contact:        Roger Pau Monné <roger.pau@citrix.com>
Description:
                How long a persistent grant is allowed to remain
                allocated without being in use. The time is in
                seconds, 0 means indefinitely long.
                The default is 60 seconds.
+8 −0
Original line number Diff line number Diff line
@@ -51,6 +51,14 @@ Description:
		 Controls the dirty page count condition for the in-place-update
		 policies.

What:		/sys/fs/f2fs/<disk>/min_seq_blocks
Date:		August 2018
Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>
Description:
		 Controls the dirty page count condition for batched sequential
		 writes in ->writepages.


What:		/sys/fs/f2fs/<disk>/min_hot_blocks
Date:		March 2017
Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>
Loading