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

f6cff79f · Linus Torvalds <[email protected]> · 2018-02-01 10:31:17 -08:00

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
  ...

Commit: f6cff79f1d122f78a4b35bf4b2f0112afcd89ea4
Parents: 47fcc036 · 9ff6576e

Merge commit. Changes below are compared with the first parent: 47fcc036.

Changes

150 files changed · +14288 −1142

File	Status	Add	Del	Content
Documentation/ABI/stable/sysfs-bus-vmbus	modified	+37	−16	View file
Documentation/ABI/testing/sysfs-bus-siox	added	+87	−0	View file
Documentation/devicetree/bindings/eeprom/at25.txt	modified	+3	−1	View file
Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt	modified	+5	−0	View file
Documentation/devicetree/bindings/siox/eckelmann,siox-gpio.txt	added	+19	−0	View file
Documentation/devicetree/bindings/slimbus/bus.txt	added	+50	−0	View file
Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt	added	+39	−0	View file
Documentation/devicetree/bindings/vendor-prefixes.txt	modified	+1	−0	View file
Documentation/driver-api/index.rst	modified	+2	−0	View file
Documentation/driver-api/slimbus.rst	added	+127	−0	View file
Documentation/driver-api/soundwire/index.rst	added	+15	−0	View file
Documentation/driver-api/soundwire/summary.rst	added	+207	−0	View file
Documentation/driver-api/uio-howto.rst	modified	+19	−7	View file
Documentation/fpga/fpga-mgr.txt	modified	+66	−66	View file
Documentation/fpga/fpga-region.txt	added	+95	−0	View file
Documentation/fpga/overview.txt	added	+23	−0	View file
MAINTAINERS	modified	+36	−2	View file
arch/x86/hyperv/hv_init.c	modified	+14	−7	View file
arch/x86/include/asm/mshyperv.h	modified	+2	−2	View file
drivers/Kconfig	modified	+6	−0	View file
drivers/Makefile	modified	+3	−0	View file
drivers/android/binder.c	modified	+135	−61	View file
drivers/android/binder_alloc.c	modified	+20	−9	View file
drivers/android/binder_alloc.h	modified	+3	−1	View file
drivers/auxdisplay/img-ascii-lcd.c	modified	+4	−0	View file
drivers/base/regmap/Kconfig	modified	+4	−0	View file
drivers/base/regmap/Makefile	modified	+1	−0	View file
drivers/base/regmap/regmap-slimbus.c	added	+80	−0	View file
drivers/char/lp.c	modified	+52	−17	View file
drivers/char/mem.c	modified	+22	−5	View file
drivers/char/xillybus/Kconfig	modified	+2	−2	View file
drivers/char/xillybus/xillybus_of.c	modified	+4	−8	View file
drivers/eisa/eisa-bus.c	modified	+30	−32	View file
drivers/eisa/pci_eisa.c	modified	+5	−5	View file
drivers/eisa/virtual_root.c	modified	+9	−10	View file
drivers/extcon/extcon-adc-jack.c	modified	+1	−1	View file
drivers/extcon/extcon-axp288.c	modified	+32	−4	View file
drivers/extcon/extcon-max77693.c	modified	+1	−1	View file
drivers/extcon/extcon-max8997.c	modified	+1	−1	View file
drivers/fpga/Kconfig	modified	+55	−48	View file
drivers/fpga/Makefile	modified	+1	−0	View file
drivers/fpga/fpga-bridge.c	modified	+88	−25	View file
drivers/fpga/fpga-mgr.c	modified	+94	−29	View file
drivers/fpga/fpga-region.c	modified	+46	−418	View file
drivers/fpga/of-fpga-region.c	added	+504	−0	View file
drivers/fpga/socfpga-a10.c	modified	+7	−1	View file
drivers/fsi/Kconfig	modified	+1	−5	View file
drivers/hv/hv.c	modified	+0	−3	View file
drivers/hv/vmbus_drv.c	modified	+28	−12	View file
drivers/hwtracing/coresight/coresight-dynamic-replicator.c	modified	+1	−3	View file
drivers/hwtracing/coresight/coresight-etb10.c	modified	+0	−1	View file
drivers/hwtracing/coresight/coresight-funnel.c	modified	+1	−3	View file
drivers/hwtracing/coresight/coresight-tpiu.c	modified	+11	−6	View file
drivers/hwtracing/coresight/coresight.c	modified	+5	−20	View file
drivers/misc/Kconfig	modified	+2	−2	View file
drivers/misc/ad525x_dpot.c	modified	+15	−15	View file
drivers/misc/ad525x_dpot.h	modified	+6	−6	View file
drivers/misc/apds990x.c	modified	+11	−0	View file
drivers/misc/ds1682.c	modified	+26	−9	View file
drivers/misc/eeprom/at25.c	modified	+3	−0	View file
drivers/misc/enclosure.c	modified	+3	−9	View file
drivers/misc/fsa9480.c	modified	+1	−0	View file
drivers/misc/genwqe/card_base.c	modified	+8	−8	View file
drivers/misc/genwqe/card_base.h	modified	+9	−11	View file
drivers/misc/genwqe/card_ddcb.c	modified	+11	−11	View file
drivers/misc/genwqe/card_debugfs.c	modified	+1	−1	View file
drivers/misc/genwqe/card_dev.c	modified	+8	−11	View file
drivers/misc/genwqe/card_utils.c	modified	+9	−16	View file
drivers/misc/hpilo.c	modified	+1	−4	View file
drivers/misc/hpilo.h	modified	+1	−4	View file
drivers/misc/ics932s401.c	modified	+4	−4	View file
drivers/misc/isl29003.c	modified	+7	−0	View file
drivers/misc/lkdtm_core.c	modified	+1	−1	View file
drivers/misc/lkdtm_heap.c	modified	+4	−0	View file
drivers/misc/mei/bus.c	modified	+8	−2	View file
drivers/misc/mei/hw-me.c	modified	+3	−1	View file
drivers/misc/mei/hw-txe.c	modified	+3	−1	View file
drivers/misc/mei/init.c	modified	+3	−1	View file
drivers/misc/mei/pci-me.c	modified	+4	−1	View file
drivers/misc/mic/vop/vop_vringh.c	modified	+7	−15	View file
drivers/misc/vexpress-syscfg.c	modified	+1	−3	View file
drivers/mux/Kconfig	modified	+1	−0	View file
drivers/mux/Makefile	modified	+1	−0	View file
drivers/mux/adg792a.c	modified	+1	−4	View file
drivers/mux/core.c	modified	+1	−4	View file
drivers/mux/gpio.c	modified	+1	−4	View file
drivers/mux/mmio.c	modified	+1	−4	View file
drivers/nvmem/core.c	modified	+5	−12	View file
drivers/nvmem/rockchip-efuse.c	modified	+69	−1	View file
drivers/nvmem/uniphier-efuse.c	modified	+5	−5	View file
drivers/siox/Kconfig	added	+18	−0	View file
drivers/siox/Makefile	added	+2	−0	View file
drivers/siox/siox-bus-gpio.c	added	+172	−0	View file
drivers/siox/siox-core.c	added	+934	−0	View file
drivers/siox/siox.h	added	+49	−0	View file
drivers/slimbus/Kconfig	added	+24	−0	View file
drivers/slimbus/Makefile	added	+10	−0	View file
drivers/slimbus/core.c	added	+480	−0	View file
drivers/slimbus/messaging.c	added	+332	−0	View file
drivers/slimbus/qcom-ctrl.c	added	+747	−0	View file
drivers/slimbus/sched.c	added	+121	−0	View file
drivers/slimbus/slimbus.h	added	+261	−0	View file
drivers/soundwire/Kconfig	added	+37	−0	View file
drivers/soundwire/Makefile	added	+18	−0	View file
drivers/soundwire/bus.c	added	+997	−0	View file
drivers/soundwire/bus.h	added	+71	−0	View file
drivers/soundwire/bus_type.c	added	+193	−0	View file
drivers/soundwire/cadence_master.c	added	+751	−0	View file
drivers/soundwire/cadence_master.h	added	+48	−0	View file
drivers/soundwire/intel.c	added	+345	−0	View file
drivers/soundwire/intel.h	added	+23	−0	View file
drivers/soundwire/intel_init.c	added	+198	−0	View file
drivers/soundwire/mipi_disco.c	added	+401	−0	View file
drivers/soundwire/slave.c	added	+114	−0	View file
drivers/uio/uio_hv_generic.c	modified	+107	−31	View file
drivers/virt/Kconfig	modified	+1	−0	View file
drivers/virt/Makefile	modified	+1	−0	View file
drivers/virt/vboxguest/Kconfig	added	+18	−0	View file
drivers/virt/vboxguest/Makefile	added	+3	−0	View file
drivers/virt/vboxguest/vboxguest_core.c	added	+1571	−0	View file
drivers/virt/vboxguest/vboxguest_core.h	added	+174	−0	View file
drivers/virt/vboxguest/vboxguest_linux.c	added	+466	−0	View file
drivers/virt/vboxguest/vboxguest_utils.c	added	+803	−0	View file
drivers/virt/vboxguest/vboxguest_version.h	added	+19	−0	View file
drivers/virt/vboxguest/vmmdev.h	added	+449	−0	View file
drivers/vme/vme.c	modified	+1	−1	View file
include/linux/fpga/fpga-bridge.h	modified	+11	−3	View file
include/linux/fpga/fpga-mgr.h	modified	+28	−11	View file
include/linux/fpga/fpga-region.h	added	+40	−0	View file
include/linux/i7300_idle.h	deleted	+0	−84	View before deletion
include/linux/mod_devicetable.h	modified	+19	−0	View file
include/linux/mux/consumer.h	modified	+1	−4	View file
include/linux/mux/driver.h	modified	+1	−4	View file
include/linux/regmap.h	modified	+18	−0	View file
include/linux/siox.h	added	+77	−0	View file
include/linux/slimbus.h	added	+164	−0	View file
include/linux/soundwire/sdw.h	added	+479	−0	View file
include/linux/soundwire/sdw_intel.h	added	+24	−0	View file
include/linux/soundwire/sdw_registers.h	added	+194	−0	View file
include/linux/soundwire/sdw_type.h	added	+19	−0	View file
include/linux/vbox_utils.h	added	+79	−0	View file
include/trace/events/siox.h	added	+66	−0	View file
include/uapi/linux/lp.h	modified	+11	−1	View file
include/uapi/linux/vbox_err.h	added	+151	−0	View file
include/uapi/linux/vbox_vmmdev_types.h	added	+226	−0	View file
include/uapi/linux/vboxguest.h	added	+330	−0	View file
scripts/mod/devicetable-offsets.c	modified	+4	−0	View file
scripts/mod/file2alias.c	modified	+15	−0	View file
security/Kconfig	modified	+1	−0	View file
tools/hv/Makefile	modified	+22	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/stable/sysfs-bus-vmbus

View file

diff --git a/Documentation/ABI/stable/sysfs-bus-vmbus b/Documentation/ABI/stable/sysfs-bus-vmbus
index d4077cc..e46be65 100644
--- a/Documentation/ABI/stable/sysfs-bus-vmbus
+++ b/Documentation/ABI/stable/sysfs-bus-vmbus
@@ -42,72 +42,93 @@ Contact:	K. Y. Srinivasan <[email protected]>
 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 <[email protected]>
+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 <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
-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 <[email protected]>
 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 <[email protected]>
-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 <[email protected]>
 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 <[email protected]>
-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 <[email protected]>
-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 <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
+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 <[email protected]>
+Description:	Monitor bit associated with channel
+Users:		Debugging tools and userspace drivers

Documentation/ABI/testing/sysfs-bus-siox

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-siox b/Documentation/ABI/testing/sysfs-bus-siox
new file mode 100644
index 0000000..fed7c37
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-siox
@@ -0,0 +1,87 @@
+What:		/sys/bus/siox/devices/siox-X/active
+KernelVersion:	4.16
+Contact:	Gavin Schenk <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+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 <[email protected]>, Uwe Kleine-König <[email protected]>
+Description:
+		Read-only value reporting the outbytes value provided to siox-X/device_add.

Documentation/devicetree/bindings/eeprom/at25.txt

View file

diff --git a/Documentation/devicetree/bindings/eeprom/at25.txt b/Documentation/devicetree/bindings/eeprom/at25.txt
index e823d90..b3bde97 100644
--- a/Documentation/devicetree/bindings/eeprom/at25.txt
+++ b/Documentation/devicetree/bindings/eeprom/at25.txt
@@ -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

View file

diff --git a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt
index 60bec47..265bdb7 100644
--- a/Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt
+++ b/Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt
@@ -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

View file

diff --git a/Documentation/devicetree/bindings/siox/eckelmann,siox-gpio.txt b/Documentation/devicetree/bindings/siox/eckelmann,siox-gpio.txt
new file mode 100644
index 0000000..55259cf
--- /dev/null
+++ b/Documentation/devicetree/bindings/siox/eckelmann,siox-gpio.txt
@@ -0,0 +1,19 @@
+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>;
+        };

Documentation/devicetree/bindings/slimbus/bus.txt

View file

diff --git a/Documentation/devicetree/bindings/slimbus/bus.txt b/Documentation/devicetree/bindings/slimbus/bus.txt
new file mode 100644
index 0000000..52fa642
--- /dev/null
+++ b/Documentation/devicetree/bindings/slimbus/bus.txt
@@ -0,0 +1,50 @@
+SLIM(Serial Low Power Interchip Media Bus) bus
+
+SLIMbus is a 2-wire bus, and is used to communicate with peripheral
+components like audio-codec.
+
+Required property for SLIMbus controller node:
+- compatible	- name of SLIMbus controller
+
+Child nodes:
+Every SLIMbus controller node can contain zero or more child nodes
+representing slave devices on the bus. Every SLIMbus slave device is
+uniquely determined by the enumeration address containing 4 fields:
+Manufacturer ID, Product code, Device index, and Instance value for
+the device.
+If child node is not present and it is instantiated after device
+discovery (slave device reporting itself present).
+
+In some cases it may be necessary to describe non-probeable device
+details such as non-standard ways of powering up a device. In
+such cases, child nodes for those devices will be present as
+slaves of the SLIMbus controller, as detailed below.
+
+Required property for SLIMbus child node if it is present:
+- reg		- Should be ('Device index', 'Instance ID') from SLIMbus
+		  Enumeration  Address.
+		  Device Index Uniquely identifies multiple Devices within
+		  a single Component.
+		  Instance ID Is for the cases where multiple Devices of the
+		  same type or Class are attached to the bus.
+
+- compatible	-"slimMID,PID". The textual representation of Manufacturer ID,
+	 	  Product Code, shall be in lower case hexadecimal with leading
+		  zeroes suppressed
+
+SLIMbus example for Qualcomm's slimbus manager component:
+
+	slim@28080000 {
+		compatible = "qcom,apq8064-slim", "qcom,slim";
+		reg = <0x28080000 0x2000>,
+		interrupts = <0 33 0>;
+		clocks = <&lcc SLIMBUS_SRC>, <&lcc AUDIO_SLIMBUS_CLK>;
+		clock-names = "iface", "core";
+		#address-cells = <2>;
+		#size-cell = <0>;
+
+		codec: wcd9310@1,0{
+			compatible = "slim217,60";
+			reg = <1 0>;
+		};
+	};

Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt

View file

diff --git a/Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt b/Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt
new file mode 100644
index 0000000..922dcb8
--- /dev/null
+++ b/Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt
@@ -0,0 +1,39 @@
+Qualcomm SLIMbus controller
+This controller is used if applications processor driver controls SLIMbus
+master component.
+
+Required properties:
+
+ - #address-cells - refer to Documentation/devicetree/bindings/slimbus/bus.txt
+ - #size-cells	- refer to Documentation/devicetree/bindings/slimbus/bus.txt
+
+ - reg : Offset and length of the register region(s) for the device
+ - reg-names : Register region name(s) referenced in reg above
+	 Required register resource entries are:
+	 "ctrl": Physical address of controller register blocks
+ 	 "slew": required for "qcom,apq8064-slim" SOC.
+ - compatible : should be "qcom,<SOC-NAME>-slim" for SOC specific compatible
+ 		followed by "qcom,slim" for fallback.
+ - interrupts : Interrupt number used by this controller
+ - clocks : Interface and core clocks used by this SLIMbus controller
+ - clock-names : Required clock-name entries are:
+	"iface" : Interface clock for this controller
+	"core" : Interrupt for controller core's BAM
+
+Example:
+
+	slim@28080000 {
+		compatible = "qcom,apq8064-slim", "qcom,slim";
+		reg = <0x28080000 0x2000>, <0x80207C 4>;
+		reg-names = "ctrl", "slew";
+		interrupts = <0 33 0>;
+		clocks = <&lcc SLIMBUS_SRC>, <&lcc AUDIO_SLIMBUS_CLK>;
+		clock-names = "iface", "core";
+		#address-cells = <2>;
+		#size-cell = <0>;
+
+		wcd9310: audio-codec@1,0{
+			compatible = "slim217,60";
+			reg = <1 0>;
+		};
+	};

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index f776fb8..6ec1a02 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -97,6 +97,7 @@ dptechnics	DPTechnics
 dragino	Dragino Technology Co., Limited
 ea	Embedded Artists AB
 ebv	EBV Elektronik
+eckelmann	Eckelmann AG
 edt	Emerging Display Technologies
 eeti	eGalax_eMPIA Technology Inc
 elan	Elan Microelectronic Corp.

Documentation/driver-api/index.rst

View file

diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst
index d17a987..e9b41b1 100644
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@ -47,6 +47,8 @@ available subsections can be seen below.
    gpio
    misc_devices
    dmaengine/index
+   slimbus
+   soundwire/index
 
 .. only::  subproject and html
 

Documentation/driver-api/slimbus.rst

View file

diff --git a/Documentation/driver-api/slimbus.rst b/Documentation/driver-api/slimbus.rst
new file mode 100644
index 0000000..7555ecd
--- /dev/null
+++ b/Documentation/driver-api/slimbus.rst
@@ -0,0 +1,127 @@
+============================
+Linux kernel SLIMbus support
+============================
+
+Overview
+========
+
+What is SLIMbus?
+----------------
+SLIMbus (Serial Low Power Interchip Media Bus) is a specification developed by
+MIPI (Mobile Industry Processor Interface) alliance. The bus uses master/slave
+configuration, and is a 2-wire multi-drop implementation (clock, and data).
+
+Currently, SLIMbus is used to interface between application processors of SoCs
+(System-on-Chip) and peripheral components (typically codec). SLIMbus uses
+Time-Division-Multiplexing to accommodate multiple data channels, and
+a control channel.
+
+The control channel is used for various control functions such as bus
+management, configuration and status updates. These messages can be unicast (e.g.
+reading/writing device specific values), or multicast (e.g. data channel
+reconfiguration sequence is a broadcast message announced to all devices)
+
+A data channel is used for data-transfer between 2 SLIMbus devices. Data
+channel uses dedicated ports on the device.
+
+Hardware description:
+---------------------
+SLIMbus specification has different types of device classifications based on
+their capabilities.
+A manager device is responsible for enumeration, configuration, and dynamic
+channel allocation. Every bus has 1 active manager.
+
+A generic device is a device providing application functionality (e.g. codec).
+
+Framer device is responsible for clocking the bus, and transmitting frame-sync
+and framing information on the bus.
+
+Each SLIMbus component has an interface device for monitoring physical layer.
+
+Typically each SoC contains SLIMbus component having 1 manager, 1 framer device,
+1 generic device (for data channel support), and 1 interface device.
+External peripheral SLIMbus component usually has 1 generic device (for
+functionality/data channel support), and an associated interface device.
+The generic device's registers are mapped as 'value elements' so that they can
+be written/read using SLIMbus control channel exchanging control/status type of
+information.
+In case there are multiple framer devices on the same bus, manager device is
+responsible to select the active-framer for clocking the bus.
+
+Per specification, SLIMbus uses "clock gears" to do power management based on
+current frequency and bandwidth requirements. There are 10 clock gears and each
+gear changes the SLIMbus frequency to be twice its previous gear.
+
+Each device has a 6-byte enumeration-address and the manager assigns every
+device with a 1-byte logical address after the devices report presence on the
+bus.
+
+Software description:
+---------------------
+There are 2 types of SLIMbus drivers:
+
+slim_controller represents a 'controller' for SLIMbus. This driver should
+implement duties needed by the SoC (manager device, associated
+interface device for monitoring the layers and reporting errors, default
+framer device).
+
+slim_device represents the 'generic device/component' for SLIMbus, and a
+slim_driver should implement driver for that slim_device.
+
+Device notifications to the driver:
+-----------------------------------
+Since SLIMbus devices have mechanisms for reporting their presence, the
+framework allows drivers to bind when corresponding devices report their
+presence on the bus.
+However, it is possible that the driver needs to be probed
+first so that it can enable corresponding SLIMbus device (e.g. power it up and/or
+take it out of reset). To support that behavior, the framework allows drivers
+to probe first as well  (e.g. using standard DeviceTree compatibility field).
+This creates the necessity for the driver to know when the device is functional
+(i.e. reported present). device_up callback is used for that reason when the
+device reports present and is assigned a logical address by the controller.
+
+Similarly, SLIMbus devices 'report absent' when they go down. A 'device_down'
+callback notifies the driver when the device reports absent and its logical
+address assignment is invalidated by the controller.
+
+Another notification "boot_device" is used to notify the slim_driver when
+controller resets the bus. This notification allows the driver to take necessary
+steps to boot the device so that it's functional after the bus has been reset.
+
+Driver and Controller APIs:
+--------------------------
+.. kernel-doc:: include/linux/slimbus.h
+   :internal:
+
+.. kernel-doc:: drivers/slimbus/slimbus.h
+   :internal:
+
+.. kernel-doc:: drivers/slimbus/core.c
+   :export:
+
+Clock-pause:
+------------
+SLIMbus mandates that a reconfiguration sequence (known as clock-pause) be
+broadcast to all active devices on the bus before the bus can enter low-power
+mode. Controller uses this sequence when it decides to enter low-power mode so
+that corresponding clocks and/or power-rails can be turned off to save power.
+Clock-pause is exited by waking up framer device (if controller driver initiates
+exiting low power mode), or by toggling the data line (if a slave device wants
+to initiate it).
+
+Clock-pause APIs:
+~~~~~~~~~~~~~~~~~
+.. kernel-doc:: drivers/slimbus/sched.c
+   :export:
+
+Messaging:
+----------
+The framework supports regmap and read/write apis to exchange control-information
+with a SLIMbus device. APIs can be synchronous or asynchronous.
+The header file <linux/slimbus.h> has more documentation about messaging APIs.
+
+Messaging APIs:
+~~~~~~~~~~~~~~~
+.. kernel-doc:: drivers/slimbus/messaging.c
+   :export:

Documentation/driver-api/soundwire/index.rst

View file

diff --git a/Documentation/driver-api/soundwire/index.rst b/Documentation/driver-api/soundwire/index.rst
new file mode 100644
index 0000000..647e946
--- /dev/null
+++ b/Documentation/driver-api/soundwire/index.rst
@@ -0,0 +1,15 @@
+=======================
+SoundWire Documentation
+=======================
+
+.. toctree::
+   :maxdepth: 1
+
+   summary
+
+.. only::  subproject
+
+   Indices
+   =======
+
+   * :ref:`genindex`

Documentation/driver-api/soundwire/summary.rst

View file

diff --git a/Documentation/driver-api/soundwire/summary.rst b/Documentation/driver-api/soundwire/summary.rst
new file mode 100644
index 0000000..8193125
--- /dev/null
+++ b/Documentation/driver-api/soundwire/summary.rst
@@ -0,0 +1,207 @@
+===========================
+SoundWire Subsystem Summary
+===========================
+
+SoundWire is a new interface ratified in 2015 by the MIPI Alliance.
+SoundWire is used for transporting data typically related to audio
+functions. SoundWire interface is optimized to integrate audio devices in
+mobile or mobile inspired systems.
+
+SoundWire is a 2-pin multi-drop interface with data and clock line. It
+facilitates development of low cost, efficient, high performance systems.
+Broad level key features of SoundWire interface include:
+
+ (1) Transporting all of payload data channels, control information, and setup
+     commands over a single two-pin interface.
+
+ (2) Lower clock frequency, and hence lower power consumption, by use of DDR
+     (Dual Data Rate) data transmission.
+
+ (3) Clock scaling and optional multiple data lanes to give wide flexibility
+     in data rate to match system requirements.
+
+ (4) Device status monitoring, including interrupt-style alerts to the Master.
+
+The SoundWire protocol supports up to eleven Slave interfaces. All the
+interfaces share the common Bus containing data and clock line. Each of the
+Slaves can support up to 14 Data Ports. 13 Data Ports are dedicated to audio
+transport. Data Port0 is dedicated to transport of Bulk control information,
+each of the audio Data Ports (1..14) can support up to 8 Channels in
+transmit or receiving mode (typically fixed direction but configurable
+direction is enabled by the specification).  Bandwidth restrictions to
+~19.2..24.576Mbits/s don't however allow for 11*13*8 channels to be
+transmitted simultaneously.
+
+Below figure shows an example of connectivity between a SoundWire Master and
+two Slave devices. ::
+
+        +---------------+                                       +---------------+
+        |               |                       Clock Signal    |               |
+        |    Master     |-------+-------------------------------|    Slave      |
+        |   Interface   |       |               Data Signal     |  Interface 1  |
+        |               |-------|-------+-----------------------|               |
+        +---------------+       |       |                       +---------------+
+                                |       |
+                                |       |