Skip to content

Commit c3b5d3c

Browse files
KAGA-KOKOKAGA-KOKO
committed
Merge branch 'linus' into timers/core
Make sure the upstream fixes are applied before adding further modifications.
2 parents daa67b4 + e260818 commit c3b5d3c

File tree

3,182 files changed

+108682
-65730
lines changed

Some content is hidden

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

3,182 files changed

+108682
-65730
lines changed

‎CREDITS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver
20492049
S: Gurgaon, India
20502050
S: Kuala Lumpur, Malaysia
20512051

2052+
N: Mohit Kumar
2053+
D: ST Microelectronics SPEAr13xx PCI host bridge driver
2054+
D: Synopsys Designware PCI host bridge driver
2055+
20522056
N: Gabor Kuti
20532057
M: [email protected]
20542058
M: [email protected]
@@ -3705,6 +3709,13 @@ N: Dirk Verworner
37053709
D: Co-author of German book ``Linux-Kernel-Programmierung''
37063710
D: Co-founder of Berlin Linux User Group
37073711

3712+
N: Andrew Victor
3713+
E: [email protected]
3714+
W: http://maxim.org.za/at91_26.html
3715+
D: First maintainer of Atmel ARM-based SoC, aka AT91
3716+
D: Introduced support for at91rm9200, the first chip of AT91 family
3717+
S: South Africa
3718+
37083719
N: Riku Voipio
37093720
E: [email protected]
37103721
D: Author of PCA9532 LED and Fintek f75375s hwmon driver

‎Documentation/ABI/testing/sysfs-class-mtd

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,3 +222,13 @@ Description:
222222
The number of blocks that are marked as reserved, if any, in
223223
this partition. These are typically used to store the in-flash
224224
bad block table (BBT).
225+
226+
What: /sys/class/mtd/mtdX/offset
227+
Date: March 2015
228+
KernelVersion: 4.1
229+
Contact: [email protected]
230+
Description:
231+
For a partition, the offset of that partition from the start
232+
of the master device in bytes. This attribute is absent on
233+
main devices, so it can be used to distinguish between
234+
partitions and devices that aren't partitions.

‎Documentation/ABI/testing/sysfs-driver-toshiba_acpi

Lines changed: 80 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ Description: This file controls the keyboard backlight operation mode, valid
88
* 0x2 -> AUTO (also called TIMER)
99
* 0x8 -> ON
1010
* 0x10 -> OFF
11-
Note that the kernel 3.16 onwards this file accepts all listed
11+
Note that from kernel 3.16 onwards this file accepts all listed
1212
parameters, kernel 3.15 only accepts the first two (FN-Z and
1313
AUTO).
14+
Also note that toggling this value on type 1 devices, requires
15+
a reboot for changes to take effect.
1416
Users: KToshiba
1517

1618
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_backlight_timeout
@@ -67,24 +69,81 @@ Description: This file shows the current keyboard backlight type,
6769
* 2 -> Type 2, supporting modes TIMER, ON and OFF
6870
Users: KToshiba
6971

72+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_sleep_charge
73+
Date: January 23, 2015
74+
KernelVersion: 4.0
75+
Contact: Azael Avalos <[email protected]>
76+
Description: This file controls the USB Sleep & Charge charging mode, which
77+
can be:
78+
* 0 -> Disabled (0x00)
79+
* 1 -> Alternate (0x09)
80+
* 2 -> Auto (0x21)
81+
* 3 -> Typical (0x11)
82+
Note that from kernel 4.1 onwards this file accepts all listed
83+
values, kernel 4.0 only supports the first three.
84+
Note that this feature only works when connected to power, if
85+
you want to use it under battery, see the entry named
86+
"sleep_functions_on_battery"
87+
Users: KToshiba
88+
89+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/sleep_functions_on_battery
90+
Date: January 23, 2015
91+
KernelVersion: 4.0
92+
Contact: Azael Avalos <[email protected]>
93+
Description: This file controls the USB Sleep Functions under battery, and
94+
set the level at which point they will be disabled, accepted
95+
values can be:
96+
* 0 -> Disabled
97+
* 1-100 -> Battery level to disable sleep functions
98+
Currently it prints two values, the first one indicates if the
99+
feature is enabled or disabled, while the second one shows the
100+
current battery level set.
101+
Note that when the value is set to disabled, the sleep function
102+
will only work when connected to power.
103+
Users: KToshiba
104+
105+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_rapid_charge
106+
Date: January 23, 2015
107+
KernelVersion: 4.0
108+
Contact: Azael Avalos <[email protected]>
109+
Description: This file controls the USB Rapid Charge state, which can be:
110+
* 0 -> Disabled
111+
* 1 -> Enabled
112+
Note that toggling this value requires a reboot for changes to
113+
take effect.
114+
Users: KToshiba
115+
116+
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_sleep_music
117+
Date: January 23, 2015
118+
KernelVersion: 4.0
119+
Contact: Azael Avalos <[email protected]>
120+
Description: This file controls the Sleep & Music state, which values can be:
121+
* 0 -> Disabled
122+
* 1 -> Enabled
123+
Note that this feature only works when connected to power, if
124+
you want to use it under battery, see the entry named
125+
"sleep_functions_on_battery"
126+
Users: KToshiba
127+
70128
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/version
71-
Date: February, 2015
72-
KernelVersion: 3.20
129+
Date: February 12, 2015
130+
KernelVersion: 4.0
73131
Contact: Azael Avalos <[email protected]>
74132
Description: This file shows the current version of the driver
133+
Users: KToshiba
75134

76135
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/fan
77-
Date: February, 2015
78-
KernelVersion: 3.20
136+
Date: February 12, 2015
137+
KernelVersion: 4.0
79138
Contact: Azael Avalos <[email protected]>
80139
Description: This file controls the state of the internal fan, valid
81140
values are:
82141
* 0 -> OFF
83142
* 1 -> ON
84143

85144
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_function_keys
86-
Date: February, 2015
87-
KernelVersion: 3.20
145+
Date: February 12, 2015
146+
KernelVersion: 4.0
88147
Contact: Azael Avalos <[email protected]>
89148
Description: This file controls the Special Functions (hotkeys) operation
90149
mode, valid values are:
@@ -94,21 +153,29 @@ Description: This file controls the Special Functions (hotkeys) operation
94153
and the hotkeys are accessed via FN-F{1-12}.
95154
In the "Special Functions" mode, the F{1-12} keys trigger the
96155
hotkey and the F{1-12} keys are accessed via FN-F{1-12}.
156+
Note that toggling this value requires a reboot for changes to
157+
take effect.
158+
Users: KToshiba
97159

98160
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/panel_power_on
99-
Date: February, 2015
100-
KernelVersion: 3.20
161+
Date: February 12, 2015
162+
KernelVersion: 4.0
101163
Contact: Azael Avalos <[email protected]>
102164
Description: This file controls whether the laptop should turn ON whenever
103165
the LID is opened, valid values are:
104166
* 0 -> Disabled
105167
* 1 -> Enabled
168+
Note that toggling this value requires a reboot for changes to
169+
take effect.
170+
Users: KToshiba
106171

107172
What: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_three
108-
Date: February, 2015
109-
KernelVersion: 3.20
173+
Date: February 12, 2015
174+
KernelVersion: 4.0
110175
Contact: Azael Avalos <[email protected]>
111-
Description: This file controls whether the USB 3 functionality, valid
112-
values are:
176+
Description: This file controls the USB 3 functionality, valid values are:
113177
* 0 -> Disabled (Acts as a regular USB 2)
114178
* 1 -> Enabled (Full USB 3 functionality)
179+
Note that toggling this value requires a reboot for changes to
180+
take effect.
181+
Users: KToshiba

‎Documentation/ABI/testing/sysfs-platform-dell-laptop

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
What: /sys/class/leds/dell::kbd_backlight/als_enabled
2+
Date: December 2014
3+
KernelVersion: 3.19
4+
Contact: Gabriele Mazzotta <[email protected]>,
5+
Pali Rohár <[email protected]>
6+
Description:
7+
This file allows to control the automatic keyboard
8+
illumination mode on some systems that have an ambient
9+
light sensor. Write 1 to this file to enable the auto
10+
mode, 0 to disable it.
11+
12+
What: /sys/class/leds/dell::kbd_backlight/als_setting
13+
Date: December 2014
14+
KernelVersion: 3.19
15+
Contact: Gabriele Mazzotta <[email protected]>,
16+
Pali Rohár <[email protected]>
17+
Description:
18+
This file allows to specifiy the on/off threshold value,
19+
as reported by the ambient light sensor.
20+
21+
What: /sys/class/leds/dell::kbd_backlight/start_triggers
22+
Date: December 2014
23+
KernelVersion: 3.19
24+
Contact: Gabriele Mazzotta <[email protected]>,
25+
Pali Rohár <[email protected]>
26+
Description:
27+
This file allows to control the input triggers that
28+
turn on the keyboard backlight illumination that is
29+
disabled because of inactivity.
30+
Read the file to see the triggers available. The ones
31+
enabled are preceded by '+', those disabled by '-'.
32+
33+
To enable a trigger, write its name preceded by '+' to
34+
this file. To disable a trigger, write its name preceded
35+
by '-' instead.
36+
37+
For example, to enable the keyboard as trigger run:
38+
echo +keyboard > /sys/class/leds/dell::kbd_backlight/start_triggers
39+
To disable it:
40+
echo -keyboard > /sys/class/leds/dell::kbd_backlight/start_triggers
41+
42+
Note that not all the available triggers can be configured.
43+
44+
What: /sys/class/leds/dell::kbd_backlight/stop_timeout
45+
Date: December 2014
46+
KernelVersion: 3.19
47+
Contact: Gabriele Mazzotta <[email protected]>,
48+
Pali Rohár <[email protected]>
49+
Description:
50+
This file allows to specify the interval after which the
51+
keyboard illumination is disabled because of inactivity.
52+
The timeouts are expressed in seconds, minutes, hours and
53+
days, for which the symbols are 's', 'm', 'h' and 'd'
54+
respectively.
55+
56+
To configure the timeout, write to this file a value along
57+
with any the above units. If no unit is specified, the value
58+
is assumed to be expressed in seconds.
59+
60+
For example, to set the timeout to 10 minutes run:
61+
echo 10m > /sys/class/leds/dell::kbd_backlight/stop_timeout
62+
63+
Note that when this file is read, the returned value might be
64+
expressed in a different unit than the one used when the timeout
65+
was set.
66+
67+
Also note that only some timeouts are supported and that
68+
some systems might fall back to a specific timeout in case
69+
an invalid timeout is written to this file.

‎Documentation/DocBook/media/v4l/compat.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2491,7 +2491,7 @@ that used it. It was originally scheduled for removal in 2.6.35.
24912491
</listitem>
24922492
<listitem>
24932493
<para>Added <constant>V4L2_EVENT_CTRL_CH_RANGE</constant> control event
2494-
changes flag. See <xref linkend="changes-flags"/>.</para>
2494+
changes flag. See <xref linkend="ctrl-changes-flags"/>.</para>
24952495
</listitem>
24962496
</orderedlist>
24972497
</section>

‎Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml

Lines changed: 27 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -143,86 +143,28 @@
143143
<row>
144144
<entry></entry>
145145
<entry>struct</entry>
146-
<entry><structfield>v4l</structfield></entry>
146+
<entry><structfield>dev</structfield></entry>
147147
<entry></entry>
148-
<entry>Valid for V4L sub-devices and nodes only.</entry>
148+
<entry>Valid for (sub-)devices that create a single device node.</entry>
149149
</row>
150150
<row>
151151
<entry></entry>
152152
<entry></entry>
153153
<entry>__u32</entry>
154154
<entry><structfield>major</structfield></entry>
155-
<entry>V4L device node major number. For V4L sub-devices with no
156-
device node, set by the driver to 0.</entry>
155+
<entry>Device node major number.</entry>
157156
</row>
158157
<row>
159158
<entry></entry>
160159
<entry></entry>
161160
<entry>__u32</entry>
162161
<entry><structfield>minor</structfield></entry>
163-
<entry>V4L device node minor number. For V4L sub-devices with no
164-
device node, set by the driver to 0.</entry>
165-
</row>
166-
<row>
167-
<entry></entry>
168-
<entry>struct</entry>
169-
<entry><structfield>fb</structfield></entry>
170-
<entry></entry>
171-
<entry>Valid for frame buffer nodes only.</entry>
172-
</row>
173-
<row>
174-
<entry></entry>
175-
<entry></entry>
176-
<entry>__u32</entry>
177-
<entry><structfield>major</structfield></entry>
178-
<entry>Frame buffer device node major number.</entry>
179-
</row>
180-
<row>
181-
<entry></entry>
182-
<entry></entry>
183-
<entry>__u32</entry>
184-
<entry><structfield>minor</structfield></entry>
185-
<entry>Frame buffer device node minor number.</entry>
186-
</row>
187-
<row>
188-
<entry></entry>
189-
<entry>struct</entry>
190-
<entry><structfield>alsa</structfield></entry>
191-
<entry></entry>
192-
<entry>Valid for ALSA devices only.</entry>
193-
</row>
194-
<row>
195-
<entry></entry>
196-
<entry></entry>
197-
<entry>__u32</entry>
198-
<entry><structfield>card</structfield></entry>
199-
<entry>ALSA card number</entry>
200-
</row>
201-
<row>
202-
<entry></entry>
203-
<entry></entry>
204-
<entry>__u32</entry>
205-
<entry><structfield>device</structfield></entry>
206-
<entry>ALSA device number</entry>
207-
</row>
208-
<row>
209-
<entry></entry>
210-
<entry></entry>
211-
<entry>__u32</entry>
212-
<entry><structfield>subdevice</structfield></entry>
213-
<entry>ALSA sub-device number</entry>
214-
</row>
215-
<row>
216-
<entry></entry>
217-
<entry>int</entry>
218-
<entry><structfield>dvb</structfield></entry>
219-
<entry></entry>
220-
<entry>DVB card number</entry>
162+
<entry>Device node minor number.</entry>
221163
</row>
222164
<row>
223165
<entry></entry>
224166
<entry>__u8</entry>
225-
<entry><structfield>raw</structfield>[180]</entry>
167+
<entry><structfield>raw</structfield>[184]</entry>
226168
<entry></entry>
227169
<entry></entry>
228170
</row>
@@ -253,8 +195,24 @@
253195
<entry>ALSA card</entry>
254196
</row>
255197
<row>
256-
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB</constant></entry>
257-
<entry>DVB card</entry>
198+
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_FE</constant></entry>
199+
<entry>DVB frontend devnode</entry>
200+
</row>
201+
<row>
202+
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_DEMUX</constant></entry>
203+
<entry>DVB demux devnode</entry>
204+
</row>
205+
<row>
206+
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_DVR</constant></entry>
207+
<entry>DVB DVR devnode</entry>
208+
</row>
209+
<row>
210+
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_CA</constant></entry>
211+
<entry>DVB CAM devnode</entry>
212+
</row>
213+
<row>
214+
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_NET</constant></entry>
215+
<entry>DVB network devnode</entry>
258216
</row>
259217
<row>
260218
<entry><constant>MEDIA_ENT_T_V4L2_SUBDEV</constant></entry>
@@ -282,6 +240,10 @@
282240
it in some digital video standard, with appropriate embedded timing
283241
signals.</entry>
284242
</row>
243+
<row>
244+
<entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_TUNER</constant></entry>
245+
<entry>TV and/or radio tuner</entry>
246+
</row>
285247
</tbody>
286248
</tgroup>
287249
</table>

0 commit comments

Comments
 (0)