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

d8782381 · Linus Torvalds <[email protected]> · 2015-06-26 14:51:15 -07:00

Pull char/misc driver updates from Greg KH:
 "Here's the big char/misc driver pull request for 4.2-rc1.

  Lots of mei, extcon, coresight, uio, mic, and other driver updates in
  here.  Full details in the shortlog.  All of these have been in
  linux-next for some time with no reported problems"

* tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (176 commits)
  mei: me: wait for power gating exit confirmation
  mei: reset flow control on the last client disconnection
  MAINTAINERS: mei: add mei_cl_bus.h to maintained file list
  misc: sram: sort and clean up included headers
  misc: sram: move reserved block logic out of probe function
  misc: sram: add private struct device and virt_base members
  misc: sram: report correct SRAM pool size
  misc: sram: bump error message level on unclean driver unbinding
  misc: sram: fix device node reference leak on error
  misc: sram: fix enabled clock leak on error path
  misc: mic: Fix reported static checker warning
  misc: mic: Fix randconfig build error by including errno.h
  uio: pruss: Drop depends on ARCH_DAVINCI_DA850 from config
  uio: pruss: Add CONFIG_HAS_IOMEM dependence
  uio: pruss: Include <linux/sizes.h>
  extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
  char:xilinx_hwicap:buffer_icap - change 1/0 to true/false for bool type variable in function buffer_icap_set_configuration().
  Drivers: hv: vmbus: Allocate ring buffer memory in NUMA aware fashion
  parport: check exclusive access before register
  w1: use correct lock on error in w1_seq_show()
  ...

Commit: d87823813fe498fdd47894bd28e460a9dee8d771
Parents: e3826082 · 3dc196ea

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

Changes

172 files changed · +15485 −5653

File	Status	Add	Del	Content
Documentation/ABI/stable/sysfs-bus-w1	added	+11	−0	View file
Documentation/ABI/stable/sysfs-driver-w1_ds28ea00	added	+6	−0	View file
Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x	added	+450	−0	View file
Documentation/ABI/testing/sysfs-bus-mei	modified	+15	−1	View file
Documentation/devicetree/bindings/arm/coresight.txt	modified	+8	−4	View file
Documentation/devicetree/bindings/mfd/arizona.txt	modified	+6	−0	View file
Documentation/mic/mic_overview.txt	modified	+16	−12	View file
Documentation/mic/mpssd/mpss	modified	+11	−13	View file
Documentation/mic/scif_overview.txt	added	+98	−0	View file
Documentation/w1/slaves/w1_therm	modified	+10	−1	View file
Documentation/w1/w1.generic	modified	+19	−11	View file
MAINTAINERS	modified	+9	−5	View file
arch/um/os-Linux/drivers/ethertap_user.c	modified	+1	−1	View file
arch/x86/Kconfig	modified	+10	−15	View file
drivers/block/paride/paride.c	modified	+51	−6	View file
drivers/block/paride/paride.h	modified	+2	−0	View file
drivers/block/paride/pcd.c	modified	+9	−0	View file
drivers/block/paride/pd.c	modified	+11	−1	View file
drivers/block/paride/pf.c	modified	+7	−0	View file
drivers/block/paride/pg.c	modified	+8	−0	View file
drivers/block/paride/pt.c	modified	+8	−0	View file
drivers/char/Kconfig	modified	+0	−8	View file
drivers/char/Makefile	modified	+0	−2	View file
drivers/char/misc.c	modified	+14	−9	View file
drivers/char/msm_smd_pkt.c	deleted	+0	−465	View before deletion
drivers/char/pcmcia/synclink_cs.c	modified	+1	−1	View file
drivers/char/snsc.c	modified	+2	−2	View file
drivers/char/virtio_console.c	modified	+2	−2	View file
drivers/char/xilinx_hwicap/buffer_icap.c	modified	+3	−3	View file
drivers/char/xillybus/Kconfig	modified	+1	−1	View file
drivers/extcon/Kconfig	modified	+16	−9	View file
drivers/extcon/Makefile	modified	+1	−0	View file
drivers/extcon/extcon-adc-jack.c	modified	+1	−14	View file
drivers/extcon/extcon-arizona.c	modified	+51	−37	View file
drivers/extcon/extcon-axp288.c	added	+381	−0	View file
drivers/extcon/extcon-gpio.c	modified	+0	−1	View file
drivers/extcon/extcon-max14577.c	modified	+17	−43	View file
drivers/extcon/extcon-max77693.c	modified	+52	−88	View file
drivers/extcon/extcon-max77843.c	modified	+32	−57	View file
drivers/extcon/extcon-max8997.c	modified	+23	−41	View file
drivers/extcon/extcon-palmas.c	modified	+12	−11	View file
drivers/extcon/extcon-rt8973a.c	modified	+15	−40	View file
drivers/extcon/extcon-sm5502.c	modified	+10	−23	View file
drivers/extcon/extcon-usb-gpio.c	modified	+10	−25	View file
drivers/extcon/extcon.c	modified	+176	−140	View file
drivers/hv/Makefile	modified	+1	−1	View file
drivers/hv/channel.c	modified	+18	−9	View file
drivers/hv/channel_mgmt.c	modified	+108	−48	View file
drivers/hv/connection.c	modified	+10	−3	View file
drivers/hv/hv_balloon.c	modified	+3	−1	View file
drivers/hv/hv_fcopy.c	modified	+96	−191	View file
drivers/hv/hv_kvp.c	modified	+94	−98	View file
drivers/hv/hv_snapshot.c	modified	+115	−53	View file
drivers/hv/hv_utils_transport.c	added	+276	−0	View file
drivers/hv/hv_utils_transport.h	added	+51	−0	View file
drivers/hv/hyperv_vmbus.h	modified	+31	−0	View file
drivers/hv/vmbus_drv.c	modified	+19	−2	View file
drivers/hwmon/Kconfig	modified	+11	−0	View file
drivers/hwmon/Makefile	modified	+1	−0	View file
drivers/char/i8k.c → drivers/hwmon/dell-smm-hwmon.c	renamed	+88	−68	View file
drivers/hwtracing/coresight/Kconfig	modified	+19	−0	View file
drivers/hwtracing/coresight/Makefile	modified	+2	−0	View file
drivers/hwtracing/coresight/coresight-etb10.c	modified	+51	−28	View file
drivers/hwtracing/coresight/coresight-etm.h	modified	+2	−2	View file
drivers/hwtracing/coresight/coresight-etm3x.c	modified	+56	−56	View file
drivers/hwtracing/coresight/coresight-etm4x.c	added	+2702	−0	View file
drivers/hwtracing/coresight/coresight-etm4x.h	added	+391	−0	View file
drivers/hwtracing/coresight/coresight-funnel.c	modified	+44	−17	View file
drivers/hwtracing/coresight/coresight-replicator-qcom.c	added	+215	−0	View file
drivers/hwtracing/coresight/coresight-replicator.c	modified	+67	−4	View file
drivers/hwtracing/coresight/coresight-tmc.c	modified	+8	−23	View file
drivers/hwtracing/coresight/coresight-tpiu.c	modified	+44	−16	View file
drivers/hwtracing/coresight/of_coresight.c	modified	+1	−1	View file
drivers/i2c/busses/i2c-parport.c	modified	+33	−5	View file
drivers/misc/Kconfig	modified	+0	−1	View file
drivers/misc/Makefile	modified	+0	−1	View file
drivers/misc/carma/Kconfig	deleted	+0	−15	View before deletion
drivers/misc/carma/Makefile	deleted	+0	−2	View before deletion
drivers/misc/carma/carma-fpga-program.c	deleted	+0	−1182	View before deletion
drivers/misc/carma/carma-fpga.c	deleted	+0	−1507	View before deletion
drivers/misc/mei/amthif.c	modified	+5	−23	View file
drivers/misc/mei/bus.c	modified	+96	−54	View file
drivers/misc/mei/client.c	modified	+329	−144	View file
drivers/misc/mei/client.h	modified	+107	−7	View file
drivers/misc/mei/debugfs.c	modified	+14	−1	View file
drivers/misc/mei/hbm.c	modified	+8	−8	View file
drivers/misc/mei/hw-me.c	modified	+55	−4	View file
drivers/misc/mei/hw-txe.c	modified	+23	−10	View file
drivers/misc/mei/init.c	modified	+5	−3	View file
drivers/misc/mei/interrupt.c	modified	+5	−90	View file
drivers/misc/mei/main.c	modified	+27	−30	View file
drivers/misc/mei/mei_dev.h	modified	+33	−69	View file
drivers/misc/mei/nfc.c	modified	+22	−201	View file
drivers/misc/mei/pci-txe.c	modified	+1	−1	View file
drivers/misc/mei/wd.c	modified	+4	−18	View file
drivers/misc/mic/Kconfig	modified	+38	−2	View file
drivers/misc/mic/Makefile	modified	+2	−1	View file
drivers/misc/mic/bus/Makefile	modified	+1	−0	View file
drivers/misc/mic/bus/scif_bus.c	added	+210	−0	View file
drivers/misc/mic/bus/scif_bus.h	added	+129	−0	View file
drivers/misc/mic/card/mic_device.c	modified	+131	−1	View file
drivers/misc/mic/card/mic_device.h	modified	+9	−2	View file
drivers/misc/mic/card/mic_x100.c	modified	+59	−2	View file
drivers/misc/mic/card/mic_x100.h	modified	+1	−0	View file
drivers/misc/mic/common/mic_dev.h	modified	+3	−0	View file
drivers/misc/mic/host/mic_boot.c	modified	+254	−10	View file
drivers/misc/mic/host/mic_debugfs.c	modified	+13	−0	View file
drivers/misc/mic/host/mic_device.h	modified	+8	−3	View file
drivers/misc/mic/host/mic_intr.h	modified	+2	−1	View file
drivers/misc/mic/host/mic_main.c	modified	+6	−0	View file
drivers/misc/mic/host/mic_smpt.c	modified	+3	−4	View file
drivers/misc/mic/host/mic_smpt.h	modified	+1	−0	View file
drivers/misc/mic/host/mic_virtio.c	modified	+3	−3	View file
drivers/misc/mic/host/mic_x100.c	modified	+1	−2	View file
drivers/misc/mic/scif/Makefile	added	+15	−0	View file
drivers/misc/mic/scif/scif_api.c	added	+1276	−0	View file
drivers/misc/mic/scif/scif_debugfs.c	added	+85	−0	View file
drivers/misc/mic/scif/scif_epd.c	added	+353	−0	View file
drivers/misc/mic/scif/scif_epd.h	added	+160	−0	View file
drivers/misc/mic/scif/scif_fd.c	added	+303	−0	View file
drivers/misc/mic/scif/scif_main.c	added	+388	−0	View file
drivers/misc/mic/scif/scif_main.h	added	+254	−0	View file
drivers/misc/mic/scif/scif_map.h	added	+113	−0	View file
drivers/misc/mic/scif/scif_nm.c	added	+237	−0	View file
drivers/misc/mic/scif/scif_nodeqp.c	added	+1312	−0	View file
drivers/misc/mic/scif/scif_nodeqp.h	added	+183	−0	View file
drivers/misc/mic/scif/scif_peer_bus.c	added	+124	−0	View file
drivers/misc/mic/scif/scif_peer_bus.h	added	+65	−0	View file
drivers/misc/mic/scif/scif_ports.c	added	+124	−0	View file
drivers/misc/mic/scif/scif_rb.c	added	+249	−0	View file
drivers/misc/mic/scif/scif_rb.h	added	+100	−0	View file
drivers/misc/sram.c	modified	+72	−65	View file
drivers/misc/ti-st/st_kim.c	modified	+1	−2	View file
drivers/nfc/mei_phy.c	modified	+269	−26	View file
drivers/nfc/mei_phy.h	modified	+30	−8	View file
drivers/nfc/microread/mei.c	modified	+1	−1	View file
drivers/nfc/pn544/mei.c	modified	+1	−1	View file
drivers/parport/parport_pc.c	modified	+2	−2	View file
drivers/parport/procfs.c	modified	+14	−1	View file
drivers/parport/share.c	modified	+350	−23	View file
drivers/pcmcia/cs.c	modified	+6	−4	View file
drivers/platform/goldfish/goldfish_pipe.c	modified	+1	−1	View file
drivers/spmi/Kconfig	modified	+1	−0	View file
drivers/staging/panel/panel.c	modified	+9	−5	View file
drivers/uio/Kconfig	modified	+1	−1	View file
drivers/uio/uio.c	modified	+2	−1	View file
drivers/uio/uio_pruss.c	modified	+1	−0	View file
drivers/usb/phy/phy-tahvo.c	modified	+5	−4	View file
drivers/w1/masters/ds2482.c	modified	+1	−0	View file
drivers/w1/slaves/w1_therm.c	modified	+147	−15	View file
drivers/w1/w1.c	modified	+16	−1	View file
include/dt-bindings/mfd/arizona.h	modified	+4	−0	View file
include/linux/extcon.h	modified	+57	−77	View file
include/linux/extcon/extcon-adc-jack.h	modified	+2	−3	View file
include/linux/hyperv.h	modified	+18	−30	View file
include/linux/mei_cl_bus.h	modified	+36	−2	View file
include/linux/mfd/arizona/pdata.h	modified	+3	−0	View file
include/linux/mfd/axp20x.h	modified	+5	−0	View file
include/linux/mod_devicetable.h	modified	+13	−0	View file
include/linux/parport.h	modified	+41	−2	View file
include/linux/scif.h	added	+993	−0	View file
include/uapi/linux/Kbuild	modified	+1	−0	View file
include/uapi/linux/hyperv.h	modified	+7	−1	View file
include/uapi/linux/mic_common.h	modified	+12	−0	View file
include/uapi/linux/scif_ioctl.h	added	+130	−0	View file
lib/lz4/lz4_decompress.c	modified	+11	−1	View file
scripts/checkkconfigsymbols.py	modified	+27	−7	View file
scripts/mod/devicetable-offsets.c	modified	+1	−0	View file
scripts/mod/file2alias.c	modified	+19	−2	View file
tools/hv/hv_fcopy_daemon.c	modified	+15	−0	View file
tools/hv/hv_kvp_daemon.c	modified	+31	−135	View file
tools/hv/hv_vss_daemon.c	modified	+37	−112	View file

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

Documentation/ABI/stable/sysfs-bus-w1

View file

diff --git a/Documentation/ABI/stable/sysfs-bus-w1 b/Documentation/ABI/stable/sysfs-bus-w1
new file mode 100644
index 0000000..140d85b
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-bus-w1
@@ -0,0 +1,11 @@
+What:		/sys/bus/w1/devices/.../w1_master_timeout_us
+Date:		April 2015
+Contact:	Dmitry Khromov <[email protected]>
+Description:	Bus scanning interval, microseconds component.
+		Some of 1-Wire devices commonly associated with physical access
+		control systems are attached/generate presence for as short as
+		100 ms - hence the tens-to-hundreds milliseconds scan intervals
+		are required.
+		see Documentation/w1/w1.generic for detailed information.
+Users:		any user space application which wants to know bus scanning
+		interval

Documentation/ABI/stable/sysfs-driver-w1_ds28ea00

View file

diff --git a/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 b/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00
new file mode 100644
index 0000000..e928def
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00
@@ -0,0 +1,6 @@
+What:		/sys/bus/w1/devices/.../w1_seq
+Date:		Apr 2015
+Contact:	Matt Campbell <[email protected]>
+Description:	Support for the DS28EA00 chain sequence function
+		see Documentation/w1/slaves/w1_therm for detailed information
+Users:		any user space application which wants to communicate with DS28EA00

Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x
new file mode 100644
index 0000000..2fe2e3d
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x
@@ -0,0 +1,450 @@
+What:		/sys/bus/coresight/devices/<memory_map>.etm/enable_source
+Date:		April 2015
+KernelVersion:  4.01
+Contact:        Mathieu Poirier <[email protected]>
+Description:	(RW) Enable/disable tracing on this specific trace entiry.
+		Enabling a source implies the source has been configured
+		properly and a sink has been identidifed for it.  The path
+		of coresight components linking the source to the sink is
+		configured and managed automatically by the coresight framework.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cpu
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) The CPU this tracing entity is associated with.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_pe_cmp
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Indicates the number of PE comparator inputs that are
+		available for tracing.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_addr_cmp
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Indicates the number of address comparator pairs that are
+		available for tracing.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_cntr
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Indicates the number of counters that are available for
+		tracing.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_ext_inp
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Indicates how many external inputs are implemented.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/numcidc
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Indicates the number of Context ID comparators that are
+		available for tracing.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/numvmidc
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Indicates the number of VMID comparators that are available
+		for tracing.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nrseqstate
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Indicates the number of sequencer states that are
+		implemented.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_resource
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Indicates the number of resource selection pairs that are
+		available for tracing.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_ss_cmp
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Indicates the number of single-shot comparator controls that
+		are available for tracing.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/reset
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(W) Cancels all configuration on a trace unit and set it back
+		to its boot configuration.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mode
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls various modes supported by this ETM, for example
+		P0 instruction tracing, branch broadcast, cycle counting and
+		context ID tracing.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/pe
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls which PE to trace.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/event
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls the tracing of arbitrary events from bank 0 to 3.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/event_instren
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls the behavior of the events in bank 0 to 3.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/event_ts
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls the insertion of global timestamps in the trace
+		streams.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/syncfreq
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls how often trace synchronization requests occur.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cyc_threshold
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Sets the threshold value for cycle counting.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/bb_ctrl
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls which regions in the memory map are enabled to
+		use branch broadcasting.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/event_vinst
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls instruction trace filtering.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/s_exlevel_vinst
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) In Secure state, each bit controls whether instruction
+		tracing is enabled for the corresponding exception level.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/ns_exlevel_vinst
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) In non-secure state, each bit controls whether instruction
+		tracing is enabled for the corresponding exception level.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_idx
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Select which address comparator or pair (of comparators) to
+		work with.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_instdatatype
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls what type of comparison the trace unit performs.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_single
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Used to setup single address comparator values.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_range
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Used to setup address range comparator values.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_idx
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Select which sequensor.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_state
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Use this to set, or read, the sequencer state.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_event
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Moves the sequencer state to a specific state.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_reset_event
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Moves the sequencer to state 0 when a programmed event
+		occurs.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cntr_idx
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Select which counter unit to work with.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cntrldvr
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) This sets or returns the reload count value of the
+		specific counter.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cntr_val
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) This sets or returns the current count value of the
+                specific counter.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cntr_ctrl
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls the operation of the selected counter.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/res_idx
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Select which resource selection unit to work with.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/res_ctrl
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description: 	(RW) Controls the selection of the resources in the trace unit.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_idx
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(RW) Select which context ID comparator to work with.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_val
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(RW) Get/Set the context ID comparator value to trigger on.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_masks
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(RW) Mask for all 8 context ID comparator value
+		registers (if implemented).
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/vmid_idx
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(RW) Select which virtual machine ID comparator to work with.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/vmid_val
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(RW) Get/Set the virtual machine ID comparator value to
+		trigger on.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/vmid_masks
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(RW) Mask for all 8 virtual machine ID comparator value
+		registers (if implemented).
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcoslsr
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the OS Lock Status Register (0x304).
+		The value it taken directly  from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpdcr
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the Power Down Control Register
+		(0x310).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpdsr
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the Power Down Status Register
+		(0x314).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trclsr
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the SW Lock Status Register
+		(0xFB4).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcauthstatus
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the Authentication Status Register
+		(0xFB8).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcdevid
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the Device ID Register
+		(0xFC8).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcdevtype
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the Device Type Register
+		(0xFCC).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr0
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the Peripheral ID0 Register
+		(0xFE0).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr1
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the Peripheral ID1 Register
+		(0xFE4).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr2
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the Peripheral ID2 Register
+		(0xFE8).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr3
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Print the content of the Peripheral ID3 Register
+		(0xFEC).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr0
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the tracing capabilities of the trace unit (0x1E0).
+		The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr1
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the tracing capabilities of the trace unit (0x1E4).
+		The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr2
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the maximum size of the data value, data address,
+		VMID, context ID and instuction address in the trace unit
+		(0x1E8).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr3
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the value associated with various resources
+		available to the trace unit.  See the Trace Macrocell
+		architecture specification for more details (0x1E8).
+		The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr4
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns how many resources the trace unit supports (0x1F0).
+		The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr5
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns how many resources the trace unit supports (0x1F4).
+		The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr8
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the maximum speculation depth of the instruction
+		trace stream. (0x180).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr9
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the number of P0 right-hand keys that the trace unit
+		can use (0x184).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr10
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the number of P1 right-hand keys that the trace unit
+		can use (0x188).  The value is taken directly from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr11
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the number of special P1 right-hand keys that the
+		trace unit can use (0x18C).  The value is taken directly from
+		the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr12
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the number of conditional P1 right-hand keys that
+		the trace unit can use (0x190).  The value is taken directly
+		from the HW.
+
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr13
+Date:		April 2015
+KernelVersion:	4.01
+Contact:	Mathieu Poirier <[email protected]>
+Description:	(R) Returns the number of special conditional P1 right-hand keys
+		that the trace unit can use (0x194).  The value is taken
+		directly from the HW.

Documentation/ABI/testing/sysfs-bus-mei

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-mei b/Documentation/ABI/testing/sysfs-bus-mei
index 2066f0b..20e4d16 100644
--- a/Documentation/ABI/testing/sysfs-bus-mei
+++ b/Documentation/ABI/testing/sysfs-bus-mei
@@ -4,4 +4,18 @@ KernelVersion:	3.10
 Contact:	Samuel Ortiz <[email protected]>
 		[email protected]
 Description:	Stores the same MODALIAS value emitted by uevent
-		Format: mei:<mei device name>
+		Format: mei:<mei device name>:<device uuid>:
+
+What:		/sys/bus/mei/devices/.../name
+Date:		May 2015
+KernelVersion:	4.2
+Contact:	Tomas Winkler <[email protected]>
+Description:	Stores mei client device name
+		Format: string
+
+What:		/sys/bus/mei/devices/.../uuid
+Date:		May 2015
+KernelVersion:	4.2
+Contact:	Tomas Winkler <[email protected]>
+Description:	Stores mei client device uuid
+		Format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx

Documentation/devicetree/bindings/arm/coresight.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt
index 88602b7..65a6db2 100644
--- a/Documentation/devicetree/bindings/arm/coresight.txt
+++ b/Documentation/devicetree/bindings/arm/coresight.txt
@@ -17,15 +17,19 @@ its hardware characteristcs.
 		- "arm,coresight-tmc", "arm,primecell";
 		- "arm,coresight-funnel", "arm,primecell";
 		- "arm,coresight-etm3x", "arm,primecell";
+		- "qcom,coresight-replicator1x", "arm,primecell";
 
 	* reg: physical base address and length of the register
 	  set(s) of the component.
 
-	* clocks: the clock associated to this component.
+	* clocks: the clocks associated to this component.
 
-	* clock-names: the name of the clock as referenced by the code.
-	  Since we are using the AMBA framework, the name should be
-	  "apb_pclk".
+	* clock-names: the name of the clocks referenced by the code.
+	  Since we are using the AMBA framework, the name of the clock
+	  providing the interconnect should be "apb_pclk", and some
+	  coresight blocks also have an additional clock "atclk", which
+	  clocks the core of that coresight component. The latter clock
+	  is optional.
 
 	* port or ports: The representation of the component's port
 	  layout using the generic DT graph presentation found in

Documentation/devicetree/bindings/mfd/arizona.txt

View file

diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
index 64fa3b2..a8fee60 100644
--- a/Documentation/devicetree/bindings/mfd/arizona.txt
+++ b/Documentation/devicetree/bindings/mfd/arizona.txt
@@ -67,6 +67,12 @@ Optional properties:
     present, the number of values should be less than or equal to the
     number of inputs, unspecified inputs will use the chip default.
 
+  - wlf,hpdet-channel : Headphone detection channel.
+    ARIZONA_ACCDET_MODE_HPL or 1 - Headphone detect mode is set to HPDETL
+    ARIZONA_ACCDET_MODE_HPR or 2 - Headphone detect mode is set to HPDETR
+    If this node is not mentioned or if the value is unknown, then
+    headphone detection mode is set to HPDETL.
+
   - DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
     they are being externally supplied. As covered in
     Documentation/devicetree/bindings/regulator/regulator.txt

Documentation/mic/mic_overview.txt

View file

diff --git a/Documentation/mic/mic_overview.txt b/Documentation/mic/mic_overview.txt
index 77c5418..1a2f2c8 100644
--- a/Documentation/mic/mic_overview.txt
+++ b/Documentation/mic/mic_overview.txt
@@ -24,6 +24,10 @@ a virtual bus called mic bus is created and virtual dma devices are
 created on it by the host/card drivers. On host the channels are private
 and used only by the host driver to transfer data for the virtio devices.
 
+The Symmetric Communication Interface (SCIF (pronounced as skiff)) is a
+low level communications API across PCIe currently implemented for MIC.
+More details are available at scif_overview.txt.
+
 Here is a block diagram of the various components described above. The
 virtio backends are situated on the host rather than the card given better
 single threaded performance for the host compared to MIC, the ability of
@@ -47,18 +51,18 @@ the fact that the virtio block storage backend can only be on the host.
                       |               |       | Virtio over PCIe IOCTLs  |
                       |               |       +--------------------------+
 +-----------+         |               |                   |  +-----------+
-| MIC DMA   |         |               |                   |  | MIC DMA   |
-| Driver    |         |               |                   |  | Driver    |
-+-----------+         |               |                   |  +-----------+
-      |               |               |                   |        |
-+---------------+     |               |                   |  +----------------+
-|MIC virtual Bus|     |               |                   |  |MIC virtual Bus |
-+---------------+     |               |                   |  +----------------+
-      |               |               |                   |              |
-      |   +--------------+            |            +---------------+     |
-      |   |Intel MIC     |            |            |Intel MIC      |     |
-      +---|Card Driver   |            |            |Host Driver    |     |
-          +--------------+            |            +---------------+-----+
+| MIC DMA   |         |  +----------+ | +-----------+     |  | MIC DMA   |
+| Driver    |         |  |  SCIF    | | |   SCIF    |     |  | Driver    |
++-----------+         |  +----------+ | +-----------+     |  +-----------+
+      |               |       |       |       |           |        |
++---------------+     | +-----+-----+ | +-----+-----+     | +---------------+
+|MIC virtual Bus|     | |SCIF HW Bus| | |SCIF HW BUS|     | |MIC virtual Bus|
++---------------+     | +-----------+ | +-----+-----+     | +---------------+
+      |               |       |       |       |           |              |
+      |   +--------------+    |       |       |    +---------------+     |
+      |   |Intel MIC     |    |       |       |    |Intel MIC      |     |
+      +---|Card Driver   +----+       |       |    |Host Driver    |     |
+          +--------------+            |       +----+---------------+-----+
                       |               |                   |
              +-------------------------------------------------------------+
              |                                                             |