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

Commit 2bf16b7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-4.15-rc1' of... 

Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc updates from Greg KH:
 "Here is the big set of char/misc and other driver subsystem patches
  for 4.15-rc1.

  There are small changes all over here, hyperv driver updates, pcmcia
  driver updates, w1 driver updats, vme driver updates, nvmem driver
  updates, and lots of other little one-off driver updates as well. The
  shortlog has the full details.

  All of these have been in linux-next for quite a while with no
  reported issues"

* tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
  VME: Return -EBUSY when DMA list in use
  w1: keep balance of mutex locks and refcnts
  MAINTAINERS: Update VME subsystem tree.
  nvmem: sunxi-sid: add support for A64/H5's SID controller
  nvmem: imx-ocotp: Update module description
  nvmem: imx-ocotp: Enable i.MX7D OTP write support
  nvmem: imx-ocotp: Add i.MX7D timing write clock setup support
  nvmem: imx-ocotp: Move i.MX6 write clock setup to dedicated function
  nvmem: imx-ocotp: Add support for banked OTP addressing
  nvmem: imx-ocotp: Pass parameters via a struct
  nvmem: imx-ocotp: Restrict OTP write to IMX6 processors
  nvmem: uniphier: add UniPhier eFuse driver
  dt-bindings: nvmem: add description for UniPhier eFuse
  nvmem: set nvmem->owner to nvmem->dev->driver->owner if unset
  nvmem: qfprom: fix different address space warnings of sparse
  nvmem: mtk-efuse: fix different address space warnings of sparse
  nvmem: mtk-efuse: use stack for nvmem_config instead of malloc'ing it
  nvmem: imx-iim: use stack for nvmem_config instead of malloc'ing it
  thunderbolt: tb: fix use after free in tb_activate_pcie_devices
  MAINTAINERS: Add git tree for Thunderbolt development
  ...
parents b9743042 f13d1a8a

Documentation/ABI/stable/sysfs-bus-vmbus

+70 −0
Original line number Diff line number Diff line
@@ -41,3 +41,73 @@ KernelVersion: 4.5 
Contact:	K. Y. Srinivasan <kys@microsoft.com>

Description:	The 16 bit vendor ID of the device

Users:		tools/hv/lsvmbus and user level RDMA libraries



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/cpu

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	VCPU (sub)channel is affinitized to

Users:		tools/hv/lsvmbus and other debuggig tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/cpu

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	VCPU (sub)channel is affinitized to

Users:		tools/hv/lsvmbus and other debuggig tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/in_mask

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Inbound channel signaling state

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/latency

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Channel signaling latency

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/out_mask

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Outbound channel signaling state

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/pending

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Channel interrupt pending state

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/read_avail

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Bytes availabble to read

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/write_avail

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Bytes availabble to write

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/events

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Number of times we have signaled the host

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/interrupts

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Number of times we have taken an interrupt (incoming)

Users:		Debugging tools

Documentation/ABI/testing/sysfs-driver-w1_ds28e17

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/sys/bus/w1/devices/19-<id>/speed

Date:		Sep 2017

KernelVersion:	4.14

Contact:	Jan Kandziora <jjj@gmx.de>

Description:	When written, this file sets the I2C speed on the connected

		DS28E17 chip. When read, it reads the current setting from

		the DS28E17 chip.

		Valid values: 100, 400, 900 [kBaud].

		Default 100, can be set by w1_ds28e17.speed= module parameter.

Users:		w1_ds28e17 driver



What:		/sys/bus/w1/devices/19-<id>/stretch

Date:		Sep 2017

KernelVersion:	4.14

Contact:	Jan Kandziora <jjj@gmx.de>

Description:	When written, this file sets the multiplier used to calculate

		the busy timeout for I2C operations on the connected DS28E17

		chip. When read, returns the current setting.

		Valid values: 1 to 9.

		Default 1, can be set by w1_ds28e17.stretch= module parameter.

Users:		w1_ds28e17 driver

Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
  "allwinner,sun4i-a10-sid"

  "allwinner,sun7i-a20-sid"

  "allwinner,sun8i-h3-sid"

  "allwinner,sun50i-a64-sid"



- reg: Should contain registers location and length

Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt

+1 −1
Original line number Diff line number Diff line 
= Amlogic eFuse device tree bindings =

= Amlogic Meson GX eFuse device tree bindings =



Required properties:

- compatible: should be "amlogic,meson-gxbb-efuse"

Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Amlogic Meson6/Meson8/Meson8b efuse



Required Properties:

- compatible: depending on the SoC this should be one of:

	- "amlogic,meson6-efuse"

	- "amlogic,meson8-efuse"

	- "amlogic,meson8b-efuse"

- reg: base address and size of the efuse registers

- clocks: a reference to the efuse core gate clock

- clock-names: must be "core"



All properties and sub-nodes as well as the consumer bindings

defined in nvmem.txt in this directory are also supported.





Example:

	efuse: nvmem@0 {

		compatible = "amlogic,meson8-efuse";

		reg = <0x0 0x2000>;

		clocks = <&clkc CLKID_EFUSE>;

		clock-names = "core";

	};