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

Commit f6cff79f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver updates from Greg KH:
 "Here is the big pull request for char/misc drivers for 4.16-rc1.

  There's a lot of stuff in here. Three new driver subsystems were added
  for various types of hardware busses:

   - siox
   - slimbus
   - soundwire

  as well as a new vboxguest subsystem for the VirtualBox hypervisor
  drivers.

  There's also big updates from the FPGA subsystem, lots of Android
  binder fixes, the usual handful of hyper-v updates, and lots of other
  smaller driver updates.

  All of these have been in linux-next for a long time, with no reported
  issues"

* tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (155 commits)
  char: lp: use true or false for boolean values
  android: binder: use VM_ALLOC to get vm area
  android: binder: Use true and false for boolean values
  lkdtm: fix handle_irq_event symbol for INT_HW_IRQ_EN
  EISA: Delete error message for a failed memory allocation in eisa_probe()
  EISA: Whitespace cleanup
  misc: remove AVR32 dependencies
  virt: vbox: Add error mapping for VERR_INVALID_NAME and VERR_NO_MORE_FILES
  soundwire: Fix a signedness bug
  uio_hv_generic: fix new type mismatch warnings
  uio_hv_generic: fix type mismatch warnings
  auxdisplay: img-ascii-lcd: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
  uio_hv_generic: add rescind support
  uio_hv_generic: check that host supports monitor page
  uio_hv_generic: create send and receive buffers
  uio: document uio_hv_generic regions
  doc: fix documentation about uio_hv_generic
  vmbus: add monitor_id and subchannel_id to sysfs per channel
  vmbus: fix ABI documentation
  uio_hv_generic: use ISR callback method
  ...
parents 47fcc036 9ff6576e

Documentation/ABI/stable/sysfs-bus-vmbus

+37 −16
Original line number Diff line number Diff line
@@ -42,72 +42,93 @@ 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

What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Directory for per-channel information

		NN is the VMBUS relid associtated with the channel.



What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN/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

Users:		tools/hv/lsvmbus and other debugging tools



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

What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN/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

Users:		tools/hv/lsvmbus and other debugging tools



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

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

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Inbound channel signaling state

Description:	Host to guest channel interrupt mask

Users:		Debugging tools



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

What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN/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

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

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Outbound channel signaling state

Description:	Guest to host channel interrupt mask

Users:		Debugging tools



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

What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN/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

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

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Bytes availabble to read

Description:	Bytes available to read

Users:		Debugging tools



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

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

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Bytes availabble to write

Description:	Bytes available to write

Users:		Debugging tools



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

What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN/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

What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN/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



What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN/subchannel_id

Date:		January. 2018

KernelVersion:	4.16

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Subchannel ID associated with VMBUS channel

Users:		Debugging tools and userspace drivers



What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN/monitor_id

Date:		January. 2018

KernelVersion:	4.16

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Monitor bit associated with channel

Users:		Debugging tools and userspace drivers

Documentation/ABI/testing/sysfs-bus-siox

0 → 100644
+87 −0
Original line number Diff line number Diff line 
What:		/sys/bus/siox/devices/siox-X/active

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		On reading represents the current state of the bus. If it

		contains a "0" the bus is stopped and connected devices are

		expected to not do anything because their watchdog triggered.

		When the file contains a "1" the bus is operated and periodically

		does a push-pull cycle to write and read data from the

		connected devices.

		When writing a "0" or "1" the bus moves to the described state.



What:		/sys/bus/siox/devices/siox-X/device_add

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Write-only file. Write



			<type> <inbytes> <outbytes> <statustype>



		to add a new device dynamically. <type> is the name that is used to match

		to a driver (similar to the platform bus). <inbytes> and <outbytes> define

		the length of the input and output shift register in bytes respectively.

		<statustype> defines the 4 bit device type that is check to identify connection

		problems.

		The new device is added to the end of the existing chain.



What:		/sys/bus/siox/devices/siox-X/device_remove

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Write-only file. A single write removes the last device in the siox chain.



What:		/sys/bus/siox/devices/siox-X/poll_interval_ns

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Defines the interval between two poll cycles in nano seconds.

		Note this is rounded to jiffies on writing. On reading the current value

		is returned.



What:		/sys/bus/siox/devices/siox-X-Y/connected

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value. "0" means the Yth device on siox bus X isn't "connected" i.e.

		communication with it is not ensured. "1" signals a working connection.



What:		/sys/bus/siox/devices/siox-X-Y/inbytes

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the inbytes value provided to siox-X/device_add



What:		/sys/bus/siox/devices/siox-X-Y/status_errors

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Counts the number of time intervals when the read status byte doesn't yield the

		expected value.



What:		/sys/bus/siox/devices/siox-X-Y/type

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the type value provided to siox-X/device_add.



What:		/sys/bus/siox/devices/siox-X-Y/watchdog

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting if the watchdog of the siox device is

		active. "0" means the watchdog is not active and the device is expected to

		be operational. "1" means the watchdog keeps the device in reset.



What:		/sys/bus/siox/devices/siox-X-Y/watchdog_errors

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the number to time intervals when the

		watchdog was active.



What:		/sys/bus/siox/devices/siox-X-Y/outbytes

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the outbytes value provided to siox-X/device_add.

Documentation/devicetree/bindings/eeprom/at25.txt

+3 −1
Original line number Diff line number Diff line
@@ -11,7 +11,9 @@ Required properties: 
- spi-max-frequency : max spi frequency to use

- pagesize : size of the eeprom page

- size : total eeprom size in bytes

- address-width : number of address bits (one of 8, 16, or 24)

- address-width : number of address bits (one of 8, 9, 16, or 24).

  For 9 bits, the MSB of the address is sent as bit 3 of the instruction

  byte, before the address byte.



Optional properties:

- spi-cpha : SPI shifted clock phase, as per spi-bus bindings.

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

+5 −0
Original line number Diff line number Diff line
@@ -6,12 +6,17 @@ Required properties: 
  - "rockchip,rk3188-efuse" - for RK3188 SoCs.

  - "rockchip,rk3228-efuse" - for RK3228 SoCs.

  - "rockchip,rk3288-efuse" - for RK3288 SoCs.

  - "rockchip,rk3328-efuse" - for RK3328 SoCs.

  - "rockchip,rk3368-efuse" - for RK3368 SoCs.

  - "rockchip,rk3399-efuse" - for RK3399 SoCs.

- reg: Should contain the registers location and exact eFuse size

- clocks: Should be the clock id of eFuse

- clock-names: Should be "pclk_efuse"



Optional properties:

- rockchip,efuse-size: Should be exact eFuse size in byte, the eFuse

  size in property <reg> will be invalid if define this property.



Deprecated properties:

- compatible: "rockchip,rockchip-efuse"

  Old efuse compatible value compatible to rk3066a, rk3188 and rk3288

Documentation/devicetree/bindings/siox/eckelmann,siox-gpio.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Eckelmann SIOX GPIO bus



Required properties:

- compatible : "eckelmann,siox-gpio"

- din-gpios, dout-gpios, dclk-gpios, dld-gpios: references gpios for the

    corresponding bus signals.



Examples:



        siox {

                compatible = "eckelmann,siox-gpio";

                pinctrl-names = "default";

                pinctrl-0 = <&pinctrl_siox>;



                din-gpios = <&gpio6 11 0>;

                dout-gpios = <&gpio6 8 0>;

                dclk-gpios = <&gpio6 9 0>;

                dld-gpios = <&gpio6 10 0>;

        };