Skip to content

Commit ee5db7e

Browse files
author
Jiri Kosina
committed
Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd', 'for-3.18/rmi', 'for-3.18/sony', 'for-3.18/uhid', 'for-3.18/upstream' and 'for-3.18/wacom' into for-linus
9 parents 467669c + 5235166 + 368d4e5 + 604b607 + 5b65c2a + 981c5b4 + 8493ecc + 5df4eb0 + 5ae6e89 commit ee5db7e

File tree

4,357 files changed

+172503
-102549
lines changed

Some content is hidden

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

4,357 files changed

+172503
-102549
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
*.gcno
3535
modules.builtin
3636
Module.symvers
37+
*.dwo
3738

3839
#
3940
# Top-level generic files

CREDITS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,6 +1381,9 @@ S: 17 rue Danton
13811381
S: F - 94270 Le Kremlin-Bicêtre
13821382
S: France
13831383

1384+
N: Jack Hammer
1385+
D: IBM ServeRAID RAID (ips) driver maintenance
1386+
13841387
N: Greg Hankins
13851388
13861389
D: fixed keyboard driver to separate LED and locking status
@@ -1691,6 +1694,10 @@ S: Reading
16911694
S: RG6 2NU
16921695
S: United Kingdom
16931696

1697+
N: Dave Jeffery
1698+
1699+
D: SCSI hacks and IBM ServeRAID RAID driver maintenance
1700+
16941701
N: Jakub Jelinek
16951702
16961703
W: http://sunsite.mff.cuni.cz/~jj

Documentation/ABI/testing/sysfs-bus-rbd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,5 @@ current_snap
9494

9595
parent
9696

97-
Information identifying the pool, image, and snapshot id for
98-
the parent image in a layered rbd image (format 2 only).
97+
Information identifying the chain of parent images in a layered rbd
98+
image. Entries are separated by empty lines.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
What: /sys/class/leds/<led>/gt683r/mode
2+
Date: Jun 2014
3+
KernelVersion: 3.17
4+
Contact: Janne Kanniainen <[email protected]>
5+
Description:
6+
Set the mode of LEDs. You should notice that changing the mode
7+
of one LED will update the mode of its two sibling devices as
8+
well.
9+
10+
0 - normal
11+
1 - audio
12+
2 - breathing
13+
14+
Normal: LEDs are fully on when enabled
15+
Audio: LEDs brightness depends on sound level
16+
Breathing: LEDs brightness varies at human breathing rate

Documentation/ABI/testing/sysfs-class-mtd

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,41 @@ Description:
184184

185185
It will always be a non-negative integer. In the case of
186186
devices lacking any ECC capability, it is 0.
187+
188+
What: /sys/class/mtd/mtdX/ecc_failures
189+
Date: June 2014
190+
KernelVersion: 3.17
191+
192+
Description:
193+
The number of failures reported by this device's ECC. Typically,
194+
these failures are associated with failed read operations.
195+
196+
It will always be a non-negative integer. In the case of
197+
devices lacking any ECC capability, it is 0.
198+
199+
What: /sys/class/mtd/mtdX/corrected_bits
200+
Date: June 2014
201+
KernelVersion: 3.17
202+
203+
Description:
204+
The number of bits that have been corrected by means of the
205+
device's ECC.
206+
207+
It will always be a non-negative integer. In the case of
208+
devices lacking any ECC capability, it is 0.
209+
210+
What: /sys/class/mtd/mtdX/bad_blocks
211+
Date: June 2014
212+
KernelVersion: 3.17
213+
214+
Description:
215+
The number of blocks marked as bad, if any, in this partition.
216+
217+
What: /sys/class/mtd/mtdX/bbt_blocks
218+
Date: June 2014
219+
KernelVersion: 3.17
220+
221+
Description:
222+
The number of blocks that are marked as reserved, if any, in
223+
this partition. These are typically used to store the in-flash
224+
bad block table (BBT).
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
What: /sys/bus/pci/drivers/pciback/quirks
2+
Date: Oct 2011
3+
KernelVersion: 3.1
4+
5+
Description:
6+
If the permissive attribute is set, then writing a string in
7+
the format of DDDD:BB:DD.F-REG:SIZE:MASK will allow the guest
8+
to write and read from the PCI device. That is Domain:Bus:
9+
Device.Function-Register:Size:Mask (Domain is optional).
10+
For example:
11+
#echo 00:19.0-E0:2:FF > /sys/bus/pci/drivers/pciback/quirks
12+
will allow the guest to read and write to the configuration
13+
register 0x0E.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
What: /sys/devices/*/<our-device>/fuse
2+
Date: February 2014
3+
Contact: Peter De Schrijver <[email protected]>
4+
Description: read-only access to the efuses on Tegra20, Tegra30, Tegra114
5+
and Tegra124 SoC's from NVIDIA. The efuses contain write once
6+
data programmed at the factory. The data is layed out in 32bit
7+
words in LSB first format. Each bit represents a single value
8+
as decoded from the fuse registers. Bits order/assignment
9+
exactly matches the HW registers, including any unused bits.
10+
Users: any user space application which wants to read the efuses on
11+
Tegra SoC's
Lines changed: 27 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,68 @@
1-
WWhat: /sys/class/hidraw/hidraw*/device/oled*_img
2-
Date: June 2012
3-
4-
Description:
5-
The /sys/class/hidraw/hidraw*/device/oled*_img files control
6-
OLED mocro displays on Intuos4 Wireless tablet. Accepted image
7-
has to contain 256 bytes (64x32 px 1 bit colour). The format
8-
is the same as PBM image 62x32px without header (64 bits per
9-
horizontal line, 32 lines). An example of setting OLED No. 0:
10-
dd bs=256 count=1 if=img_file of=[path to oled0_img]/oled0_img
11-
The attribute is read only and no local copy of the image is
12-
stored.
13-
14-
What: /sys/class/hidraw/hidraw*/device/speed
1+
What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/speed
152
Date: April 2010
163
Kernel Version: 2.6.35
174
185
Description:
19-
The /sys/class/hidraw/hidraw*/device/speed file controls
20-
reporting speed of Wacom bluetooth tablet. Reading from
21-
this file returns 1 if tablet reports in high speed mode
6+
The /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/speed file
7+
controls reporting speed of Wacom bluetooth tablet. Reading
8+
from this file returns 1 if tablet reports in high speed mode
229
or 0 otherwise. Writing to this file one of these values
2310
switches reporting speed.
2411

25-
What: /sys/class/leds/0005\:056A\:00BD.0001\:selector\:*/
26-
Date: May 2012
27-
Kernel Version: 3.5
28-
29-
Description:
30-
LED selector for Intuos4 WL. There are 4 leds, but only one LED
31-
can be lit at a time. Max brightness is 127.
32-
33-
What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/led
34-
Date: August 2011
12+
What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/led
13+
Date: August 2014
3514
3615
Description:
3716
Attribute group for control of the status LEDs and the OLEDs.
3817
This attribute group is only available for Intuos 4 M, L,
39-
and XL (with LEDs and OLEDs), Intuos 5 (LEDs only), and Cintiq
40-
21UX2 and Cintiq 24HD (LEDs only). Therefore its presence
41-
implicitly signifies the presence of said LEDs and OLEDs on the
42-
tablet device.
18+
and XL (with LEDs and OLEDs), Intuos 4 WL, Intuos 5 (LEDs only),
19+
Intuos Pro (LEDs only) and Cintiq 21UX2 and Cintiq 24HD
20+
(LEDs only). Therefore its presence implicitly signifies the
21+
presence of said LEDs and OLEDs on the tablet device.
4322

44-
What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_luminance
45-
Date: August 2011
23+
What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status0_luminance
24+
Date: August 2014
4625
4726
Description:
4827
Writing to this file sets the status LED luminance (1..127)
4928
when the stylus does not touch the tablet surface, and no
5029
button is pressed on the stylus. This luminance level is
5130
normally lower than the level when a button is pressed.
5231

53-
What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status1_luminance
54-
Date: August 2011
32+
What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status1_luminance
33+
Date: August 2014
5534
5635
Description:
5736
Writing to this file sets the status LED luminance (1..127)
5837
when the stylus touches the tablet surface, or any button is
5938
pressed on the stylus.
6039

61-
What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led0_select
62-
Date: August 2011
40+
What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status_led0_select
41+
Date: August 2014
6342
6443
Description:
6544
Writing to this file sets which one of the four (for Intuos 4
6645
and Intuos 5) or of the right four (for Cintiq 21UX2 and Cintiq
6746
24HD) status LEDs is active (0..3). The other three LEDs on the
6847
same side are always inactive.
6948

70-
What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led1_select
71-
Date: September 2011
49+
What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status_led1_select
50+
Date: August 2014
7251
7352
Description:
7453
Writing to this file sets which one of the left four (for Cintiq 21UX2
7554
and Cintiq 24HD) status LEDs is active (0..3). The other three LEDs on
7655
the left are always inactive.
7756

78-
What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/buttons_luminance
79-
Date: August 2011
57+
What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/buttons_luminance
58+
Date: August 2014
8059
8160
Description:
8261
Writing to this file sets the overall luminance level (0..15)
8362
of all eight button OLED displays.
8463

85-
What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/button<n>_rawimg
86-
Date: August 2011
64+
What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/button<n>_rawimg
65+
Date: August 2014
8766
8867
Description:
8968
When writing a 1024 byte raw image in Wacom Intuos 4
@@ -93,3 +72,8 @@ Description:
9372
byte chunk encodes the image data for two consecutive lines on
9473
the display. The low nibble of each byte contains the first
9574
line, and the high nibble contains the second line.
75+
When the Wacom Intuos 4 is connected over Bluetooth, the
76+
image has to contain 256 bytes (64x32 px 1 bit colour).
77+
The format is also scrambled, like in the USB mode, and it can
78+
be summarized by converting 76543210 into GECA6420.
79+
HGFEDCBA HFDB7531

0 commit comments

Comments
 (0)