Skip to content

Commit 3bc4f39

Browse files
author
Alex Williamson
committed
Merge remote branch 'origin/master' into next-merge
2 parents 17638db + cb3e433 commit 3bc4f39

File tree

3,081 files changed

+231373
-93465
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,081 files changed

+231373
-93465
lines changed

‎Documentation/ABI/stable/sysfs-bus-usb‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
What: /sys/bus/usb/devices/.../power/persist
2+
Date: May 2007
3+
KernelVersion: 2.6.23
4+
Contact: Alan Stern <stern@rowland.harvard.edu>
5+
Description:
6+
If CONFIG_USB_PERSIST is set, then each USB device directory
7+
will contain a file named power/persist. The file holds a
8+
boolean value (0 or 1) indicating whether or not the
9+
"USB-Persist" facility is enabled for the device. Since the
10+
facility is inherently dangerous, it is disabled by default
11+
for all devices except hubs. For more information, see
12+
Documentation/usb/persist.txt.
13+
14+
What: /sys/bus/usb/devices/.../power/autosuspend
15+
Date: March 2007
16+
KernelVersion: 2.6.21
17+
Contact: Alan Stern <stern@rowland.harvard.edu>
18+
Description:
19+
Each USB device directory will contain a file named
20+
power/autosuspend. This file holds the time (in seconds)
21+
the device must be idle before it will be autosuspended.
22+
0 means the device will be autosuspended as soon as
23+
possible. Negative values will prevent the device from
24+
being autosuspended at all, and writing a negative value
25+
will resume the device if it is already suspended.
26+
27+
The autosuspend delay for newly-created devices is set to
28+
the value of the usbcore.autosuspend module parameter.
29+
30+
What: /sys/bus/usb/device/.../power/connected_duration
31+
Date: January 2008
32+
KernelVersion: 2.6.25
33+
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
34+
Description:
35+
If CONFIG_PM_RUNTIME is enabled then this file
36+
is present. When read, it returns the total time (in msec)
37+
that the USB device has been connected to the machine. This
38+
file is read-only.
39+
Users:
40+
PowerTOP <power@bughost.org>
41+
http://www.lesswatts.org/projects/powertop/
42+
43+
What: /sys/bus/usb/device/.../power/active_duration
44+
Date: January 2008
45+
KernelVersion: 2.6.25
46+
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
47+
Description:
48+
If CONFIG_PM_RUNTIME is enabled then this file
49+
is present. When read, it returns the total time (in msec)
50+
that the USB device has been active, i.e. not in a suspended
51+
state. This file is read-only.
52+
53+
Tools can use this file and the connected_duration file to
54+
compute the percentage of time that a device has been active.
55+
For example,
56+
echo $((100 * `cat active_duration` / `cat connected_duration`))
57+
will give an integer percentage. Note that this does not
58+
account for counter wrap.
59+
Users:
60+
PowerTOP <power@bughost.org>
61+
http://www.lesswatts.org/projects/powertop/
62+
63+
What: /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend
64+
Date: January 2008
65+
KernelVersion: 2.6.27
66+
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
67+
Description:
68+
When read, this file returns 1 if the interface driver
69+
for this interface supports autosuspend. It also
70+
returns 1 if no driver has claimed this interface, as an
71+
unclaimed interface will not stop the device from being
72+
autosuspended if all other interface drivers are idle.
73+
The file returns 0 if autosuspend support has not been
74+
added to the driver.
75+
Users:
76+
USB PM tool
77+
git://git.moblin.org/users/sarah/usb-pm-tool/
78+
79+
What: /sys/bus/usb/device/.../avoid_reset_quirk
80+
Date: December 2009
81+
Contact: Oliver Neukum <oliver@neukum.org>
82+
Description:
83+
Writing 1 to this file tells the kernel that this
84+
device will morph into another mode when it is reset.
85+
Drivers will not use reset for error handling for
86+
such devices.
87+
Users:
88+
usb_modeswitch
89+
90+
What: /sys/bus/usb/devices/.../devnum
91+
KernelVersion: since at least 2.6.18
92+
Description:
93+
Device address on the USB bus.
94+
Users:
95+
libusb
96+
97+
What: /sys/bus/usb/devices/.../bConfigurationValue
98+
KernelVersion: since at least 2.6.18
99+
Description:
100+
bConfigurationValue of the *active* configuration for the
101+
device. Writing 0 or -1 to bConfigurationValue will reset the
102+
active configuration (unconfigure the device). Writing
103+
another value will change the active configuration.
104+
105+
Note that some devices, in violation of the USB spec, have a
106+
configuration with a value equal to 0. Writing 0 to
107+
bConfigurationValue for these devices will install that
108+
configuration, rather then unconfigure the device.
109+
110+
Writing -1 will always unconfigure the device.
111+
Users:
112+
libusb
113+
114+
What: /sys/bus/usb/devices/.../busnum
115+
KernelVersion: 2.6.22
116+
Description:
117+
Bus-number of the USB-bus the device is connected to.
118+
Users:
119+
libusb
120+
121+
What: /sys/bus/usb/devices/.../descriptors
122+
KernelVersion: 2.6.26
123+
Description:
124+
Binary file containing cached descriptors of the device. The
125+
binary data consists of the device descriptor followed by the
126+
descriptors for each configuration of the device.
127+
Note that the wTotalLength of the config descriptors can not
128+
be trusted, as the device may have a smaller config descriptor
129+
than it advertises. The bLength field of each (sub) descriptor
130+
can be trusted, and can be used to seek forward one (sub)
131+
descriptor at a time until the next config descriptor is found.
132+
All descriptors read from this file are in bus-endian format
133+
Users:
134+
libusb
135+
136+
What: /sys/bus/usb/devices/.../speed
137+
KernelVersion: since at least 2.6.18
138+
Description:
139+
Speed the device is connected with to the usb-host in
140+
Mbit / second. IE one of 1.5 / 12 / 480 / 5000.
141+
Users:
142+
libusb

‎Documentation/ABI/testing/sysfs-bus-iio‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ Description:
351351
6kohm_to_gnd: connected to ground via a 6kOhm resistor,
352352
20kohm_to_gnd: connected to ground via a 20kOhm resistor,
353353
100kohm_to_gnd: connected to ground via an 100kOhm resistor,
354+
500kohm_to_gnd: connected to ground via a 500kOhm resistor,
354355
three_state: left floating.
355356
For a list of available output power down options read
356357
outX_powerdown_mode_available. If Y is not present the
@@ -792,3 +793,21 @@ Contact: linux-iio@vger.kernel.org
792793
Description:
793794
This attribute is used to read the amount of quadrature error
794795
present in the device at a given time.
796+
797+
What: /sys/.../iio:deviceX/in_accelX_power_mode
798+
KernelVersion: 3.11
799+
Contact: linux-iio@vger.kernel.org
800+
Description:
801+
Specifies the chip power mode.
802+
low_noise: reduce noise level from ADC,
803+
low_power: enable low current consumption.
804+
For a list of available output power modes read
805+
in_accel_power_mode_available.
806+
807+
What: /sys/bus/iio/devices/iio:deviceX/store_eeprom
808+
KernelVersion: 3.4.0
809+
Contact: linux-iio@vger.kernel.org
810+
Description:
811+
Writing '1' stores the current device configuration into
812+
on-chip EEPROM. After power-up or chip reset the device will
813+
automatically load the saved configuration.

‎Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ Description:
1818
Reading returns either '1' or '0'. '1' means that the
1919
pllY is locked.
2020

21-
What: /sys/bus/iio/devices/iio:deviceX/store_eeprom
22-
KernelVersion: 3.4.0
23-
Contact: linux-iio@vger.kernel.org
24-
Description:
25-
Writing '1' stores the current device configuration into
26-
on-chip EEPROM. After power-up or chip reset the device will
27-
automatically load the saved configuration.
28-
2921
What: /sys/bus/iio/devices/iio:deviceX/sync_dividers
3022
KernelVersion: 3.4.0
3123
Contact: linux-iio@vger.kernel.org

‎Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ Description:
1818
adjust the reference frequency accordingly.
1919
The value written has no effect until out_altvoltageY_frequency
2020
is updated. Consider to use out_altvoltageY_powerdown to power
21-
down the PLL and it's RFOut buffers during REFin changes.
21+
down the PLL and its RFOut buffers during REFin changes.

‎Documentation/ABI/testing/sysfs-bus-usb‎

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,3 @@
1-
What: /sys/bus/usb/devices/.../power/autosuspend
2-
Date: March 2007
3-
KernelVersion: 2.6.21
4-
Contact: Alan Stern <stern@rowland.harvard.edu>
5-
Description:
6-
Each USB device directory will contain a file named
7-
power/autosuspend. This file holds the time (in seconds)
8-
the device must be idle before it will be autosuspended.
9-
0 means the device will be autosuspended as soon as
10-
possible. Negative values will prevent the device from
11-
being autosuspended at all, and writing a negative value
12-
will resume the device if it is already suspended.
13-
14-
The autosuspend delay for newly-created devices is set to
15-
the value of the usbcore.autosuspend module parameter.
16-
17-
What: /sys/bus/usb/devices/.../power/persist
18-
Date: May 2007
19-
KernelVersion: 2.6.23
20-
Contact: Alan Stern <stern@rowland.harvard.edu>
21-
Description:
22-
If CONFIG_USB_PERSIST is set, then each USB device directory
23-
will contain a file named power/persist. The file holds a
24-
boolean value (0 or 1) indicating whether or not the
25-
"USB-Persist" facility is enabled for the device. Since the
26-
facility is inherently dangerous, it is disabled by default
27-
for all devices except hubs. For more information, see
28-
Documentation/usb/persist.txt.
29-
30-
What: /sys/bus/usb/device/.../power/connected_duration
31-
Date: January 2008
32-
KernelVersion: 2.6.25
33-
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
34-
Description:
35-
If CONFIG_PM_RUNTIME is enabled then this file
36-
is present. When read, it returns the total time (in msec)
37-
that the USB device has been connected to the machine. This
38-
file is read-only.
39-
Users:
40-
PowerTOP <power@bughost.org>
41-
http://www.lesswatts.org/projects/powertop/
42-
43-
What: /sys/bus/usb/device/.../power/active_duration
44-
Date: January 2008
45-
KernelVersion: 2.6.25
46-
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
47-
Description:
48-
If CONFIG_PM_RUNTIME is enabled then this file
49-
is present. When read, it returns the total time (in msec)
50-
that the USB device has been active, i.e. not in a suspended
51-
state. This file is read-only.
52-
53-
Tools can use this file and the connected_duration file to
54-
compute the percentage of time that a device has been active.
55-
For example,
56-
echo $((100 * `cat active_duration` / `cat connected_duration`))
57-
will give an integer percentage. Note that this does not
58-
account for counter wrap.
59-
Users:
60-
PowerTOP <power@bughost.org>
61-
http://www.lesswatts.org/projects/powertop/
62-
63-
What: /sys/bus/usb/device/<busnum>-<devnum>...:<config num>-<interface num>/supports_autosuspend
64-
Date: January 2008
65-
KernelVersion: 2.6.27
66-
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
67-
Description:
68-
When read, this file returns 1 if the interface driver
69-
for this interface supports autosuspend. It also
70-
returns 1 if no driver has claimed this interface, as an
71-
unclaimed interface will not stop the device from being
72-
autosuspended if all other interface drivers are idle.
73-
The file returns 0 if autosuspend support has not been
74-
added to the driver.
75-
Users:
76-
USB PM tool
77-
git://git.moblin.org/users/sarah/usb-pm-tool/
78-
791
What: /sys/bus/usb/device/.../authorized
802
Date: July 2008
813
KernelVersion: 2.6.26
@@ -172,17 +94,6 @@ Description:
17294
device IDs, exactly like reading from the entry
17395
"/sys/bus/usb/drivers/.../new_id"
17496

175-
What: /sys/bus/usb/device/.../avoid_reset_quirk
176-
Date: December 2009
177-
Contact: Oliver Neukum <oliver@neukum.org>
178-
Description:
179-
Writing 1 to this file tells the kernel that this
180-
device will morph into another mode when it is reset.
181-
Drivers will not use reset for error handling for
182-
such devices.
183-
Users:
184-
usb_modeswitch
185-
18697
What: /sys/bus/usb/devices/.../power/usb2_hardware_lpm
18798
Date: September 2011
18899
Contact: Andiry Xu <andiry.xu@amd.com>

‎Documentation/DocBook/media_api.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
2-
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
3-
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
2+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
3+
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
44
<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;
55
<!ENTITY media-indices SYSTEM "./media-indices.tmpl">
66

0 commit comments

Comments
 (0)