Merge branch 'topic/user-access-begin' into next (4c25df56) · Commits · 戴 / test

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ Jacob Shin <Jacob.Shin@amd.com>
		Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
		Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
		Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
		Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
		James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James E Wilson <wilson@specifix.com>

+11 −2

Original line number	Diff line number	Diff line
		@@ -29,13 +29,13 @@ Description: This file shows the system fans direction:

		The files are read only.

		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable
		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version

		Date: November 2018
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show with which CPLD versions have been burned
		on LED board.
		on LED or Gearbox board.

		The files are read only.

		@@ -121,6 +121,15 @@ Description: These files show the system reset cause, as following: ComEx

		The files are read only.

		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version
		Date: November 2018
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show with which CPLD versions have been burned
		on LED board.

		The files are read only.

		Date: June 2019
		KernelVersion: 5.3
		Contact: Vadim Pasternak <vadimpmellanox.com>

+1 −1

Original line number	Diff line number	Diff line
		@@ -319,7 +319,7 @@
		182 = /dev/perfctr Performance-monitoring counters
		183 = /dev/hwrng Generic random number generator
		184 = /dev/cpu/microcode CPU microcode update interface
		186 = /dev/atomicps Atomic shapshot of process state data
		186 = /dev/atomicps Atomic snapshot of process state data
		187 = /dev/irnet IrNET device
		188 = /dev/smbusbios SMBus BIOS
		189 = /dev/ussp_ctl User space serial port control

+4 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,10 @@ Optional properties:
		- dma-names: should contain "tx" and "rx".
		- atmel,fifo-size: maximum number of data the RX and TX FIFOs can store for FIFO
		capable I2C controllers.
		- i2c-sda-hold-time-ns: TWD hold time, only available for "atmel,sama5d4-i2c"
		and "atmel,sama5d2-i2c".
		- i2c-sda-hold-time-ns: TWD hold time, only available for:
		"atmel,sama5d4-i2c",
		"atmel,sama5d2-i2c",
		"microchip,sam9x60-i2c".
		- Child nodes conforming to i2c bus binding

		Examples :

+2 −2

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ patternProperties:
		spi-rx-bus-width:
		allOf:
		- $ref: /schemas/types.yaml#/definitions/uint32
		- enum: [ 1, 2, 4 ]
		- enum: [ 1, 2, 4, 8 ]
		- default: 1
		description:
		Bus width to the SPI bus used for MISO.
		@@ -123,7 +123,7 @@ patternProperties:
		spi-tx-bus-width:
		allOf:
		- $ref: /schemas/types.yaml#/definitions/uint32
		- enum: [ 1, 2, 4 ]
		- enum: [ 1, 2, 4, 8 ]
		- default: 1
		description:
		Bus width to the SPI bus used for MOSI.