diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 19:43:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 19:43:47 -0500 |
| commit | 6ae840e7cc4be0be3aa40d9f67c35c75cfc67d83 (patch) | |
| tree | 9c83c87a8670ef678d95f8d6f76a07f24a09a49f | |
| parent | e6b5be2be4e30037eb551e0ed09dd97bd00d85d3 (diff) | |
| parent | 91905b6f4afe51e23a3f58df93e4cdc5e49cf40c (diff) | |
Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH:
"Here's the big char/misc driver update for 3.19-rc1
Lots of little things all over the place in different drivers, and a
new subsystem, "coresight" has been added. Full details are in the
shortlog"
* tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (73 commits)
parport: parport_pc, do not remove parent devices early
spmi: Remove shutdown/suspend/resume kernel-doc
carma-fpga-program: drop videobuf dependency
carma-fpga: drop videobuf dependency
carma-fpga-program.c: fix compile errors
i8k: Fix temperature bug handling in i8k_get_temp()
cxl: Name interrupts in /proc/interrupt
CXL: Return error to PSL if IRQ demultiplexing fails & print clearer warning
coresight-replicator: remove .owner field for driver
coresight: fixed comments in coresight.h
coresight: fix typo in comment in coresight-priv.h
coresight: bindings for coresight drivers
coresight: Adding ABI documentation
w1: support auto-load of w1_bq27000 module.
w1: avoid potential u16 overflow
cn: verify msg->len before making callback
mei: export fw status registers through sysfs
mei: read and print all six FW status registers
mei: txe: add cherrytrail device id
mei: kill cached host and me csr values
...
93 files changed, 9174 insertions, 1177 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10 b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10 new file mode 100644 index 000000000000..4b8d6ec92e2b --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10 | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | What: /sys/bus/coresight/devices/<memory_map>.etb/enable_sink | ||
| 2 | Date: November 2014 | ||
| 3 | KernelVersion: 3.19 | ||
| 4 | Contact: Mathieu Poirier <mathieu.poirier@linaro.org> | ||
| 5 | Description: (RW) Add/remove a sink from a trace path. There can be multiple | ||
| 6 | source for a single sink. | ||
| 7 | ex: echo 1 > /sys/bus/coresight/devices/20010000.etb/enable_sink | ||
| 8 | |||
| 9 | What: /sys/bus/coresight/devices/<memory_map>.etb/status | ||
| 10 | Date: November 2014 | ||
| 11 | KernelVersion: 3.19 | ||
| 12 | Contact: Mathieu Poirier <mathieu.poirier@linaro.org> | ||
| 13 | Description: (R) List various control and status registers. The specific | ||
| 14 | layout and content is driver specific. | ||
| 15 | |||
| 16 | What: /sys/bus/coresight/devices/<memory_map>.etb/trigger_cntr | ||
| 17 | Date: November 2014 | ||
| 18 | KernelVersion: 3.19 | ||
| 19 | Contact: Mathieu Poirier <mathieu.poirier@linaro.org> | ||
| 20 | Description: (RW) Disables write access to the Trace RAM by stopping the | ||
| 21 | formatter after a defined number of words have been stored | ||
| 22 | following the trigger event. The number of 32-bit words written | ||
| 23 | into the Trace RAM following the trigger event is equal to the | ||
| 24 | value stored in this register+1 (from ARM ETB-TRM). | ||
diff --git a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x new file mode 100644 index 000000000000..b4d0b99afffb --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x | |||
| @@ -0,0 +1,253 @@ | |||
| 1 | What: /sys/bus/coresight/devices/<memory_map>.[etm|ptm]/enable_source | ||
| 2 | Date: November 2014 | ||
| 3 | KernelVersion: 3.19 | ||
| 4 | Contact: Mathieu Poirier <mathieu.poirier@linaro.org> | ||
| 5 | Description: (RW) Enable/disable tracing on this specific trace entiry. | ||
| 6 | Enabling a source implies the source has been configured | ||
| 7 | properly and a sink has been identidifed for it. The path | ||
