Skip to content

Commit b78b499

Browse files
committed
Merge tag 'char-misc-4.10-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 patches for 4.10-rc1. Lots of tiny changes over lots of "minor" driver subsystems, the largest being some new FPGA drivers. Other than that, a few other new drivers, but no new driver subsystems added for this kernel cycle, a nice change. All of these have been in linux-next with no reported issues" * tag 'char-misc-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (107 commits) uio-hv-generic: store physical addresses instead of virtual Tools: hv: kvp: configurable external scripts path uio-hv-generic: new userspace i/o driver for VMBus vmbus: add support for dynamic device id's hv: change clockevents unbind tactics hv: acquire vmbus_connection.channel_mutex in vmbus_free_channels() hyperv: Fix spelling of HV_UNKOWN mei: bus: enable non-blocking RX mei: fix the back to back interrupt handling mei: synchronize irq before initiating a reset. VME: Remove shutdown entry from vme_driver auxdisplay: ht16k33: select framebuffer helper modules MAINTAINERS: add git url for fpga fpga: Clarify how write_init works streaming modes fpga zynq: Fix incorrect ISR state on bootup fpga zynq: Remove priv->dev fpga zynq: Add missing \n to messages fpga: Add COMPILE_TEST to all drivers uio: pruss: add clk_disable() char/pcmcia: add some error checking in scr24x_read() ...
2 parents 098c305 + 190cc65 commit b78b499

File tree

105 files changed

+5981
-696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+5981
-696
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
What: /sys/class/fpga_bridge/<bridge>/name
2+
Date: January 2016
3+
KernelVersion: 4.5
4+
Contact: Alan Tull <atull@opensource.altera.com>
5+
Description: Name of low level FPGA bridge driver.
6+
7+
What: /sys/class/fpga_bridge/<bridge>/state
8+
Date: January 2016
9+
KernelVersion: 4.5
10+
Contact: Alan Tull <atull@opensource.altera.com>
11+
Description: Show bridge state as "enabled" or "disabled"

Documentation/ABI/testing/sysfs-class-mei

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,19 @@ Description: Display fw status registers content
2929
Also number of registers varies between 1 and 6
3030
depending on generation.
3131

32+
What: /sys/class/mei/meiN/hbm_ver
33+
Date: Aug 2016
34+
KernelVersion: 4.9
35+
Contact: Tomas Winkler <tomas.winkler@intel.com>
36+
Description: Display the negotiated HBM protocol version.
37+
38+
The HBM protocol version negotiated
39+
between the driver and the device.
40+
41+
What: /sys/class/mei/meiN/hbm_ver_drv
42+
Date: Aug 2016
43+
KernelVersion: 4.9
44+
Contact: Tomas Winkler <tomas.winkler@intel.com>
45+
Description: Display the driver HBM protocol version.
46+
47+
The HBM protocol version supported by the driver.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
Holtek ht16k33 RAM mapping 16*8 LED controller driver with keyscan
2+
-------------------------------------------------------------------------------
3+
4+
Required properties:
5+
- compatible: "holtek,ht16k33"
6+
- reg: I2C slave address of the chip.
7+
- interrupt-parent: A phandle pointing to the interrupt controller
8+
serving the interrupt for this chip.
9+
- interrupts: Interrupt specification for the key pressed interrupt.
10+
- refresh-rate-hz: Display update interval in HZ.
11+
- debounce-delay-ms: Debouncing interval time in milliseconds.
12+
- linux,keymap: The keymap for keys as described in the binding
13+
document (devicetree/bindings/input/matrix-keymap.txt).
14+
15+
Optional properties:
16+
- linux,no-autorepeat: Disable keyrepeat.
17+
- default-brightness-level: Initial brightness level [0-15] (default: 15).
18+
19+
Example:
20+
21+
&i2c1 {
22+
ht16k33: ht16k33@70 {
23+
compatible = "holtek,ht16k33";
24+
reg = <0x70>;
25+
refresh-rate-hz = <20>;
26+
debounce-delay-ms = <50>;
27+
interrupt-parent = <&gpio4>;
28+
interrupts = <5 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;
29+
linux,keymap = <
30+
MATRIX_KEY(2, 0, KEY_F6)
31+
MATRIX_KEY(3, 0, KEY_F8)
32+
MATRIX_KEY(4, 0, KEY_F10)
33+
MATRIX_KEY(5, 0, KEY_F4)
34+
MATRIX_KEY(6, 0, KEY_F2)
35+
MATRIX_KEY(2, 1, KEY_F5)
36+
MATRIX_KEY(3, 1, KEY_F7)
37+
MATRIX_KEY(4, 1, KEY_F9)
38+
MATRIX_KEY(5, 1, KEY_F3)
39+
MATRIX_KEY(6, 1, KEY_F1)
40+
>;
41+
};
42+
};

0 commit comments

Comments
 (0)